clean up commented xdg mime associations

instead of running a systemd service timer

modules/common/neovim/config/lsp.nix

@@ -1,11 +1,10 @@
 { 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 =
 
@@ -19,12 +18,6 @@
       '' 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
@@ -48,11 +41,7 @@
       };
 
       use.lspconfig.pyright.setup = dsl.callWith {
-        cmd = if config.python then [
-          "${pkgs.pyright}/bin/pyright-langserver"
-          "--stdio"
-        ] else
-          [ "echo" ];
+        cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
       };
 
       use.lspconfig.terraformls.setup = dsl.callWith {
@@ -81,6 +70,8 @@
         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" }),
@@ -89,7 +80,6 @@
                     command = "${pkgs.shfmt}/bin/shfmt",
                     extra_args = { "-i", "4", "-ci" },
                 }),
-                ${pythonFormat}
                 ${terraformFormat}
             },
 

modules/common/neovim/config/syntax.nix

@@ -1,12 +1,12 @@
-{ pkgs, lib, config, ... }: {
+{ pkgs, lib, ... }: {
 
   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,15 +14,16 @@
         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 {
@@ -30,7 +31,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,11 +5,9 @@ let
   neovim = import ./package {
     inherit pkgs;
     colors = config.theme.colors;
-    c = config.c.enable;
+    terraform = config.terraform.enable;
     github = true;
     kubernetes = config.kubernetes.enable;
-    python = config.python.enable;
-    terraform = config.terraform.enable;
   };
 
 in {

modules/common/programming/c.nix

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

modules/common/shell/fish/functions/fish_user_key_bindings.fish

@@ -18,5 +18,5 @@ bind -M insert \cn 'commandline -r "nix shell nixpkgs#"'
 bind -M default \cn 'commandline -r "nix shell nixpkgs#"'
 bind -M insert \x11F nix-fzf
 bind -M default \x11F nix-fzf
-bind -M insert \ch _atuin_search --filter-mode global
-bind -M default \ch _atuin_search --filter-mode global
+bind -M insert \ch '_atuin_search --filter-mode global'
+bind -M default \ch '_atuin_search --filter-mode global'

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

@@ -8,10 +8,10 @@ obj.name = "Launcher"
 obj.version = "0.1"
 obj.license = "MIT - https://opensource.org/licenses/MIT"
 
-local width = hs.screen.mainScreen():fullFrame().w
+local screen = hs.screen.primaryScreen()
 local switcherWidth = 500
 obj.canvas = hs.canvas.new({
-    x = width / 2 - switcherWidth / 2,
+    x = (screen:fullFrame().x + screen:fullFrame().w) / 2 - switcherWidth / 2,
     y = 1,
     h = 3,
     w = switcherWidth,

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

@@ -56,7 +56,7 @@ function obj:init()
         local frame = win:frame()
         -- maximize if possible
         local max = win:screen():fullFrame()
-        frame.x = max.w / 2
+        frame.x = (max.x * 2 + max.w) / 2
         frame.y = max.y
         frame.w = max.w / 2
         frame.h = max.h

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

@@ -51,6 +51,7 @@ local function worklayout()
         local laptop = {
             { "Firefox",  nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
             { "Obsidian", nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
+            { "Calendar", nil, LAPTOP_MONITOR, u(0, 0, 1, 1), nil, nil, visible = true },
         }
         local layout = concat(left, right, laptop)
         hs.layout.apply(layout)

modules/darwin/kitty.nix

@@ -3,7 +3,6 @@
   # MacOS-specific settings for Kitty
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
     programs.kitty = {
-      darwinLaunchOptions = [ "--start-as=fullscreen" ];
       font.size = lib.mkForce 20;
       settings = {
         shell = "/run/current-system/sw/bin/fish";

modules/darwin/utilities.nix

@@ -7,7 +7,7 @@
   home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
 
     home.packages = with pkgs; [
-      # visidata # CSV inspector
+      visidata # CSV inspector
       dos2unix # Convert Windows text files
       inetutils # Includes telnet
       youtube-dl # Convert web videos

modules/nixos/applications/nautilus.nix

@@ -36,23 +36,12 @@
       # Set Nautilus as default for opening directories
       xdg.mimeApps = {
         associations.added."inode/directory" = [ "org.gnome.Nautilus.desktop" ];
-        # associations.removed = {
-        #   "inode/directory" = [ "kitty-open.desktop" ];
-        # };
         defaultApplications."inode/directory" =
           lib.mkBefore [ "org.gnome.Nautilus.desktop" ];
       };
 
     };
 
-    # # Set default for opening directories
-    # xdg.mime = {
-    #   addedAssociations."inode/directory" = [ "org.gnome.Nautilus.desktop" ];
-    #   removedAssociations = { "inode/directory" = [ "kitty-open.desktop" ]; };
-    #   defaultApplications."inode/directory" =
-    #     lib.mkForce [ "org.gnome.Nautilus.desktop" ];
-    # };
-
     # Delete Trash files older than 1 week
     systemd.user.services.empty-trash = {
       description = "Empty Trash on a regular basis";

modules/nixos/services/cloudflare.nix

@@ -80,7 +80,7 @@ in {
     };
 
     # Allows Nextcloud to trust Cloudflare IPs
-    services.nextcloud.extraOptions.trusted_proxies = cloudflareIpRanges;
+    services.nextcloud.settings.trusted_proxies = cloudflareIpRanges;
 
   };
 }

modules/nixos/services/nextcloud.nix

@@ -14,7 +14,7 @@
         adminpassFile = config.secrets.nextcloud.dest;
         dbtype = "mysql";
       };
-      extraOptions = {
+      settings = {
         default_phone_region = "US";
         # Allow access when hitting either of these hosts or IPs
         trusted_domains = [ config.hostnames.content ];

modules/nixos/services/paperless.nix

@@ -48,23 +48,12 @@
       before = [ "paperless.service" ];
     };
 
-    # Fix permissions on a regular schedule
-    systemd.timers.paperless-permissions = {
-      timerConfig = {
-        OnCalendar = "*-*-* *:0/5"; # Every 5 minutes
-        Unit = "paperless-permissions.service";
-      };
-      wantedBy = [ "timers.target" ];
-    };
-
     # Fix paperless shared permissions
-    systemd.services.paperless-permissions = {
-      description = "Allow group access to paperless files";
-      serviceConfig = { Type = "oneshot"; };
-      script = ''
-        find ${config.services.paperless.mediaDir} -type f -exec chmod 640 -- {} +
-      '';
-    };
+    systemd.services.paperless-web.serviceConfig.UMask = lib.mkForce "0026";
+    systemd.services.paperless-scheduler.serviceConfig.UMask =
+      lib.mkForce "0026";
+    systemd.services.paperless-task-queue.serviceConfig.UMask =
+      lib.mkForce "0026";
 
   };