fix lots of nixvim warnings

flake.lock

@@ -2002,12 +2002,28 @@
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "pre-commit-hooks": "pre-commit-hooks_3",
+        "secrets": "secrets",
         "sops-nix": "sops-nix",
         "stylix": "stylix",
         "superfile": "superfile",
         "zen-browser": "zen-browser"
       }
     },
+    "secrets": {
+      "locked": {
+        "lastModified": 1742622103,
+        "narHash": "sha256-eYKgwqm7jkoxzaSuvLSQq78L4ks4gtEQF8BkTt9an7k=",
+        "ref": "refs/heads/main",
+        "rev": "13c13466e8aa371bf8cb53f0f36fb0e086294f45",
+        "revCount": 2,
+        "type": "git",
+        "url": "ssh://git@github.com/gwg313/nixos-secrets.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://git@github.com/gwg313/nixos-secrets.git"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": "nixpkgs_12"

flake.nix

@@ -9,6 +9,7 @@
     # at the same time. Here's an working example:
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     # Also see the 'unstable-packages' overlay at 'overlays/default.nix'.
+    secrets.url = "git+ssh://git@github.com/gwg313/nixos-secrets.git";
     hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
     hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
     hyprspace = {

home-manager/modules/common-gui.nix

@@ -9,6 +9,7 @@
     ./thunar.nix
     ./zen.nix
     ./xdg.nix
+    ./mime.nix
   ];
 
   fonts.fontconfig.enable = true;

home-manager/modules/mime.nix

@@ -0,0 +1,39 @@
+{
+  xdg.mimeApps = {
+    enable = true;
+    defaultApplications = {
+      "text/markdown" = "nvim.desktop";
+      "text/plain" = "nvim.desktop";
+      "text/x-shellscript" = "nvim.desktop";
+      "text/x-python" = "nvim.desktop";
+      "text/x-go" = "nvim.desktop";
+      "text/css" = "nvim.desktop";
+      "text/javascript" = "nvim.desktop";
+      "text/x-c" = "nvim.desktop";
+      "text/x-c++" = "nvim.desktop";
+      "text/x-java" = "nvim.desktop";
+      "text/x-rust" = "nvim.desktop";
+      "text/x-yaml" = "nvim.desktop";
+      "text/x-toml" = "nvim.desktop";
+      "text/x-dockerfile" = "nvim.desktop";
+      "text/x-xml" = "nvim.desktop";
+      "text/x-php" = "nvim.desktop";
+      "image/jpeg" = "imv.desktop";
+      "image/jpg" = "imv.desktop";
+      "image/webp" = "imv.desktop";
+      "image/gif" = "zen.desktop";
+      "x-scheme-handler/http" = "zen.desktop";
+      "x-scheme-handler/https" = "zen.desktop";
+      "text/html" = "zen.desktop";
+      "application/pdf" = "zathura.desktop";
+      "image/png" = "imv-dir.desktop";
+      "x-scheme-handler/chrome" = "zen.desktop";
+      "application/x-extension-htm" = "zen.desktop";
+      "application/x-extension-html" = "zen.desktop";
+      "application/x-extension-shtml" = "zen.desktop";
+      "application/xhtml+xml" = "zen.desktop";
+      "application/x-extension-xhtml" = "zen.desktop";
+      "application/x-extension-xht" = "zen.desktop";
+    };
+  };
+}

home-manager/modules/neovim/plugins/clangd-extensions.nix

@@ -1,12 +1,13 @@
-{...}: {
+{ ... }:
+{
   programs.nixvim = {
     plugins = {
       clangd-extensions = {
         enable = true;
         enableOffsetEncodingWorkaround = true;
-
+        settings = {
           ast = {
-          roleIcons = {
+            role_icons = {
               type = "";
               declaration = "";
               expression = "";
@@ -14,7 +15,7 @@
               statement = "";
               templateArgument = "";
             };
-          kindIcons = {
+            kind_icons = {
               compound = "";
               recovery = "";
               translationUnit = "";
@@ -25,6 +26,8 @@
             };
           };
         };
+
+      };
     };
   };
 }

home-manager/modules/neovim/plugins/conform.nix

@@ -82,16 +82,7 @@
                 return { lsp_fallback = true }
               end
             '';
-        };
 
-        # NOTE:
-        # Conform will run multiple formatters sequentially
-        # [ "1" "2" "3"]
-        # Use a sub-list to run only the first available formatter
-        # [ ["1"] ["2"] ["3"] ]
-        # Use the "*" filetype to run formatters on all filetypes.
-        # Use the "_" filetype to run formatters on filetypes that don't
-        # have other formatters configured.
           formattersByFt = {
             bash = [
               "shellcheck"
@@ -229,6 +220,17 @@
             };
           };
         };
+
+        # NOTE:
+        # Conform will run multiple formatters sequentially
+        # [ "1" "2" "3"]
+        # Use a sub-list to run only the first available formatter
+        # [ ["1"] ["2"] ["3"] ]
+        # Use the "*" filetype to run formatters on all filetypes.
+        # Use the "_" filetype to run formatters on filetypes that don't
+        # have other formatters configured.
+
+      };
     };
   };
 }

