From a75e6ae20d374deb7c28de49dd7fa410c15b4996 Mon Sep 17 00:00:00 2001
From: vorboyvo <mrsirofvibe@outlook.com>
Date: Sun, 1 Dec 2024 13:12:00 -0500
Subject: [PATCH] Fixed merge conflict farther. Fixed clifm. Started i3
 keybinds on de-lacadie.

---
 hosts/de-lacadie/home.nix | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/hosts/de-lacadie/home.nix b/hosts/de-lacadie/home.nix
index 24d82f7..55e4528 100644
--- a/hosts/de-lacadie/home.nix
+++ b/hosts/de-lacadie/home.nix
@@ -6,19 +6,13 @@ let
   terminal = pkgs.alacritty;
 in {
   imports = [
-<<<<<<< HEAD
-      ../../programs/gammastep.nix
-      ../../programs/kdeconnect.nix
-      ../../programs/ssh.nix
-      ../../programs/zsh.nix
-      ../../programs/taskwarrior.nix
-      ../../programs/clifm.nix
-      ../../programs/git.nix
-=======
+      ../../snippets/gammastep.nix
       ../../snippets/kdeconnect.nix
       ../../snippets/ssh.nix
       ../../snippets/zsh.nix
->>>>>>> refs/remotes/origin/main
+      ../../snippets/taskwarrior.nix
+      ../../snippets/clifm.nix
+      ../../snippets/git.nix
   ];
   home.username = "alice";
   home.homeDirectory = "/home/alice";
@@ -79,7 +73,7 @@ in {
       upower
       glib # provides trash and mount (latter may supplant udisks2?)
     ] ++ # 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
     [ terminal ] ++ # Terminal emulator
     [
@@ -137,6 +131,8 @@ in {
   xsession = let
     term = terminal;
     dmenuCommand = builtins.readFile "${scripts}/dmenu.sh";
+    shutdownMenu = pkgs.writeShellScript "shutdownmenu"
+      (builtins.readFile "${scripts}/shutdownmenu.sh");
   in {
     enable = true;
     windowManager.i3 = {
@@ -165,13 +161,14 @@ in {
         menu = "j4-dmenu-desktop --no-generic --term=${pkgs.lib.getExe term} --dmenu='${dmenuCommand}'";
         focus.followMouse = false;
         # keybindings and extraConfig go here
-        keybindings = {
-          
-        };
+        keybindings = lib.mkOptionDefault rec {
+          XF86PowerOff =
+            "exec DMENU_COMMAND='${dmenuCommand}' bash ${shutdownMenu}";
+          "${modifier}+Pause" = XF86PowerOff;        };
       };
     };
   };
-  
+
   # configure fonts correctly
   fonts.fontconfig.enable = true;
   xdg.configFile."fontconfig/conf.d/5-default.fonts.conf".source =