From 50863e723254491a5723729304d83cca3263a08b Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Tue, 25 Feb 2025 04:10:25 +0000
Subject: [PATCH] more progress

---
 .../modules/nmasur/presets/programs/aerc.nix  |  4 +-
 .../nmasur/presets/programs/nixpkgs.nix       |  6 +--
 .../modules/nmasur/presets/services/i3.nix    | 40 +++++++++++--------
 .../nixos/modules/nmasur/profiles/base.nix    |  2 +
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/platforms/home-manager/modules/nmasur/presets/programs/aerc.nix b/platforms/home-manager/modules/nmasur/presets/programs/aerc.nix
index f4addec..ac3ecdc 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/aerc.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/aerc.nix
@@ -196,7 +196,7 @@ in
 
     xdg.desktopEntries.aerc = lib.mkIf (pkgs.stdenv.isLinux) {
       name = "aerc";
-      exec = "${config.terminalLaunchCommand} aerc %u";
+      exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} aerc %u";
     };
     xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux {
       "${config.xsession.windowManager.i3.config.modifier}+Shift+e" = "exec ${
@@ -205,7 +205,7 @@ in
           pkgs.writeShellScript "focus-mail.sh" ''
             count=$(ps aux | grep -c aerc)
             if [ "$count" -eq 1 ]; then
-                i3-msg "exec --no-startup-id ${config.terminal} start --class aerc -- aerc"
+                i3-msg "exec --no-startup-id ${lib.getExe config.nmasur.presets.services.i3.terminal} start --class aerc -- aerc"
                 sleep 0.25
             fi
             i3-msg "[class=aerc] focus"
diff --git a/platforms/home-manager/modules/nmasur/presets/programs/nixpkgs.nix b/platforms/home-manager/modules/nmasur/presets/programs/nixpkgs.nix
index 64bdcb3..876f168 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/nixpkgs.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/nixpkgs.nix
@@ -60,21 +60,21 @@ in
           body = # fish
             ''
               git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
-              echo "doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}#${config.networking.hostName}"
+              echo "doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}"
             '';
         };
         rebuild-nixos-offline = lib.mkIf config.nmasur.presets.programs.dotfiles.enable {
           body = # fish
             ''
               git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
-              echo "doas nixos-rebuild switch --option substitute false --flake ${config.nmasur.presets.programs.dotfiles.path}#${config.networking.hostName}"
+              echo "doas nixos-rebuild switch --option substitute false --flake ${config.nmasur.presets.programs.dotfiles.path}"
             '';
         };
         rebuild-home = lib.mkIf config.nmasur.presets.programs.dotfiles.enable {
           body = # fish
             ''
               git -C ${config.nmasur.presets.programs.dotfiles.path} add --intent-to-add --all
-              echo "${lib.getExe pkgs.home-manager} switch --flake ${config.nmasur.presets.programs.dotfiles.path}#${config.networking.hostName}";
+              echo "${lib.getExe pkgs.home-manager} switch --flake ${config.nmasur.presets.programs.dotfiles.path}";
             '';
         };
       };
diff --git a/platforms/home-manager/modules/nmasur/presets/services/i3.nix b/platforms/home-manager/modules/nmasur/presets/services/i3.nix
index 3be9b5b..caecc0c 100644
--- a/platforms/home-manager/modules/nmasur/presets/services/i3.nix
+++ b/platforms/home-manager/modules/nmasur/presets/services/i3.nix
@@ -184,34 +184,42 @@ in
             # Launchers
             "${modifier}+Return" =
               "exec --no-startup-id ${lib.getExe cfg.terminal}; workspace ${ws2}; layout tabbed";
