modules/darwin/kitty.nix

@@ -9,7 +9,6 @@
         shell = "/run/current-system/sw/bin/fish";
         macos_traditional_fullscreen = true;
         macos_quit_when_last_window_closed = true;
-        disable_ligatures = "always";
       };
     };
   };

modules/darwin/system.nix

@@ -132,16 +132,6 @@
       defaults write com.apple.screensaver askForPassword -int 1
       defaults write com.apple.screensaver askForPasswordDelay -int 0
 
-      echo "Allow apps from anywhere"
-      SPCTL=$(spctl --status)
-      if ! [ "$SPCTL" = "assessments disabled" ]; then
-          sudo spctl --master-disable
-      fi
-
-    '';
-
-    # User-level settings
-    activationScripts.postUserActivation.text = ''
       echo "Show the ~/Library folder"
       chflags nohidden ~/Library
 
@@ -171,12 +161,17 @@
           "$(__dock_item /System/Applications/Mail.app)" \
           "$(__dock_item /Applications/Mimestream.app)" \
           "$(__dock_item /Applications/zoom.us.app)" \
-          "$(__dock_item ${pkgs.discord}/Applications/Discord.app)" \
           "$(__dock_item /Applications/Obsidian.app)" \
-          "$(__dock_item ${pkgs.kitty}/Applications/kitty.app)" \
+          "$(__dock_item /Applications/Alacritty.app)" \
           "$(__dock_item /System/Applications/System\ Preferences.app)"
-    '';
 
+      echo "Allow apps from anywhere"
+      SPCTL=$(spctl --status)
+      if ! [ "$SPCTL" = "assessments disabled" ]; then
+          sudo spctl --master-disable
+      fi
+
+    '';
   };
 
 }

modules/darwin/user.nix

@@ -4,12 +4,6 @@
     # macOS user
     home = config.homePath;
     shell = pkgs.fish; # Default shell
-
-  };
-
-  # Used for aerc
-  home-manager.users.${config.user} = {
-    home.sessionVariables = { XDG_CONFIG_HOME = "${config.homePath}/.config"; };
   };
 
 }

modules/neovim/lua/packer/toggleterm.lua

@@ -50,7 +50,7 @@ M.packer = function(use)
             vim.keymap.set("n", "<Leader>t", TERM_TOGGLE)
             vim.keymap.set("n", "<Leader>P", NIXPKGS_TOGGLE)
             vim.keymap.set("n", "<Leader>gw", GITWATCH_TOGGLE)
-            vim.keymap.set("n", "<Leader>9", K9S_TOGGLE)
+            vim.keymap.set("n", "<C-k>", K9S_TOGGLE)
         end,
     })
 

modules/neovim/lua/settings.lua

@@ -75,11 +75,6 @@ vim.api.nvim_exec(
     false
 )
 
-vim.filetype.add({
-    pattern = {
-        [".*%.tfvars"] = "terraform",
-    },
-})
 vim.api.nvim_create_autocmd("FileType", {
     pattern = "*.eml",
     callback = function()