diff options
| -rw-r--r-- | default.nix | 8 | ||||
| -rwxr-xr-x | install.sh | 5 | ||||
| -rw-r--r-- | lib/emacs-packages.nix | 2 | ||||
| -rw-r--r-- | lib/linux.nix | 7 | ||||
| -rw-r--r-- | lib/packages.nix | 1 |
5 files changed, 10 insertions, 13 deletions
diff --git a/default.nix b/default.nix index 74f0940..7e9cbcb 100644 --- a/default.nix +++ b/default.nix @@ -1,15 +1,15 @@ let nixpkgs = builtins.fetchTarball (import ./nixpkgs.nix); pkgs = import "${nixpkgs}" {}; + hm-src = pkgs.home-manager.src; in rec { - home-manager = pkgs.callPackage ./home-manager/home-manager { + nixpkgs = pkgs; + home-manager = pkgs.callPackage "${hm-src}/home-manager" { path = toString ./home-manager; }; - install = pkgs.callPackage ./home-manager/home-manager/install.nix { + install = pkgs.callPackage "${hm-src}/home-manager/install.nix" { inherit home-manager; }; - - nixos = import ./home-manager/nixos; } @@ -30,8 +30,7 @@ mkdir -p ~/.config/notmuch # symlinking must occur before initial generation. now we can install, and # pin our own nixpkgs. # -# set channels -nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager nix-channel --update NIX_PATH=$HOME/.nix-defexpr/channels${NIX_PATH:+:}$NIX_PATH \ - nix-shell '<home-manager>' -A install + nix-shell . -A install + #nix-shell '<home-manager>' -A install diff --git a/lib/emacs-packages.nix b/lib/emacs-packages.nix index b8dc912..e82ed37 100644 --- a/lib/emacs-packages.nix +++ b/lib/emacs-packages.nix @@ -32,7 +32,7 @@ flycheck flycheck-haskell # geiser # broken? general -melpaStablePackages.git-timemachine +# melpaStablePackages.git-timemachine # broken hash haskell-mode highlight-symbol htmlize diff --git a/lib/linux.nix b/lib/linux.nix index 0e70b5a..aa6fd2c 100644 --- a/lib/linux.nix +++ b/lib/linux.nix @@ -94,7 +94,6 @@ in dict dmenu dolphin - exercism feh flameshot gopher @@ -111,10 +110,9 @@ in minitube mononoki mplayer - msmtp muchsync mumble - neomutt + # neomutt obs-studio pandoc pasystray @@ -123,7 +121,7 @@ in pinentry sqlite tdesktop - texlive.combined.scheme-full + # texlive.combined.scheme-full torbrowser usbutils utillinux @@ -133,7 +131,6 @@ in xdotool xlayoutdisplay xorg.xmodmap - xournal xterm yank youtube-dl diff --git a/lib/packages.nix b/lib/packages.nix index 8d917b5..269433b 100644 --- a/lib/packages.nix +++ b/lib/packages.nix @@ -54,6 +54,7 @@ mpc_cli ncdu ncmpc nix-prefetch-scripts +nixos-generators noto-fonts-emoji opentimestamps-client ormolu |