-            "${modifier}+space" =
-              lib.mkIf cfg.commands.launcher != null "exec --no-startup-id ${cfg.commands.launcher}";
-            "${modifier}+Shift+s" =
-              lib.mkIf cfg.commands.systemdSearch != null "exec --no-startup-id ${cfg.commands.systemdSearch}";
-            "${modifier}+Shift+a" =
-              lib.mkIf cfg.commands.audioSwitch != null "exec --no-startup-id ${cfg.commands.audioSwitch}";
+            "${modifier}+space" = lib.mkIf (
+              cfg.commands.launcher != null
+            ) "exec --no-startup-id ${cfg.commands.launcher}";
+            "${modifier}+Shift+s" = lib.mkIf (
+              cfg.commands.systemdSearch != null
+            ) "exec --no-startup-id ${cfg.commands.systemdSearch}";
+            "${modifier}+Shift+a" = lib.mkIf (
+              cfg.commands.audioSwitch != null
+            ) "exec --no-startup-id ${cfg.commands.audioSwitch}";
             "Mod1+Tab" = lib.mkIf (
               cfg.commands.applicationSwitch != null
             ) "exec --no-startup-id ${cfg.commands.applicationSwitch}";
-            "${modifier}+Shift+period" =
-              lib.mkIf cfg.commands.power != null "exec --no-startup-id ${cfg.commands.power}";
-            "${modifier}+Shift+m" =
-              lib.mkIf cfg.commands.brightness != null "exec --no-startup-id ${cfg.commands.brightness}";
-            "${modifier}+c" =
-              lib.mkIf cfg.commands.calculator != null "exec --no-startup-id ${cfg.commands.calculator}";
+            "${modifier}+Shift+period" = lib.mkIf (
+              cfg.commands.power != null
+            ) "exec --no-startup-id ${cfg.commands.power}";
+            "${modifier}+Shift+m" = lib.mkIf (
+              cfg.commands.brightness != null
+            ) "exec --no-startup-id ${cfg.commands.brightness}";
+            "${modifier}+c" = lib.mkIf (
+              cfg.commands.calculator != null
+            ) "exec --no-startup-id ${cfg.commands.calculator}";
             "${modifier}+Shift+c" = "reload";
             "${modifier}+Shift+r" = "restart";
             "${modifier}+Shift+q" =
               ''exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"'';
-            "${modifier}+Shift+x" = lib.mkIf cfg.commands.lockScreen != null "exec ${cfg.commands.lockScreen}";
+            "${modifier}+Shift+x" = lib.mkIf (
+              cfg.commands.lockScreen != null
+            ) "exec ${cfg.commands.lockScreen}";
             "${modifier}+Mod1+h" =
-              "exec --no-startup-id ${lib.getExe cfg.terminal} -e sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.nmasur.presets.programs.dotfiles.path}#${config.networking.hostName} || read'";
+              "exec --no-startup-id ${lib.getExe cfg.terminal} -e sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.nmasur.presets.programs.dotfiles.path} || read'";
             "${modifier}+Mod1+r" =
-              "exec --no-startup-id ${lib.getExe cfg.terminal} -e sh -c 'doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path}#${config.networking.hostName} || read'";
+              "exec --no-startup-id ${lib.getExe cfg.terminal} -e sh -c 'doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path} || read'";
 
             # Window options
             "${modifier}+q" = "kill";
-            "${modifier}+b" = lib.mkIf cfg.commands.toggleBar "exec ${cfg.commands.toggleBar}";
+            "${modifier}+b" = lib.mkIf (cfg.commands.toggleBar != null) "exec ${cfg.commands.toggleBar}";
             "${modifier}+f" = "fullscreen toggle";
             "${modifier}+h" = "focus left";
             "${modifier}+j" = "focus down";
diff --git a/platforms/nixos/modules/nmasur/profiles/base.nix b/platforms/nixos/modules/nmasur/profiles/base.nix
index 8c2c7e9..64a407f 100644
--- a/platforms/nixos/modules/nmasur/profiles/base.nix
+++ b/platforms/nixos/modules/nmasur/profiles/base.nix
@@ -57,5 +57,7 @@ in
 
     };
 
+    allowUnfreePackages = config.home-manager.users.${username}.allowUnfreePackages;
+
   };
 }