summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormediocregopher <mediocregopher@gmail.com>2023-12-16 15:51:15 +0100
committermediocregopher <mediocregopher@gmail.com>2023-12-16 15:51:15 +0100
commit878dea2de4c8f4289a9b1d08437f23d2a29021ea (patch)
treee0eb5c6b9640cdb6dc435bce07b31f6f0c87e889
parent97c6c2019397a969d886c11b3474d120658a5bc9 (diff)
Fixes coming from re-install on mediocre-desktop
-rw-r--r--Makefile2
-rw-r--r--default.nix4
-rw-r--r--zsh/default.nix3
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 9af26eb..494f2f4 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ setup-pulseaudio:
# - use lsblk -o NAME,UUID to get UUID
install-rm-keyfile:
sudo cp ./base/rm-keyfile.service /etc/systemd/system
- sudo systemctl daemon-reload
+ sudo systemctl enable rm-keyfile.service
install-pamd:
drv=$$(nix-instantiate -E '((import ./pkgs.nix).stable {}).i3lock'); \
diff --git a/default.nix b/default.nix
index e292001..2d8d951 100644
--- a/default.nix
+++ b/default.nix
@@ -48,6 +48,8 @@ in rec {
pkgs.gawk
pkgs.tree
pkgs.pv
+ pkgs.less
+ pkgs.tmux
git
pkgs.mercurial
@@ -69,8 +71,6 @@ in rec {
pkgs.sshfs
pkgs.fuse3
- pkgs.tmux
-
pkgs.ncdu
pkgs.htop
pkgs.jnettop
diff --git a/zsh/default.nix b/zsh/default.nix
index c324a33..bc4a795 100644
--- a/zsh/default.nix
+++ b/zsh/default.nix
@@ -25,6 +25,8 @@
};
zshrc = pkgs.writeTextDir ".zshrc" ''
+ # Import before anything else, so that we have the full PATH available for everything following
+ . ${pkgs.nix}/etc/profile.d/nix.sh
# oh-my-zsh
export ZSH=${pkgs.oh-my-zsh}/share/oh-my-zsh
@@ -44,7 +46,6 @@
. ${./zshrc}
. ${./aliases}
- . ${pkgs.nix}/etc/profile.d/nix.sh
'';
zsh = pkgs.writeScriptBin "zsh" ''