set checks on individual languages

apache directory studio can't figure out how to make it work on m3

modules/common/applications/1password.nix

@@ -12,7 +12,7 @@
   config = lib.mkIf (config.gui.enable && config._1password.enable) {
     unfreePackages = [ "1password" "_1password-gui" "1password-cli" ];
     home-manager.users.${config.user} = {
-      home.packages = with pkgs; [ _1password-gui ];
+      home.packages = with pkgs; [ _1password-gui _1password ];
     };
 
     # https://1password.community/discussion/135462/firefox-extension-does-not-connect-to-linux-app

modules/common/applications/discord.nix

@@ -11,8 +11,8 @@
 
   config = lib.mkIf (config.gui.enable && config.discord.enable) {
     unfreePackages = [ "discord" ];
+    environment.systemPackages = [ pkgs.discord ];
     home-manager.users.${config.user} = {
-      home.packages = with pkgs; [ discord ];
       xdg.configFile."discord/settings.json".text = ''
         {
           "BACKGROUND_COLOR": "#202225",

modules/common/applications/media.nix

@@ -40,6 +40,7 @@
         associations.added = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
           "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/png" = [ "nsxiv.desktop" ];
           "image/*" = [ "nsxiv.desktop" ];
         };
         associations.removed = {
@@ -48,6 +49,7 @@
         defaultApplications = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];
           "image/jpeg" = [ "nsxiv.desktop" ];
+          "image/png" = [ "nsxiv.desktop" ];
           "image/*" = [ "nsxiv.desktop" ];
         };
       };

modules/common/neovim/config/lsp.nix

@@ -1,10 +1,11 @@
 { pkgs, lib, config, dsl, ... }: {
 
   # Terraform optional because non-free
-  options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
   options.github = lib.mkEnableOption "Whether to enable GitHub features";
   options.kubernetes =
     lib.mkEnableOption "Whether to enable Kubernetes features";
+  options.python = lib.mkEnableOption "Whether to enable Python LSP";
+  options.terraform = lib.mkEnableOption "Whether to enable Terraform LSP";
 
   config =
 
@@ -18,6 +19,12 @@
       '' else
         "";
 
+      pythonFormat = if config.python then ''
+        require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
+        require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
+      '' else
+        "";
+
     in {
       plugins = [
         pkgs.vimPlugins.nvim-lspconfig
@@ -41,7 +48,11 @@
       };
 
       use.lspconfig.pyright.setup = dsl.callWith {
-        cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
+        cmd = if config.python then [
+          "${pkgs.pyright}/bin/pyright-langserver"
+          "--stdio"
+        ] else
+          [ "echo" ];
       };
 
       use.lspconfig.terraformls.setup = dsl.callWith {
@@ -70,8 +81,6 @@
         require("null-ls").setup({
             sources = {
                 require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),
-                require("null-ls").builtins.formatting.black.with({ command = "${pkgs.black}/bin/black" }),
-                require("null-ls").builtins.diagnostics.ruff.with({ command = "${pkgs.ruff}/bin/ruff" }),
                 require("null-ls").builtins.formatting.fish_indent.with({ command = "${pkgs.fish}/bin/fish_indent" }),
                 require("null-ls").builtins.formatting.nixfmt.with({ command = "${pkgs.nixfmt}/bin/nixfmt" }),
                 require("null-ls").builtins.formatting.rustfmt.with({ command = "${pkgs.rustfmt}/bin/rustfmt" }),
@@ -80,6 +89,7 @@
                     command = "${pkgs.shfmt}/bin/shfmt",
                     extra_args = { "-i", "4", "-ci" },
                 }),
+                ${pythonFormat}
                 ${terraformFormat}
             },
 

modules/common/neovim/config/syntax.nix

@@ -1,12 +1,12 @@
-{ pkgs, lib, ... }: {
+{ pkgs, lib, config, ... }: {
 
   plugins = [
     (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
-      with pkgs.tree-sitter-grammars; [
+      with pkgs.tree-sitter-grammars;
+      [
         tree-sitter-bash
         tree-sitter-c
         tree-sitter-fish
-        tree-sitter-hcl
         tree-sitter-ini
         tree-sitter-json
         tree-sitter-lua
@@ -14,16 +14,15 @@
         tree-sitter-markdown-inline
         tree-sitter-nix
         tree-sitter-puppet
-        tree-sitter-python
         tree-sitter-rasi
         tree-sitter-toml
         tree-sitter-vimdoc
         tree-sitter-yaml
-      ]))
+      ] ++ (if config.python.enable then [ tree-sitter-python ] else [ ])
+      ++ (if config.terraform.enable then [ tree-sitter-hcl ] else [ ])))
     pkgs.vimPlugins.vim-matchup # Better % jumping in languages
     pkgs.vimPlugins.playground # Tree-sitter experimenting
     pkgs.vimPlugins.nginx-vim
-    pkgs.vimPlugins.vim-helm
     pkgs.baleia-nvim # Clean ANSI from kitty scrollback
     # pkgs.hmts-nvim # Tree-sitter injections for home-manager
     (pkgs.vimUtils.buildVimPlugin {
@@ -31,7 +30,7 @@
       version = "0.1";
       src = ../plugin;
     })
-  ];
+  ] ++ (if config.kubernetes.enable then [ pkgs.vimPlugins.vim-helm ] else [ ]);
 
   setup."nvim-treesitter.configs" = {
     highlight = { enable = true; };

modules/common/neovim/default.nix

@@ -5,9 +5,11 @@ let
   neovim = import ./package {
     inherit pkgs;
     colors = config.theme.colors;
-    terraform = config.terraform.enable;
+    c = config.c.enable;
     github = true;
     kubernetes = config.kubernetes.enable;
+    python = config.python.enable;
+    terraform = config.terraform.enable;
   };
 
 in {

modules/common/programming/c.nix

@@ -0,0 +1 @@
+{ lib, ... }: { options.c.enable = lib.mkEnableOption "C language tools."; }

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

@@ -9,7 +9,7 @@ obj.version = "0.1"
 obj.license = "MIT - https://opensource.org/licenses/MIT"
 
 function obj:init()
-    hs.window.animationDuration = 0
+    hs.window.animationDuration = 0.1
     dofile(hs.spoons.resourcePath("worklayout.lua"))()
     -- bind hotkey
     hs.hotkey.bind({ "alt", "ctrl", "cmd" }, "n", function()

modules/darwin/homebrew.nix

@@ -30,17 +30,14 @@
       };
       brews = [
         "trash" # Delete files and folders to trash instead of rm
-        "openjdk" # Required by Apache Directory Studio
       ];
       casks = [
         "1password" # 1Password will not launch from Nix on macOS
-        "apache-directory-studio" # Packaging on Nix is not available for macOS
         # "gitify" # Git notifications in menu bar (downgrade manually from 4.6.1)
         "keybase" # GUI on Nix not available for macOS
         # "logitech-g-hub" # Mouse and keyboard management
         "logitune" # Logitech webcam firmware
         "meetingbar" # Show meetings in menu bar
-        # "obsidian" # Obsidian packaging on Nix is not available for macOS
         "scroll-reverser" # Different scroll style for mouse vs. trackpad
         # "steam" # Not packaged for Nix
         # "epic-games" # Not packaged for Nix

modules/darwin/system.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }: {
+{ config, pkgs, lib, ... }: {
 
   config = lib.mkIf pkgs.stdenv.isDarwin {
 
@@ -112,89 +112,95 @@
         # Disable trackpad tap to click
         trackpad.Clicking = false;
 
-        # universalaccess = {
-
-        #   # Zoom in with Control + Scroll Wheel
-        #   closeViewScrollWheelToggle = true;
-        #   closeViewZoomFollowsFocus = true;
-        # };
-
         # Where to save screenshots
         screencapture.location = "~/Downloads";
 
+        CustomUserPreferences = {
+          # Disable disk image verification
+          "com.apple.frameworks.diskimages" = {
+            skip-verify = true;
+            skip-verify-locked = true;
+            skip-verify-remote = true;
+          };
+          # Avoid creating .DS_Store files on network or USB volumes
+          "com.apple.desktopservices" = {
+            DSDontWriteNetworkStores = true;
+            DSDontWriteUSBStores = true;
+          };
+          "com.apple.dock" = {
+            magnification = true;
+            largesize = 48;
+            persistent-apps = let
+              dockText = app:
+                "<dict><key>tile-data</key><dict><key>file-data</key><dict><key>_CFURLString</key><string>${app}</string><key>_CFURLStringType</key><integer>0</integer></dict></dict></dict>";
+            in map dockText [
+              "/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" = {
+            askForPassword = 1;
+            askForPasswordDelay = 0;
+          };
+          "com.apple.finder" = {
+            # Disable the warning before emptying the Trash
+            WarnOnEmptyTrash = false;
+
+            # Finder search in current folder by default
+            FXDefaultSearchScope = "SCcf";
+
+            # Default Finder window set to column view
+            FXPreferredViewStyle = "clmv";
+          };
+          "leits.MeetingBar" = {
+            eventTimeFormat = ''"show"'';
+            eventTitleFormat = ''"none"'';
+            eventTitleIconFormat = ''"iconCalendar"'';
+            slackBrowser =
+              ''{"deletable":true,"arguments":"","name":"Slack","path":""}'';
+            zoomBrowser =
+              ''{"deletable":true,"arguments":"","name":"Zoom","path":""}'';
+            KeyboardShortcuts_joinEventShortcut =
+              ''{"carbonModifiers":6400,"carbonKeyCode":38}'';
+            timeFormat = ''"12-hour"'';
+          };
+        };
+
+        CustomSystemPreferences = {
+
+        };
+
       };
 
       # Settings that don't have an option in nix-darwin
       activationScripts.postActivation.text = ''
-        echo "Disable disk image verification"
-        defaults write com.apple.frameworks.diskimages skip-verify -bool true
-        defaults write com.apple.frameworks.diskimages skip-verify-locked -bool true
-        defaults write com.apple.frameworks.diskimages skip-verify-remote -bool true
-
-        echo "Avoid creating .DS_Store files on network volumes"
-        defaults write com.apple.desktopservices DSDontWriteNetworkStores -bool true
-
-        echo "Disable the warning before emptying the Trash"
-        defaults write com.apple.finder WarnOnEmptyTrash -bool false
-
-        echo "Require password immediately after sleep or screen saver begins"
-        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 = ''
+      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
 
-        if [ ! $(defaults read com.apple.dock magnification) = "1" ]; then
-            echo "Enable dock magnification"
-            defaults write com.apple.dock magnification -bool true
-        fi
-
-        if [ ! $(defaults read com.apple.dock largesize) = "48" ]; then
-            echo "Set dock magnification size"
-            defaults write com.apple.dock largesize -int 48
-        fi
-
-        echo "Define dock icon function"
-        __dock_item() {
-            printf "%s%s%s%s%s" \
-                   "<dict><key>tile-data</key><dict><key>file-data</key><dict>" \
-                   "<key>_CFURLString</key><string>" \
-                   "$1" \
-                   "</string><key>_CFURLStringType</key><integer>0</integer>" \
-                   "</dict></dict></dict>"
-        }
-
         echo "Choose and order dock icons"
-        defaults write com.apple.dock persistent-apps -array \
+        defaults write com.apple.dock persistent-apps -array ${persistentApps}
-            "$(__dock_item /Applications/1Password.app)" \
-            "$(__dock_item ${pkgs.slack}/Applications/Slack.app)" \
-            "$(__dock_item /System/Applications/Calendar.app)" \
-            "$(__dock_item ${pkgs.firefox-bin}/Applications/Firefox.app)" \
-            "$(__dock_item /System/Applications/Messages.app)" \
-            "$(__dock_item /System/Applications/Mail.app)" \
-            "$(__dock_item /Applications/zoom.us.app)" \
-            "$(__dock_item ${pkgs.discord}/Applications/Discord.app)" \
-            "$(__dock_item ${pkgs.obsidian}/Applications/Obsidian.app)" \
-            "$(__dock_item ${pkgs.kitty}/Applications/kitty.app)" \
-            "$(__dock_item /System/Applications/System\ Settings.app)"
-
-        echo "MeetingBar settings"
-        defaults write leits.MeetingBar eventTimeFormat -string "\"show\""
-        defaults write leits.MeetingBar eventTitleFormat -string "\"none\""
-        defaults write leits.MeetingBar eventTitleIconFormat -string "\"iconCalendar\""
-        defaults write leits.MeetingBar slackBrowser -string "{\"deletable\":true,\"arguments\":\"\",\"name\":\"Slack\",\"path\":\"\"}"
-        defaults write leits.MeetingBar zoomBrowser -string "{\"deletable\":true,\"arguments\":\"\",\"name\":\"Zoom\",\"path\":\"\"}"
-        defaults write leits.MeetingBar KeyboardShortcuts_joinEventShortcut -string "{\"carbonModifiers\":6400,\"carbonKeyCode\":38}"
       '';
 
     };

modules/nixos/hardware/keyboard.nix

@@ -4,7 +4,7 @@
 
     services.xserver = {
 
-      layout = "us";
+      xkb.layout = "us";
 
       # Keyboard responsiveness
       autoRepeatDelay = 250;