modules/common/shell/git.nix

@@ -38,12 +38,6 @@ in {
           push = { autoSetupRemote = "true"; };
           init = { defaultBranch = "master"; };
           rebase = { autosquash = "true"; };
-          gpg = {
-            format = "ssh";
-            ssh.allowedSignersFile = "~/.config/git/allowed-signers";
-          };
-          commit.gpgsign = true;
-          tag.gpgsign = true;
         };
         ignores = [ ".direnv/**" "result" ];
         includes = [{
@@ -58,11 +52,6 @@ in {
         [user]
             name = "${config.fullName}"
             email = "7386960+nmasur@users.noreply.github.com"
-            signingkey = ~/.ssh/id_ed25519
-      '';
-
-      xdg.configFile."git/allowed-signers".text = ''
-        7386960+nmasur@users.noreply.github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s
       '';
 
       programs.fish.shellAbbrs = {

modules/common/shell/work.nix

@@ -16,10 +16,6 @@
       ldap_dc_2 = "t${magic_number}";
       ldap_dc_3 = magic_end_seq;
       ldap_script = pkgs.writeShellScriptBin "ldap" ''
-        # if ! [ "$LDAP_HOST" ]; then
-        #     echo "No LDAP_HOST specified!"
-        #     exit 1
-        # fi
         SEARCH_FILTER="$@"
         ldapsearch -LLL \
             -B -o ldif-wrap=no \

modules/darwin/hammerspoon/Spoons/Launcher.spoon/init.lua

@@ -10,6 +10,22 @@ obj.license = "MIT - https://opensource.org/licenses/MIT"
 
 local screen = hs.screen.primaryScreen()
 local switcherWidth = 500
+obj.canvas = hs.canvas.new({
+    x = (screen:fullFrame().x + screen:fullFrame().w) / 2 - switcherWidth / 2,
+    y = 1,
+    h = 3,
+    w = switcherWidth,
+})
+-- Draw switcher
+obj.canvas[#obj.canvas + 1] = {
+    action = "build",
+    type = "rectangle",
+}
+obj.canvas[#obj.canvas + 1] = {
+    type = "rectangle",
+    fillColor = { alpha = 1, red = 0.8, green = 0.6, blue = 0.3 },
+    action = "fill",
+}
 
 function obj:init()
     -- Begin launcher mode
@@ -23,29 +39,13 @@ function obj:init()
     -- Behaviors on enter
     function self.launcher:entered()
         -- hs.alert("Entered mode")
-        obj.canvas = hs.canvas.new({
-            x = (screen:fullFrame().x + screen:fullFrame().w) / 2 - switcherWidth / 2,
-            y = 1,
-            h = 3,
-            w = switcherWidth,
-        })
-        -- Draw switcher
-        obj.canvas[#obj.canvas + 1] = {
-            action = "build",
-            type = "rectangle",
-        }
-        obj.canvas[#obj.canvas + 1] = {
-            type = "rectangle",
-            fillColor = { alpha = 1, red = 0.8, green = 0.6, blue = 0.3 },
-            action = "fill",
-        }
         obj.canvas:show()
     end
 
     -- Behaviors on exit
     function self.launcher:exited()
         -- hs.alert("Exited mode")
-        obj.canvas:delete(0.2)
+        obj.canvas:hide()
     end
 
     -- Use escape to exit launcher mode

modules/darwin/system.nix

@@ -88,21 +88,6 @@
           orientation = "bottom";
           show-recents = false;
           tilesize = 44;
-
-          persistent-apps = [
-            "/Applications/1Password.app"
-            "${pkgs.slack}/Applications/Slack.app"
-            "/System/Applications/Calendar.app"
-            "${pkgs.firefox-bin}/Applications/Firefox.app"
-            "/System/Applications/Messages.app"
-            "/System/Applications/Mail.app"
-            "/Applications/zoom.us.app"
-            "${pkgs.discord}/Applications/Discord.app"
-            "${pkgs.obsidian}/Applications/Obsidian.app"
-            "${pkgs.kitty}/Applications/kitty.app"
-            "/System/Applications/System Settings.app"
-          ];
-
         };
 
         finder = {
@@ -145,6 +130,19 @@
           "com.apple.dock" = {
             magnification = true;
             largesize = 48;
+            persistent-apps = [
+              "/Applications/1Password.app"
+              "${pkgs.slack}/Applications/Slack.app"
+              "/System/Applications/Calendar.app"
+              "${pkgs.firefox-bin}/Applications/Firefox.app"
+              "/System/Applications/Messages.app"
+              "/System/Applications/Mail.app"
+              "/Applications/zoom.us.app"
+              "${pkgs.discord}/Applications/Discord.app"
+              "${pkgs.obsidian}/Applications/Obsidian.app"
+              "${pkgs.kitty}/Applications/kitty.app"
+              "/System/Applications/System Settings.app"
+            ];
           };
           # Require password immediately after screen saver begins
           "com.apple.screensaver" = {
@@ -191,10 +189,16 @@
       '';
 
       # User-level settings
-      activationScripts.postUserActivation.text = ''
+      activationScripts.postUserActivation.text = let
+        persistentApps = lib.concatMapStrings (x: ''"'' + x + ''" '')
+          config.system.defaults.CustomUserPreferences."com.apple.dock".persistent-apps;
+      in ''
         echo "Show the ~/Library folder"
         chflags nohidden ~/Library
 
+        echo "Choose and order dock icons"
+        defaults write com.apple.dock persistent-apps -array ${persistentApps}
+
         echo "Reduce Menu Bar padding"
         defaults write -globalDomain NSStatusItemSelectionPadding -int 6
         defaults write -globalDomain NSStatusItemSpacing -int 6