home-manager/modules/neovim/plugins/default.nix

@@ -36,7 +36,8 @@ _: {
     ./noice.nix
     ./notify.nix
     ./precognition.nix
-    ./spectre.nix
+    # ./spectre.nix
+    ./grug-far.nix
     ./snacks.nix
     ./refactoring.nix
     ./render-markdown.nix

home-manager/modules/neovim/plugins/grug-far.nix

@@ -0,0 +1,25 @@
+{ ... }:
+{
+  programs.nixvim = {
+    plugins = {
+      grug-far = {
+        enable = true;
+        settings = {
+          cmd = "GrugFar";
+        };
+      };
+    };
+
+    keymaps = [
+      {
+        mode = "n";
+        key = "<leader>rs";
+        action = "<cmd>GrugFar<CR>";
+        options = {
+          desc = "GrugFar toggle";
+          silent = true;
+        };
+      }
+    ];
+  };
+}

home-manager/modules/neovim/plugins/lean.nix

@@ -1,9 +1,12 @@
-{...}: {
+{ ... }:
+{
   programs.nixvim = {
     plugins.lean = {
       enable = true;
-      lsp.enable = false;
+      settings = {
         abbreviations.enable = false;
+        lsp.enable = false;
+      };
     };
   };
 }

home-manager/modules/neovim/plugins/lsp.nix

@@ -62,7 +62,7 @@
           };
         };
         servers = {
-          nil-ls = {
+          nil_ls = {
             enable = true;
             filetypes = [ "nix" ];
             settings = {

home-manager/modules/neovim/plugins/navic.nix

@@ -1,8 +1,11 @@
-{...}: {
+{ ... }:
+{
   programs.nixvim = {
     plugins.navic = {
       enable = true;
+      settings = {
         lsp.autoAttach = true;
       };
     };
+  };
 }

home-manager/modules/neovim/plugins/noice.nix

@@ -5,86 +5,12 @@
       enable = true;
 
       # Hides the title above noice boxes
-      cmdline = {
-        format = {
-          cmdline = {
-            pattern = "^:";
-            icon = "";
-            lang = "vim";
-            opts = {
-              border = {
-                text = {
-                  top = "Cmd";
-                };
-              };
-            };
-          };
-          search_down = {
-            kind = "search";
-            pattern = "^/";
-            icon = " ";
-            lang = "regex";
-          };
-          search_up = {
-            kind = "search";
-            pattern = "^%?";
-            icon = " ";
-            lang = "regex";
-          };
-          filter = {
-            pattern = "^:%s*!";
-            icon = "";
-            lang = "bash";
-            opts = {
-              border = {
-                text = {
-                  top = "Bash";
-                };
-              };
-            };
-          };
-          lua = {
-            pattern = "^:%s*lua%s+";
-            icon = "";
-            lang = "lua";
-          };
-          help = {
-            pattern = "^:%s*he?l?p?%s+";
-            icon = "󰋖";
-          };
-          input = { };
-        };
-      };
 
-      messages = {
-        view = "mini";
-        viewError = "mini";
-        viewWarn = "mini";
-      };
-
-      lsp = {
-        override = {
-          "vim.lsp.util.convert_input_to_markdown_lines" = true;
-          "vim.lsp.util.stylize_markdown" = true;
-          "cmp.entry.get_documentation" = true;
-        };
-
-        progress.enabled = true;
-        signature.enabled = true;
-      };
-
-      popupmenu.backend = "nui";
       # Doesn't support the standard cmdline completions
       # popupmenu.backend = "cmp";
 
-      presets = {
+      settings = {
-        bottom_search = false;
+        popupmenu.backend = "nui";
-        command_palette = true;
-        long_message_to_split = true;
-        inc_rename = true;
-        lsp_doc_border = true;
-      };
-
         routes = [
           {
             filter = {
@@ -135,6 +61,84 @@
             };
           };
         };
+
+        presets = {
+          bottom_search = false;
+          command_palette = true;
+          long_message_to_split = true;
+          inc_rename = true;
+          lsp_doc_border = true;
+        };
+
+        lsp = {
+          override = {
+            "vim.lsp.util.convert_input_to_markdown_lines" = true;
+            "vim.lsp.util.stylize_markdown" = true;
+            "cmp.entry.get_documentation" = true;
+          };
+
+          progress.enabled = true;
+          signature.enabled = true;
+        };
+
+        messages = {
+          view = "mini";
+          viewError = "mini";
+          viewWarn = "mini";
+        };
+
+        cmdline = {
+          format = {
+            cmdline = {
+              pattern = "^:";
+              icon = "";
+              lang = "vim";
+              opts = {
+                border = {
+                  text = {
+                    top = "Cmd";
+                  };
+                };
+              };
+            };
+            search_down = {
+              kind = "search";
+              pattern = "^/";
+              icon = " ";
+              lang = "regex";
+            };
+            search_up = {
+              kind = "search";
+              pattern = "^%?";
+              icon = " ";
+              lang = "regex";
+            };
+            filter = {
+              pattern = "^:%s*!";
+              icon = "";
+              lang = "bash";
+              opts = {
+                border = {
+                  text = {
+                    top = "Bash";
+                  };
+                };
+              };
+            };
+            lua = {
+              pattern = "^:%s*lua%s+";
+              icon = "";
+              lang = "lua";
+            };
+            help = {
+              pattern = "^:%s*he?l?p?%s+";
+              icon = "󰋖";
+            };
+            input = { };
+          };
+        };
+      };
+
     };
   };
 }

home-manager/modules/neovim/plugins/todo-comments.nix

@@ -1,4 +1,5 @@
-{...}: {
+{ ... }:
+{
   programs.nixvim = {
     plugins.todo-comments = {
       enable = true;
@@ -9,6 +10,7 @@
           keywords = "TODO,FIX,HACK";
         };
       };
+      settings = {
         keywords = {
           FIX = {
             alt = [
@@ -61,4 +63,5 @@
         };
       };
     };
+  };
 }

home-manager/modules/ssh.nix

@@ -1,5 +1,6 @@
 # A modern replacement for 'ls'.
-{...}: {
+{ ... }:
+{
   programs.ssh = {
     enable = true;
     hashKnownHosts = true;
@@ -48,6 +49,18 @@
         user = "gwg313";
         identityFile = "/home/gwg313/.ssh/home/id_ed25519";
       };
+      "onedev.local" = {
+        hostname = "git.local.gwg313.xyz";
+        user = "gwg313";
+        identityFile = "/home/gwg313/.ssh/onedev/id_ed25519";
+        port = 2222;
+      };
+      "onedev" = {
+        hostname = "git.gwg313.xyz";
+        user = "gwg313";
+        identityFile = "/home/gwg313/.ssh/onedev/id_ed25519";
+        port = 2222;
+      };
     };
   };
 }

home-manager/modules/zen.nix

@@ -4,7 +4,84 @@
   inputs,
   ...
 }:
+let
+  accent = "#${config.lib.stylix.colors.base0D}";
+  background = "#${config.lib.stylix.colors.base00}";
+  foreground = "#${config.lib.stylix.colors.base05}";
+  muted = "#${config.lib.stylix.colors.base03}";
+
+  settings = ''
     {
+      "config": {
+        "title" : "Welcome Home",
+        "openLinksInNewTab": false,
+        "locale": "en-US",
+        "colors": {
+          "primary": "${accent}",
+          "background": "${background}",
+          "foreground": "${foreground}",
+          "muted": "#${muted}"
+        },
+        "folders": [
+          {
+            "name": "Bookmarks",
+            "links": [
+              {"title": "MyNixOs", "url": "https://mynixos.com", "icon": "󱄅"},
+              {"title": "Github", "url": "https://github.com", "icon": ""},
+              {"title": "Proton", "url": "https://mail.proton.me/u/0/inbox", "icon": ""},
+              {"title": "Chat GPT", "url": "https://chat.openai.com/", "icon": "󰭹"},
+              {"title": "Nixvim", "url": "https://nix-community.github.io/nixvim/", "icon": ""},
+              {"title": "Hyprland Wiki", "url": "https://wiki.hyprland.org/", "icon": "󰖬"},
+              {"title": "Youtube", "url": "https://youtube.com", "icon": "󰗃"}
+            ]
+          },
+          {
+            "name": "Uni",
+            "links": [
+              {"title": "Outlook", "url": "https://outlook.office.com/mail/", "icon": "󰴢"},
+              {"title": "Office", "url": "https://www.office.com/?auth=2", "icon": "󰏆"},
+              {"title": "Teams", "url": "https://teams.microsoft.com/_", "icon": "󰊻"},
+              {"title": "Brightspace", "url": "https://carleton.ca/brightspace/_", "icon": "󱨡"}
+            ]
+          }
+        ]
+      }
+    }
+  '';
+
+  homepage = pkgs.buildNpmPackage {
+    pname = "homepage";
+    version = "0.0.0";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "gwg313";
+      repo = "homepage";
+      rev = "b77d35ed3596eb451bd2ec78063d7cc6e73c773d";
+      hash = "sha256-j/40922kfAh6zqJ4IRYpr66YXNNYsxuXwZ0aiJFJea0=";
+    };
+
+    # npmDepsHash = lib.fakeHash;
+    npmDepsHash = "sha256-bG+CHTq2Rst3JMxsjAC81KhK+G7WwsTVD1eyP87g0z4=";
+
+    buildPhase = ''
+      npm install
+      cp ${pkgs.writeText "src/routes/config.json" settings} src/routes/config.json
+      npm run build
+      mkdir $out
+      mv build $out
+    '';
+
+    meta = {
+      description = "homepage";
+      homepage = "https://github.com/gwg313/homepage";
+    };
+  };
+in
+{
+  home.file.".config/homepage" = {
+    source = "${homepage}/build";
+    recursive = true;
+  };
 
   home.packages = with pkgs; [ inputs.zen-browser.packages."${system}".default ];
 }

