mediocregopher/loadout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes coming from re-install on mediocre-desktop

Browse Source
This commit is contained in:
mediocregopher 2023-12-16 15:51:15 +01:00
parent 97c6c20193
commit 878dea2de4
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -9,7 +9,7 @@ setup-pulseaudio:
# - use lsblk -o NAME,UUID to get UUID # - use lsblk -o NAME,UUID to get UUID
install-rm-keyfile: install-rm-keyfile:
sudo cp ./base/rm-keyfile.service /etc/systemd/system sudo cp ./base/rm-keyfile.service /etc/systemd/system
sudo systemctl daemon-reload sudo systemctl enable rm-keyfile.service
install-pamd: install-pamd:
drv=$$(nix-instantiate -E '((import ./pkgs.nix).stable {}).i3lock'); \ drv=$$(nix-instantiate -E '((import ./pkgs.nix).stable {}).i3lock'); \

4
default.nix
View File

@ -48,6 +48,8 @@ in rec {
pkgs.gawk pkgs.gawk
pkgs.tree pkgs.tree
pkgs.pv pkgs.pv
pkgs.less
pkgs.tmux
git git
pkgs.mercurial pkgs.mercurial
@ -69,8 +71,6 @@ in rec {
pkgs.sshfs pkgs.sshfs
pkgs.fuse3 pkgs.fuse3
pkgs.tmux
pkgs.ncdu pkgs.ncdu
pkgs.htop pkgs.htop
pkgs.jnettop pkgs.jnettop

3
zsh/default.nix
View File

@ -25,6 +25,8 @@
}; };
zshrc = pkgs.writeTextDir ".zshrc" '' 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 # oh-my-zsh
export ZSH=${pkgs.oh-my-zsh}/share/oh-my-zsh export ZSH=${pkgs.oh-my-zsh}/share/oh-my-zsh
@ -44,7 +46,6 @@
. ${./zshrc} . ${./zshrc}
. ${./aliases} . ${./aliases}
. ${pkgs.nix}/etc/profile.d/nix.sh
''; '';
zsh = pkgs.writeScriptBin "zsh" '' zsh = pkgs.writeScriptBin "zsh" ''