vorboyvo/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed merge conflict farther.

Browse source 
Fixed clifm.
Started i3 keybinds on de-lacadie.
This commit is contained in:
vorboyvo 2024-12-01 13:12:00 -05:00
parent 4dea4752ba
commit a75e6ae20d
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
hosts/de-lacadie/home.nix
View file

@ -6,19 +6,13 @@ let
terminal = pkgs.alacritty; terminal = pkgs.alacritty;
in { in {
imports = [ imports = [
<<<<<<< HEAD ../../snippets/gammastep.nix
../../programs/gammastep.nix
../../programs/kdeconnect.nix
../../programs/ssh.nix
../../programs/zsh.nix
../../programs/taskwarrior.nix
../../programs/clifm.nix
../../programs/git.nix
=======
../../snippets/kdeconnect.nix ../../snippets/kdeconnect.nix
../../snippets/ssh.nix ../../snippets/ssh.nix
../../snippets/zsh.nix ../../snippets/zsh.nix
>>>>>>> refs/remotes/origin/main ../../snippets/taskwarrior.nix
../../snippets/clifm.nix
../../snippets/git.nix
]; ];
home.username = "alice"; home.username = "alice";
home.homeDirectory = "/home/alice"; home.homeDirectory = "/home/alice";
@ -79,7 +73,7 @@ in {
upower upower
glib # provides trash and mount (latter may supplant udisks2?) glib # provides trash and mount (latter may supplant udisks2?)
] ++ # Basic utilities ] ++ # Basic utilities
[ bitwarden-cli htop snore hledger hledger-ui clifm ] [ bitwarden-cli htop snore hledger hledger-ui ]
++ # Personalized selection of command-line (CLI/TUI) apps ++ # Personalized selection of command-line (CLI/TUI) apps
[ terminal ] ++ # Terminal emulator [ terminal ] ++ # Terminal emulator
[ [
@ -137,6 +131,8 @@ in {
xsession = let xsession = let
term = terminal; term = terminal;
dmenuCommand = builtins.readFile "${scripts}/dmenu.sh"; dmenuCommand = builtins.readFile "${scripts}/dmenu.sh";
shutdownMenu = pkgs.writeShellScript "shutdownmenu"
(builtins.readFile "${scripts}/shutdownmenu.sh");
in { in {
enable = true; enable = true;
windowManager.i3 = { windowManager.i3 = {
@ -165,13 +161,14 @@ in {
menu = "j4-dmenu-desktop --no-generic --term=${pkgs.lib.getExe term} --dmenu='${dmenuCommand}'"; menu = "j4-dmenu-desktop --no-generic --term=${pkgs.lib.getExe term} --dmenu='${dmenuCommand}'";
focus.followMouse = false; focus.followMouse = false;
# keybindings and extraConfig go here # keybindings and extraConfig go here
keybindings = { keybindings = lib.mkOptionDefault rec {
XF86PowerOff =
}; "exec DMENU_COMMAND='${dmenuCommand}' bash ${shutdownMenu}";
"${modifier}+Pause" = XF86PowerOff; };
}; };
}; };
}; };
# configure fonts correctly # configure fonts correctly
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
xdg.configFile."fontconfig/conf.d/5-default.fonts.conf".source = xdg.configFile."fontconfig/conf.d/5-default.fonts.conf".source =