hosts/candlekeep/configuration.nix

@@ -26,7 +26,7 @@
     ../../common/gui
     ../../common/virtualization
 
-    ./auditd.nix
+    # ./auditd.nix
     ./kernel.nix
     ./sysctl.nix
     ./earlyoom.nix

hosts/candlekeep/syncthing.nix

@@ -1,10 +1,10 @@
 {
   config,
   user,
+  inputs,
   ...
 }:
 {
-
   services.syncthing = {
     enable = true;
     dataDir = "/home/gwg313";
@@ -16,11 +16,14 @@
 
     overrideDevices = true;
     overrideFolders = true;
-
     settings = {
+      gui = {
+        user = inputs.secrets.syncthing.gui_user;
+        password = inputs.secrets.syncthing.gui_password;
+      };
       devices = {
         "grymforge" = {
-          id = "MYJZ7YS-WWHZDW7-KMADKI7-WZNEV3V-AZP2J6Z-4AJOYHZ-G3HLEDO-KTVZPAF";
+          id = inputs.secrets.syncthing.grymforge_id;
         };
       };
 
@@ -47,17 +50,6 @@
             };
           };
         };
-        "obsidian" = {
-          path = "/home/gwg313/vault";
-          devices = [ "grymforge" ];
-          versioning = {
-            type = "staggered";
-            params = {
-              cleanInterval = "3600";
-              maxAge = "15768000";
-            };
-          };
-        };
       };
     };
   };

