nix/nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to doom emacs

Browse Source
This commit is contained in:
nostoromo root
2020-12-02 08:44:56 -08:00
parent 28e8e54f0c
commit eef3234edb
5 changed files with 139 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
packages/local.nix
View File

@@ -1,7 +1,6 @@
{ pkgs, lib, ... }:
let
unstablePkgs = import <nixos-unstable> {};
let unstablePkgs = import <nixos-unstable> { };
in {
nixpkgs.config.packageOverrides = pkgs: rec {
@@ -11,13 +10,16 @@ in {
fetchurl = builtins.fetchurl;
};
minecraft-server_1_15_1 = pkgs.minecraft-server.overrideAttrs (oldAttrs: rec {
version = "1.15.1";
src = builtins.fetchurl {
url = "https://launcher.mojang.com/v1/objects/4d1826eebac84847c71a77f9349cc22afd0cf0a1/server.jar";
sha256 = "a0c062686bee5a92d60802ca74d198548481802193a70dda6d5fe7ecb7207993";
};
});
minecraft-server_1_15_1 = pkgs.minecraft-server.overrideAttrs
(oldAttrs: rec {
version = "1.15.1";
src = builtins.fetchurl {
url =
"https://launcher.mojang.com/v1/objects/4d1826eebac84847c71a77f9349cc22afd0cf0a1/server.jar";
sha256 =
"a0c062686bee5a92d60802ca74d198548481802193a70dda6d5fe7ecb7207993";
};
});
minecraft-current = pkgs.minecraft.overrideAttrs (oldAttrs: rec {
src = builtins.fetchurl {
@@ -29,26 +31,24 @@ in {
# DON'T LEAVE THE HASH--Nix will think the package hasn't changed
minecraft-server_1_16_1 = let
version = "1.16.1";
url = "https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar";
url =
"https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/server.jar";
sha256 = "0nwkdig6yw4cnm2ld78z4j4xzhbm1rwv55vfxz0gzhsbf93xb0i7";
in (pkgs.minecraft-server.overrideAttrs (oldAttrs: rec {
name = "minecraft-server-${version}";
inherit version;
src = pkgs.fetchurl {
inherit url sha256;
};
src = pkgs.fetchurl { inherit url sha256; };
}));
minecraft-server_1_16_2 = let
version = "1.16.2";
url = "https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/server.jar";
url =
"https://launcher.mojang.com/v1/objects/c5f6fb23c3876461d46ec380421e42b289789530/server.jar";
sha256 = "0fbghwrj9b2y9lkn2b17id4ghglwvyvcc8065h582ksfz0zys0i9";
in (pkgs.minecraft-server.overrideAttrs (oldAttrs: rec {
name = "minecraft-server-${version}";
inherit version;
src = pkgs.fetchurl {
inherit url sha256;
};
src = pkgs.fetchurl { inherit url sha256; };
}));
postgresql_11_gssapi = pkgs.postgresql_11.overrideAttrs (oldAttrs: rec {
@@ -62,15 +62,11 @@ in {
});
hll2380dw-cups = import ./hll2380dw-cups.nix {
inherit (pkgs) stdenv fetchurl makeWrapper cups dpkg a2ps ghostscript gnugrep gnused coreutils file perl which;
inherit (pkgs)
stdenv fetchurl makeWrapper cups dpkg a2ps ghostscript gnugrep gnused
coreutils file perl which;
};
# backplane-dns = import ./backplane-dns.nix {
# pkgs = pkgs;
# stdenv = pkgs.stdenv;
# fetchgit = pkgs.fetchgit;
# };
backplane-dns-client = import ./backplane-dns-client.nix {
pkgs = pkgs;
stdenv = pkgs.stdenv;
@@ -106,12 +102,40 @@ in {
meta = with pkgs.lib; {
description = "Google photos uploader, written in Go.";
homepage = https://github.com/int128/gpup;
homepage = "https://github.com/int128/gpup";
license = licenses.asl20;
platforms = platforms.linux ++ platforms.darwin;
};
};
doomEmacsInit = pkgs.writeShellScriptBin "doom-emacs-init.sh" ''
DOOMDIR=$HOME/.emacs.d
function clone_into() {
${pkgs.git}/bin/git clone https://github.com/hlissner/doom-emacs.git $1
}
if [ ! -d "$DOOMDIR" ]; then
clone_into $DOOMDIR
$DOOMDIR/bin/doom -y install
fi
if [ ! -f $DOOMDIR/bin/doom ]; then
# legacy...move to a backup
mv $HOME/.emacs.d $HOME/.emacs.d.bak
mv $HOME/.emacs $HOME/.emacs
clone_into $DOOMDIR
$DOOMDIR/bin/doom -y install
fi
$DOOMDIR/bin/doom sync
#if ${pkgs.emacs}/bin/emacsclient -ca false -e '(delete-frame)'; then
# # emacs is running
# ${pkgs.emacs}/bin/emacsclient -e '(doom/reload)'
#fi
'';
localLispPackages = (import ./lisp {
inherit lib;
pkgs = unstablePkgs;
@@ -121,5 +145,11 @@ in {
inherit localLispPackages;
pkgs = unstablePkgs;
};
doom-emacs-config = pkgs.fetchgit {
url = "https://git.fudo.org/niten/doom-emacs.git";
rev = "0613fcec820851e5b92f0ab493fb2078c6754b51";
sha256 = "00zzghdxpyb6r22znxyknydcl5v7zfai1fvjfy4gwfw8211n4z2m";
};
};
}