add fidget for neovim lsp status indicator

Flake lock file updates:

• Updated input 'darwin':
    'github:lnl7/nix-darwin/afe83cbc2e673b1f08d32dd0f70df599678ff1e7' (2023-10-27)
  → 'github:lnl7/nix-darwin/0f1ad801387445fdda01d080db8ecf169be8e793' (2023-11-11)
• Updated input 'disko':
    'github:nix-community/disko/548962c50b8afad7b8c820c1d6e21dc8394d6e65' (2023-11-04)
  → 'github:nix-community/disko/89fd5b51f0725f9775ca9999d53a0a3e5d936490' (2023-11-11)
• Updated input 'firefox-darwin':
    'github:bandithedoge/nixpkgs-firefox-darwin/9edd9209798cb115ebadfb5424d49b79b257ebea' (2023-11-04)
  → 'github:bandithedoge/nixpkgs-firefox-darwin/63df8ec2d300da9912ae5b56b74e7aa574b6de0c' (2023-11-11)
• Updated input 'home-manager':
    'github:nix-community/home-manager/8765d4e38aa0be53cdeee26f7386173e6c65618d' (2023-11-03)
  → 'github:nix-community/home-manager/50e582b9f91e409ffd2e134017445d376659b32e' (2023-11-12)
• Updated input 'nextcloud-cookbook':
    'https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz?narHash=sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI%2BeXDHnNSm1HDbP6M%3D'
  → 'https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz?narHash=sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI%2BeXDHnNSm1HDbP6M%3D' (2023-03-24)
• Updated input 'nextcloud-external':
    'https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz?narHash=sha256-X7eC8T8wSZGVwCQp6U/WxjMC7aIj39osgHotaUoRNSQ%3D'
  → 'https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz?narHash=sha256-X7eC8T8wSZGVwCQp6U/WxjMC7aIj39osgHotaUoRNSQ%3D' (2023-09-04)
• Updated input 'nextcloud-news':
    'https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz?narHash=sha256-cfJkKRNSz15L4E3w1tnEb%2Bt4MrVwVzb8lb6vCOA4cK4%3D'
  → 'https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz?narHash=sha256-cfJkKRNSz15L4E3w1tnEb%2Bt4MrVwVzb8lb6vCOA4cK4%3D' (2023-09-28)
• Updated input 'nur':
    'github:nix-community/nur/8d9f20f147c17d62d16025e9769adbd76245591e' (2023-11-05)
  → 'github:nix-community/nur/ff495b6b6763bcb879b97c105eedc1db23260bab' (2023-11-12)
• Updated input 'nvim-tree-lua-src':
    'github:kyazdani42/nvim-tree.lua/7e3c0bee7b246ca835d5f7453db6fa19de359bab' (2023-10-30)
  → 'github:kyazdani42/nvim-tree.lua/874ae6e9445a5eb5ba430e5fd10212450a261ad7' (2023-11-12)
• Updated input 'nvim-treesitter-src':
    'github:nvim-treesitter/nvim-treesitter/bef2c24e23d0da62a8542b1f08b1ac87ec43e93f' (2023-11-04)
  → 'github:nvim-treesitter/nvim-treesitter/075a64addc33390028ea124a1046a43497f05cd1' (2023-11-11)
• Updated input 'proton-ge':
    'https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz?narHash=sha256-75A0VCVdYkiMQ1duE9r2%2BDLBJzV02vUozoVLeo/TIWQ%3D'
  → 'https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz?narHash=sha256-75A0VCVdYkiMQ1duE9r2%2BDLBJzV02vUozoVLeo/TIWQ%3D' (2023-09-24)
• Updated input 'telescope-project-nvim-src':
    'github:nvim-telescope/telescope-project.nvim/7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30' (2023-04-27)
  → 'github:nvim-telescope/telescope-project.nvim/5460c6c60d48618c5c746e5b1cad4c3e8262fdae' (2023-11-06)
• Updated input 'wsl':
    'github:nix-community/NixOS-WSL/a058cff4b09b3a398d8caa379b4dc96cfedd98c9' (2023-10-25)
  → 'github:nix-community/NixOS-WSL/0e4c17efebff955471f169fffbb7e8cd62ada498' (2023-11-09)