hosts/grymforge/configuration.nix

@@ -28,7 +28,7 @@
     ../../common/gui
 
     ./syncthing.nix
-    ./auditd.nix
+    # ./auditd.nix
     ./kernel.nix
     ./sysctl.nix
     ./earlyoom.nix

hosts/grymforge/syncthing.nix

@@ -1,6 +1,7 @@
 {
   config,
   user,
+  inputs,
   ...
 }:
 {
@@ -17,9 +18,13 @@
     overrideFolders = true;
 
     settings = {
+      gui = {
+        user = inputs.secrets.syncthing.gui_user;
+        password = inputs.secrets.syncthing.gui_password;
+      };
       devices = {
         "candlekeep" = {
-          id = "OREQCG7-JQMPCU4-HWFEQVM-7C6VYSC-A25I3PD-BYQ6RSU-7FQGDFX-SJDPGQY";
+          id = inputs.secrets.syncthing.candlekeep_id;
         };
       };
 
@@ -46,17 +51,6 @@
             };
           };
         };
-        "obsidian" = {
-          path = "/home/gwg313/vault";
-          devices = [ "candlekeep" ];
-          versioning = {
-            type = "staggered";
-            params = {
-              cleanInterval = "3600";
-              maxAge = "15768000";
-            };
-          };
-        };
       };
     };
   };

secrets/secrets.yaml

@@ -15,8 +15,8 @@ sops:
             US9oa0pORXRVWWlyYlZZTGhXdTdOaWsKClqIK/YNJIIGFqOO0t4oni8dRTTXQniG
             ioIwAOdEgE/n0vcYhHXxLxWlTeqGZF076g7EFfIqiSNqrDtacRnazg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-02-16T03:03:41Z"
+    lastmodified: "2025-03-22T17:04:45Z"
-    mac: ENC[AES256_GCM,data:ni4W1SkocmHwVSzkoUj3vFBZKWhF4ImPOIzLxvpLiG8Cwz8YvSca0Ca1T30zjyS1RS7IrkTB+2RmpTs4isJc9lcTf30PJq1bgm9mGt5FXmGoNz6L0cJtWPLktGj1MTkMX/DylaBOnqTYdAWW9Ix072jtCLiECwkjeiHMHvFdJmQ=,iv:m0yrwnN6wcD+EAQvGgQVoWEcXfiKK0JhBpCXutiZN98=,tag:BLytc4Zr9elxVS/YlExcxg==,type:str]
+    mac: ENC[AES256_GCM,data:bUudvCi32CKQ0d5pZVMADnbtokMqS3sWW5aLFMP8JOAJWo4Yg2D05TDKpSO3/3nskrWH3i745fsMkVk8kWYRYpqtXu443k1avtDnEwIbJHTM7bluB4LX6xc9h4wiPHflc+H9nQwRPchZb8LBO0xTKswoptSUxhAsFW+KpzlbCN4=,iv:xJuG1BsVMRJcV8fiv2C1a5/ltT75eV52/xXdSexP7YY=,tag:QyE4TC8KKG1tobXjK37moA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.9.2
+    version: 3.9.4