.github/workflows/update.yml

@@ -8,6 +8,7 @@ on:
 permissions:
   contents: write
   pull-requests: write
+  checks: write
 
 jobs:
   lockfile:
@@ -31,7 +32,17 @@ jobs:
             dependencies
             automated
       - name: Check the Flake
+        id: check
         run: nix flake check
+      - name: Update Check Status
+        uses: LouisBrunner/checks-action@v1.6.1
+        if: always()
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          name: Update Flake
+          conclusion: ${{ job.status }}
+          output: |
+            {"summary":"${{ steps.check.outputs.stdout }}"}
       - name: Enable Pull Request Automerge
         if: success()
         run: |

flake.lock

@@ -90,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696043447,
+        "lastModified": 1699704228,
-        "narHash": "sha256-VbJ1dY5pVH2fX1bS+cT2+4+BYEk4lMHRP0+udu9G6tk=",
+        "narHash": "sha256-NApWG385goidsXmsakWgFRjvbH+aw/n1CGGHn/UuXsc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "792c2e01347cb1b2e7ec84a1ef73453ca86537d8",
+        "rev": "0f1ad801387445fdda01d080db8ecf169be8e793",
         "type": "github"
       },
       "original": {
@@ -111,11 +111,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695864092,
+        "lastModified": 1699734195,
-        "narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=",
+        "narHash": "sha256-T7Q2ke4LJx16wos828YMqKnCCK3kxey0PdqH+LxVMV8=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32",
+        "rev": "89fd5b51f0725f9775ca9999d53a0a3e5d936490",
         "type": "github"
       },
       "original": {
@@ -131,11 +131,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696034364,
+        "lastModified": 1699663243,
-        "narHash": "sha256-7giewUYqKhhfhKRxe2EPHCpSM0oMLuByW4RTRZl6Jfc=",
+        "narHash": "sha256-Plj2ypGV/5714enFtb4O5c3vXKvHUzoksgRx3zFmIJ4=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "b1e4d451a15c34d45bfefb05137a20469399a2df",
+        "rev": "63df8ec2d300da9912ae5b56b74e7aa574b6de0c",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
+        "lastModified": 1696426674,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
         "type": "github"
       },
       "original": {
@@ -237,11 +237,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696063111,
+        "lastModified": 1699748018,
-        "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=",
+        "narHash": "sha256-28rwXnxgscLkeII6wj44cuP6RuiynhzZSa424ZwGt/s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01",
+        "rev": "50e582b9f91e409ffd2e134017445d376659b32e",
         "type": "github"
       },
       "original": {
@@ -254,6 +254,7 @@
     "nextcloud-cookbook": {
       "flake": false,
       "locked": {
+        "lastModified": 1679666795,
         "narHash": "sha256-XgBwUr26qW6wvqhrnhhhhcN4wkI+eXDHnNSm1HDbP6M=",
         "type": "tarball",
         "url": "https://github.com/nextcloud/cookbook/releases/download/v0.10.2/Cookbook-0.10.2.tar.gz"
@@ -266,6 +267,7 @@
     "nextcloud-external": {
       "flake": false,
       "locked": {
+        "lastModified": 1693816929,
         "narHash": "sha256-X7eC8T8wSZGVwCQp6U/WxjMC7aIj39osgHotaUoRNSQ=",
         "type": "tarball",
         "url": "https://github.com/nextcloud-releases/external/releases/download/v5.2.1/external-v5.2.1.tar.gz"
@@ -278,6 +280,7 @@
     "nextcloud-news": {
       "flake": false,
       "locked": {
+        "lastModified": 1695883388,
         "narHash": "sha256-cfJkKRNSz15L4E3w1tnEb+t4MrVwVzb8lb6vCOA4cK4=",
         "type": "tarball",
         "url": "https://github.com/nextcloud/news/releases/download/24.0.0/news.tar.gz"
@@ -369,11 +372,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695830400,
+        "lastModified": 1699099776,
-        "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
+        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
+        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
         "type": "github"
       },
       "original": {
@@ -385,11 +388,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1695825837,
+        "lastModified": 1697851979,
-        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
+        "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
+        "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8",
         "type": "github"
       },
       "original": {
@@ -417,11 +420,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1696080597,
+        "lastModified": 1699751149,
-        "narHash": "sha256-fhf7+NT/xMwPZ/sRT30lnI04AHgf7tLPU4ClMux1nWA=",
+        "narHash": "sha256-hcWsurEJSVYWHoI5YvB5ZVaCY+Sg2Qd0ZumKn7dLjI0=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "8783c360abc69f58d46a2929534ddd91eb41f3c6",
+        "rev": "ff495b6b6763bcb879b97c105eedc1db23260bab",
         "type": "github"
       },
       "original": {
@@ -450,11 +453,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1695716495,
+        "lastModified": 1699755272,
-        "narHash": "sha256-Fkchn7UuIHPmVFFrx1kzsE2lviJrAFAe9tHu73HnS/w=",
+        "narHash": "sha256-EZQ9HC6EArwQnfJbn4C8WnM2yQrO/FOXZu91ue43xTY=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "934469b9b6df369e198fb3016969e56393b0dc07",
+        "rev": "874ae6e9445a5eb5ba430e5fd10212450a261ad7",
         "type": "github"
       },
       "original": {
@@ -466,11 +469,11 @@
     "nvim-treesitter-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1696061053,
+        "lastModified": 1699694083,
-        "narHash": "sha256-KR+VMYTVM2qsLPx412gySAKiGObhs+awbDJhWX72/wY=",
+        "narHash": "sha256-MBSjwHmh4JCwa4mNuADcWaBgMhPnroDxz93eBE9ifOY=",
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter",
-        "rev": "dd4e2dbc002dfce109d621e8bdcd9d89438b0a32",
+        "rev": "075a64addc33390028ea124a1046a43497f05cd1",
         "type": "github"
       },
       "original": {
@@ -483,6 +486,7 @@
     "proton-ge": {
       "flake": false,
       "locked": {
+        "lastModified": 1695533697,
         "narHash": "sha256-75A0VCVdYkiMQ1duE9r2+DLBJzV02vUozoVLeo/TIWQ=",
         "type": "tarball",
         "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton8-16/GE-Proton8-16.tar.gz"
@@ -622,11 +626,11 @@
     "telescope-project-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1682606566,
+        "lastModified": 1699263681,
-        "narHash": "sha256-H6lrPjpOUVleKHB0ziI+6dthg9ymitHhEWtcgYJTrKo=",
+        "narHash": "sha256-SxtjDnvObVLl1+rpsmUDbhsgpCnNGa40NbNFlMzTRVY=",
         "owner": "nvim-telescope",
         "repo": "telescope-project.nvim",
-        "rev": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30",
+        "rev": "5460c6c60d48618c5c746e5b1cad4c3e8262fdae",
         "type": "github"
       },
       "original": {
@@ -655,11 +659,11 @@
     "tree-sitter-bash": {
       "flake": false,
       "locked": {
-        "lastModified": 1695263734,
+        "lastModified": 1696959291,
-        "narHash": "sha256-dJUJGrpBWBLjcqiqxCnJ/MENwa2+uxAmQD71aYloxsw=",
+        "narHash": "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-bash",
-        "rev": "fd4e40dab883d6456da4d847de8321aee9c80805",
+        "rev": "7331995b19b8f8aba2d5e26deb51d2195c18bc94",
         "type": "github"
       },
       "original": {
@@ -721,11 +725,11 @@
     "tree-sitter-python": {
       "flake": false,
       "locked": {
-        "lastModified": 1695282953,
+        "lastModified": 1696990675,
-        "narHash": "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84=",
+        "narHash": "sha256-nQ4HU5ysQjht9USFGRmW/+PLFTzPgi+6G68/uupMMRk=",
         "owner": "tree-sitter",
         "repo": "tree-sitter-python",
-        "rev": "a901729099257aac932d79c60adb5e8a53fa7e6c",
+        "rev": "82f5c9937fe4300b4bec3ee0e788d642c77aab2c",
         "type": "github"
       },
       "original": {
@@ -790,11 +794,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1696053802,
+        "lastModified": 1699549513,
-        "narHash": "sha256-8TTbJbtGDz1MstExrVQe56eXZpovvZv6G6L6q/4NOKg=",
+        "narHash": "sha256-cfsghOs6Cr61wFsxkWonK8AwPwHaRGZ6QkbasUgygh4=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "cadde47d123d1a534c272b04a7582f1d11474c48",
+        "rev": "0e4c17efebff955471f169fffbb7e8cd62ada498",
         "type": "github"
       },
       "original": {

flake.nix

@@ -9,7 +9,7 @@
 
     # Used for MacOS system config
     darwin = {
-      url = "github:/lnl7/nix-darwin/master";
+      url = "github:lnl7/nix-darwin/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -206,6 +206,7 @@
           git = "git.${baseName}";
           metrics = "metrics.${baseName}";
           prometheus = "prom.${baseName}";
+          paperless = "paper.${baseName}";
           secrets = "vault.${baseName}";
           stream = "stream.${baseName}";
           content = "cloud.${baseName}";

hosts/lookingglass/default.nix

@@ -37,6 +37,7 @@ inputs.darwin.lib.darwinSystem {
       nixlang.enable = true;
       terraform.enable = true;
       python.enable = true;
+      rust.enable = true;
       lua.enable = true;
       kubernetes.enable = true;
       _1password.enable = true;

hosts/swan/default.nix

@@ -79,6 +79,7 @@ inputs.nixpkgs.lib.nixosSystem {
       services.prometheus.enable = false;
       services.vmagent.enable = true;
       services.samba.enable = true;
+      services.paperless.enable = true;
 
       # Allows private remote access over the internet
       cloudflareTunnel = {

hosts/tempest/default.nix

@@ -99,12 +99,13 @@ inputs.nixpkgs.lib.nixosSystem {
       keybase.enable = true;
       mullvad.enable = false;
       nixlang.enable = true;
+      rust.enable = true;
       yt-dlp.enable = true;
       gaming = {
         dwarf-fortress.enable = true;
         enable = true;
         steam.enable = true;
-        legendary.enable = true;
+        legendary.enable = false; # Electron marked as insecure
         lutris.enable = true;
         leagueoflegends.enable = true;
         ryujinx.enable = true;

modules/common/applications/firefox.nix

@@ -74,6 +74,8 @@
             "media.ffmpeg.vaapi.enabled" =
               true; # Enable hardware video acceleration
             "cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
+            "devtools.command-button-screenshot.enabled" =
+              true; # Scrolling screenshot of entire page
             "svg.context-properties.content.enabled" = true; # Sidebery styling
           };
           userChrome = ''
@@ -115,7 +117,7 @@
               background-color: ${config.theme.colors.base00};
               color: ${config.theme.colors.base06} !important;
             }
-            .tab-content[selected=true] {
+            .tab-content[selected] {
               border-bottom: 2px solid color-mix(in srgb, var(--identity-tab-color) 25%, transparent);
               background-color: ${config.theme.colors.base01} !important;
               color: ${config.theme.colors.base07} !important;

modules/common/default.nix

@@ -75,6 +75,10 @@
         type = lib.types.str;
         description = "Hostname for metrics server.";
       };
+      paperless = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for document server (paperless-ngx).";
+      };
       prometheus = lib.mkOption {
         type = lib.types.str;
         description = "Hostname for Prometheus server.";

modules/common/neovim/config/github.lua

@@ -0,0 +1,14 @@
+-- Keymap to open file in GitHub web
+vim.keymap.set("n", "<Leader>gr", ":!gh browse %<CR><CR>", { silent = true })
+
+-- Pop a terminal to watch the current run
+local gitwatch =
+    require("toggleterm.terminal").Terminal:new({ cmd = "fish --interactive --init-command 'gh run watch'" })
+
+-- Set a toggle for this terminal
+function GITWATCH_TOGGLE()
+    gitwatch:toggle()
+end
+
+-- Keymap to toggle the run
+vim.keymap.set("n", "<Leader>gw", GITWATCH_TOGGLE)

modules/common/neovim/config/kubernetes.lua

@@ -0,0 +1,6 @@
+local k9s = require("toggleterm.terminal").Terminal:new({ cmd = "k9s" })
+function K9S_TOGGLE()
+    k9s:toggle()
+end
+
+vim.keymap.set("n", "<Leader>9", K9S_TOGGLE)

modules/common/neovim/config/lsp.nix

@@ -1,28 +1,63 @@
-{ pkgs, dsl, ... }: {
+{ 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";
+
+  config =
+
+    let
+
+      terraformFormat = if config.terraform then ''
+        require("null-ls").builtins.formatting.terraform_fmt.with({
+            command = "${pkgs.terraform}/bin/terraform",
+            extra_filetypes = { "hcl" },
+        }),
+      '' else
+        "";
+
+    in {
       plugins = [
         pkgs.vimPlugins.nvim-lspconfig
-    pkgs.vimPlugins.lsp-colors-nvim
         pkgs.vimPlugins.null-ls-nvim
+        pkgs.vimPlugins.fidget-nvim
       ];
 
+      setup.fidget = { };
+
       use.lspconfig.lua_ls.setup = dsl.callWith {
         settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
-    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+        capabilities =
+          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
         cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
       };
 
       use.lspconfig.nil_ls.setup = dsl.callWith {
         cmd = [ "${pkgs.nil}/bin/nil" ];
-    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+        capabilities =
+          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
       };
 
       use.lspconfig.pyright.setup = dsl.callWith {
         cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
       };
 
-  use.lspconfig.terraformls.setup =
+      use.lspconfig.terraformls.setup = dsl.callWith {
-    dsl.callWith { cmd = [ "${pkgs.terraform-ls}/bin/terraform-ls" "serve" ]; };
+        cmd = if config.terraform then [
+          "${pkgs.terraform-ls}/bin/terraform-ls"
+          "serve"
+        ] else
+          [ "echo" ];
+      };
+
+      use.lspconfig.rust_analyzer.setup = dsl.callWith {
+        cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
+        settings = {
+          "['rust-analyzer']" = { check = { command = "clippy"; }; };
+        };
+      };
 
       vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];
 
@@ -45,10 +80,7 @@
                     command = "${pkgs.shfmt}/bin/shfmt",
                     extra_args = { "-i", "4", "-ci" },
                 }),
-            require("null-ls").builtins.formatting.terraform_fmt.with({
+                ${terraformFormat}
-                command = "${pkgs.terraform}/bin/terraform",
-                extra_filetypes = { "hcl" },
-            }),
             },
 
             on_attach = function(client, bufnr)
@@ -73,4 +105,6 @@
         })
       '';
 
+    };
+
 }

modules/common/neovim/config/misc.nix

@@ -12,7 +12,7 @@
 
   # Initialize some plugins
   setup.Comment = { };
-  setup.colorizer = { };
+  setup.colorizer = { user_default_options = { names = false; }; };
   setup.glow = { };
   setup.which-key = { };
 

modules/common/neovim/config/syntax.nix

@@ -24,7 +24,7 @@
     pkgs.vimPlugins.vim-helm
     pkgs.baleia-nvim # Clean ANSI from kitty scrollback
     # pkgs.hmts-nvim # Tree-sitter injections for home-manager
-    (pkgs.vimUtils.buildVimPluginFrom2Nix {
+    (pkgs.vimUtils.buildVimPlugin {
       pname = "nmasur";
       version = "0.1";
       src = ../plugin;

modules/common/neovim/config/toggleterm.lua

@@ -26,17 +26,5 @@ function NIXPKGS_TOGGLE()
     nixpkgs:toggle()
 end
 
-local gitwatch = terminal:new({ cmd = "fish --interactive --init-command 'gh run watch'" })
-function GITWATCH_TOGGLE()
-    gitwatch:toggle()
-end
-
-local k9s = terminal:new({ cmd = "k9s" })
-function K9S_TOGGLE()
-    k9s:toggle()
-end
-
 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)

modules/common/neovim/config/toggleterm.nix

@@ -1,4 +1,4 @@
-{ pkgs, dsl, ... }: {
+{ pkgs, dsl, config, ... }: {
 
   # Toggleterm provides a floating terminal inside the editor for quick access
 
@@ -10,6 +10,10 @@
     direction = "float";
   };
 
-  lua = builtins.readFile ./toggleterm.lua;
+  lua = ''
+    ${builtins.readFile ./toggleterm.lua}
+    ${if config.github then (builtins.readFile ./github.lua) else ""}
+    ${if config.kubernetes then (builtins.readFile ./kubernetes.lua) else ""}
+  '';
 
 }

modules/common/neovim/config/tree.nix

@@ -63,7 +63,6 @@
     '';
     view = { # Set look and feel
       width = 30;
-      hide_root_folder = false;
       side = "left";
       number = false;
       relativenumber = false;

modules/common/neovim/default.nix

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

modules/common/neovim/lua/keybinds.lua

@@ -39,7 +39,6 @@ key("n", "<Leader>fs", ":write<CR>")
 key("n", "<Leader>fd", ":lcd %:p:h<CR>", { silent = true })
 key("n", "<Leader>fu", ":lcd ..<CR>", { silent = true })
 key("n", "<Leader><Tab>", ":b#<CR>", { silent = true })
-key("n", "<Leader>gr", ":!gh browse %<CR><CR>", { silent = true })
 key("n", "<Leader>tt", [[<Cmd>exe 'edit $NOTES_PATH/journal/'.strftime("%Y-%m-%d_%a").'.md'<CR>]])
 key("n", "<Leader>jj", ":!journal<CR>:e<CR>")
 

modules/common/neovim/package/default.nix

@@ -26,13 +26,13 @@
 #   ] ++ extraConfig;
 # }
 
-{ pkgs, colors, ... }:
+{ pkgs, colors, terraform ? false, github ? false, kubernetes ? false, ... }:
 
 # Comes from nix2vim overlay:
 # https://github.com/gytis-ivaskevicius/nix2vim/blob/master/lib/neovim-builder.nix
 pkgs.neovimBuilder {
   package = pkgs.neovim-unwrapped;
-  inherit colors;
+  inherit colors terraform github kubernetes;
   imports = [
     ../config/align.nix
     ../config/bufferline.nix

modules/common/programming/default.nix

@@ -6,6 +6,7 @@
     ./lua.nix
     ./nix.nix
     ./python.nix
+    ./rust.nix
     ./terraform.nix
   ];
 

modules/common/programming/rust.nix

@@ -0,0 +1,17 @@
+{ config, pkgs, lib, ... }: {
+
+  options.rust.enable = lib.mkEnableOption "Rust programming language.";
+
+  config = lib.mkIf config.rust.enable {
+
+    home-manager.users.${config.user} = {
+
+      programs.fish.shellAbbrs = { ca = "cargo"; };
+
+      home.packages = with pkgs; [ cargo rustc clippy gcc ];
+
+    };
+
+  };
+
+}

modules/common/programming/terraform.nix

@@ -3,6 +3,7 @@
   options.terraform.enable = lib.mkEnableOption "Terraform tools.";
 
   config = lib.mkIf config.terraform.enable {
+    unfreePackages = [ "terraform" ];
 
     home-manager.users.${config.user} = {
       programs.fish.shellAbbrs = {

modules/common/shell/fish/default.nix

@@ -123,9 +123,6 @@
         dr = "docker run --rm -it";
         db = "docker build . -t";
 
-        # Rust
-        ca = "cargo";
-
       };
       shellInit = "";
     };

modules/nixos/graphical/polybar.nix

@@ -36,7 +36,7 @@
             module-margin = 1;
             modules-left = "i3";
             modules-center = "xwindow";
-            modules-right = "mailcount network pulseaudio date power";
+            modules-right = "mailcount network pulseaudio date keyboard power";
             cursor-click = "pointer";
             cursor-scroll = "ns-resize";
             enable-ipc = true;
@@ -200,10 +200,17 @@
             label-foreground = config.theme.colors.base0A;
             # format-background = colors.background;
           };
+          "module/keyboard" = {
+            type = "custom/text";
+            content = "󰌌";
+            click-left = "doas systemctl restart keyd";
+            content-foreground = config.theme.colors.base04;
+          };
           "module/power" = {
             type = "custom/text";
             content = "  ";
             click-left = config.powerCommand;
+            click-right = "polybar-msg cmd restart";
             content-foreground = config.theme.colors.base04;
           };
           "settings" = {

modules/nixos/services/default.nix

@@ -19,6 +19,7 @@
     ./n8n.nix
     ./netdata.nix
     ./nextcloud.nix
+    ./paperless.nix
     ./prometheus.nix
     ./samba.nix
     ./secrets.nix

modules/nixos/services/paperless.nix

@@ -0,0 +1,48 @@
+{ config, lib, ... }: {
+
+  config = lib.mkIf config.services.paperless.enable {
+
+    services.paperless = {
+      mediaDir = "/data/generic/paperless";
+      passwordFile = config.secrets.paperless.dest;
+      extraConfig = {
+        PAPERLESS_OCR_USER_ARGS =
+          builtins.toJSON { invalidate_digital_signatures = true; };
+
+        # Enable if changing the path name in Caddy
+        # PAPERLESS_FORCE_SCRIPT_NAME = "/paperless";
+        # PAPERLESS_STATIC_URL = "/paperless/static/";
+      };
+    };
+
+    users.users.paperless.extraGroups = [ "generic" ];
+
+    caddy.routes = [{
+      match = [{
+        host = [ config.hostnames.paperless ];
+        # path = [ "/paperless*" ]; # Change path name in Caddy
+      }];
+      handle = [{
+        handler = "reverse_proxy";
+        upstreams = [{
+          dial =
+            "localhost:${builtins.toString config.services.paperless.port}";
+        }];
+      }];
+    }];
+
+    secrets.paperless = {
+      source = ../../../private/prometheus.age;
+      dest = "${config.secretsDirectory}/paperless";
+      owner = "paperless";
+      group = "paperless";
+      permissions = "0440";
+    };
+    systemd.services.paperless-secret = {
+      requiredBy = [ "paperless.service" ];
+      before = [ "paperless.service" ];
+    };
+
+  };
+
+}

modules/nixos/system/doas.nix

@@ -26,9 +26,14 @@
       };
     };
 
+    home-manager.users.${config.user}.programs = {
+
       # Alias sudo to doas for convenience
-    home-manager.users.${config.user}.programs.fish.shellAliases = {
+      fish.shellAliases = { sudo = "doas"; };
-      sudo = "doas";
+
+      # Disable overriding our sudo alias with a TERMINFO alias
+      kitty.settings.shell_integration = "no-sudo";
+
     };
 
   };

overlays/age.nix

@@ -1,5 +1,9 @@
 # Pin age because it is failing to build
+# https://github.com/NixOS/nixpkgs/pull/265753
 
 inputs: _final: prev: {
-  age = prev.age.overrideAttrs (old: { src = inputs.age; });
+  age = prev.age.overrideAttrs (old: {
+    src = inputs.age;
+    doCheck = false; # https://github.com/FiloSottile/age/issues/517
+  });
 }

overlays/caddy.nix

@@ -31,7 +31,7 @@ in {
 
     src = prev.caddy.src;
 
-    vendorSha256 = "sha256:mwIsWJYKuEZpOU38qZOG1LEh4QpK4EO0/8l4UGsroU8=";
+    vendorSha256 = "sha256:0KfMzTt4lNzVfoCfDHhC2ue3OWICkFCHuhREiM2JPMY=";
 
     overrideModAttrs = (_: {
       preBuild = ''

overlays/calibre-web-cloudflare.patch

@@ -1,8 +1,8 @@
 diff --git a/cps/__init__.py b/cps/__init__.py
-index 269e4aca..e2b828a9 100644
+index f4f8dbf2..7377acdf 100644
 --- a/cps/__init__.py
 +++ b/cps/__init__.py
-@@ -150,7 +150,6 @@ def create_app():
+@@ -151,7 +151,6 @@ def create_app():
  
      lm.login_view = 'web.login'
      lm.anonymous_user = ub.Anonymous
@@ -11,14 +11,16 @@ index 269e4aca..e2b828a9 100644
      db.CalibreDB.update_config(config)
      db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
 diff --git a/cps/admin.py b/cps/admin.py
-index 20c58aac..99d2ad19 100644
+index 045a9523..825a28af 100644
 --- a/cps/admin.py
 +++ b/cps/admin.py
-@@ -101,8 +101,6 @@ def admin_required(f):
+@@ -102,10 +102,6 @@ def admin_required(f):
  
  @admi.before_app_request
  def before_request():
--    if not ub.check_user_session(current_user.id, flask_session.get('_id')) and 'opds' not in request.path:
+-    if not ub.check_user_session(current_user.id,
+-                                 flask_session.get('_id')) and 'opds' not in request.path \
+-      and config.config_session == 1:
 -        logout_user()
      g.constants = constants
      g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION', '')

overlays/neovim-plugins.nix

@@ -9,7 +9,7 @@ let
 
   # Package plugin - for plugins not found in nixpkgs at all
   plugin = pname: src:
-    prev.vimUtils.buildVimPluginFrom2Nix {
+    prev.vimUtils.buildVimPlugin {
       inherit pname src;
       version = "master";
     };

private/paperless.age

@@ -0,0 +1,15 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBWY3N0
+VkY0Y2tLQnNhZWdRVzFxU0plWThveUthK2NjZWNhZDd5ZGtXVVZ3CjVPc3YxbnBM
+MmozZFlORVppQmJrQ2ovWEFVVm81ZlBpRCtQQmRiNnBCaVUKLT4gc3NoLWVkMjU1
+MTkgWXlTVU1RIEtvRFJEQXJLNjlyRldpM2pMdXNxWVZmVFl2NVJjRUtuQzNtbmJq
+UTBDR2cKQ1J4cHVkWHJZU1M4dnFIekx2ejlua0NjUUtET0EwN24rY2NPcGQ5eEp1
+TQotPiBzc2gtZWQyNTUxOSBuanZYNUEgVnBQOHV5VUk0N2lyU2NkdXovQmJYVGhL
+dnUwTG9oZkZKOUxFWTNiZkhBbwo2WjgyNHBhaGtFREJGVDk5TzJhZjRzKytaLzZR
+TDQxeU9pY24zQnJBYmN3Ci0+IHNzaC1lZDI1NTE5IENxSU9VQSBQQ3I2YnNNZVlX
+TEhNbWhRSjJRbk9DYnJIRUFieDBMRUtBRVhxZ1RQcVNNClNzU0VPMnh5bUFGVTZm
+ekJLSzFjT3dHVVdoQ3A5ZStCUk83Qk5rcWZmN3MKLS0tIFdvRG1mYzdUenhndkY2
+amo0ZGpjQkdabUdNRUJwV29CRXByVk8ySEZzTzAKsDY+DVJqZb/jCn6Xa/OqNheR
+uNlV5vVKUaZu5F+MTZqZaRYdn66TJVXgz5GydbgwQGs3l0K67ikPiTOoln0FapnB
+TQ==
+-----END AGE ENCRYPTED FILE-----

templates/poetry/flake.nix

@@ -5,7 +5,7 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs";
   inputs.poetry2nix.url = "github:nix-community/poetry2nix";
 
-  outputs = { nixpkgs, flake-utils, poetry2nix }:
+  outputs = { self, nixpkgs, flake-utils, poetry2nix }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {

templates/python/flake.nix

@@ -11,7 +11,7 @@
     inputs.pypi-deps-db.follows = "pypi-deps-db";
   };
 
-  outputs = { nixpkgs, mach-nix }:
+  outputs = { self, nixpkgs, mach-nix }:
     let
       supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
       forAllSystems = f:

templates/rust/flake.nix

@@ -0,0 +1,20 @@
+{
+  description = "Basic Rust project";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+  outputs = { self, nixpkgs }:
+    let
+      forAllSystems = nixpkgs.lib.genAttrs [
+        "x86_64-linux"
+        "x86_64-darwin"
+        "aarch64-linux"
+        "aarch64-darwin"
+      ];
+    in {
+      devShells = forAllSystems (system:
+        let pkgs = import nixpkgs { inherit system; };
+        in {
+          default =
+            pkgs.mkShell { buildInputs = with pkgs; [ gcc rustc cargo ]; };
+        });
+    };
+}