nixd neovim setup

temp: not sure if this is even required
fix: tabs should be spaces
2025-07-08 00:10:14 +00:00 · 2024-10-25 08:53:27 -04:00 · 2024-10-25 08:53:04 -04:00 · 2024-10-19 09:01:26 -04:00 · 2024-10-19 08:45:26 -04:00 · 2024-10-12 11:57:38 -04:00
23 changed files with 322 additions and 99 deletions
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@ -3,7 +3,7 @@ name: Update Flake
 on:
  workflow_dispatch: # allows manual triggering
  schedule:
-    - cron: '33 3 * * 0' # runs weekly on Sunday at 03:33
+    - cron: '33 3 * * 6' # runs weekly on Saturday at 03:33

 permissions:
  contents: write
--- a/flake.lock
+++ b/flake.lock
@ -87,11 +87,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726742753,
-        "narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=",
+        "lastModified": 1728385805,
+        "narHash": "sha256-mUd38b0vhB7yzgAjNOaFz7VY9xIVzlbn3P2wjGBcVV0=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2",
+        "rev": "48b50b3b137be5cfb9f4d006835ce7c3fe558ccc",
        "type": "github"
      },
      "original": {
@ -108,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726842196,
-        "narHash": "sha256-u9h03JQUuQJ607xmti9F9Eh6E96kKUAGP+aXWgwm70o=",
+        "lastModified": 1728687662,
+        "narHash": "sha256-D9TChzb00eTG1YWBx8eN2s6lJJnBjB5Y7RpxkAzGvyQ=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "51994df8ba24d5db5459ccf17b6494643301ad28",
+        "rev": "bdbdb725d632863bdedb80baabf21327614dd237",
        "type": "github"
      },
      "original": {
@ -145,11 +145,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726966782,
-        "narHash": "sha256-Owj7nRvfGmX1X1BvTAQxy0YICjARKXSH5vg4rn0FQaQ=",
+        "lastModified": 1728694479,
+        "narHash": "sha256-NFFW6RrOTBuIk29LKtAO3MU5Y0ll7zAp9Skd9HvCGfs=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "947d22726be0ef737ebbe6ffa6f7ff9908576011",
+        "rev": "8a3143c1ce147481db4463e71bc3b7002e6ebc56",
        "type": "github"
      },
      "original": {
@ -231,11 +231,11 @@
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
        "type": "github"
      },
      "original": {
@ -244,14 +244,30 @@
        "type": "github"
      }
    },
+    "gh-collaborators": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717117275,
+        "narHash": "sha256-x3p2bHL6U8gWanXnTTJGgA9x4Ixy9AOZiBbfcfn5VVw=",
+        "owner": "katiem0",
+        "repo": "gh-collaborators",
+        "rev": "4dfcd0b5c2e31f2d0fbfd4b83fdfae787a5e6ff8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "katiem0",
+        "repo": "gh-collaborators",
+        "type": "github"
+      }
+    },
    "hmts-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1715076655,
-        "narHash": "sha256-vDTqJQzLyg0nmlC+CrLnPkYti1rPxmvRW8eQq/9Zg+M=",
+        "lastModified": 1727357627,
+        "narHash": "sha256-8FJlLw5LApQs7S8xEh2UE9wdYCAweZTbvgozCGPfQJc=",
        "owner": "calops",
        "repo": "hmts.nvim",
-        "rev": "19a91816c123173a4551a6a04f2882338f20db1d",
+        "rev": "1ecb68b9f89abdb23d2754f9d69f90eab2d33eaa",
        "type": "github"
      },
      "original": {
@ -267,11 +283,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726902823,
-        "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=",
+        "lastModified": 1728685293,
+        "narHash": "sha256-1WowL96pksT/XCi+ZXHgqiQ9NiU5oxWuNIQYWqOoEYc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "14929f7089268481d86b83ed31ffd88713dcd415",
+        "rev": "2b13611eaed8326789f76f70d21d06fbb14e3e47",
        "type": "github"
      },
      "original": {
@ -291,11 +307,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719942949,
-        "narHash": "sha256-srSQac7dhXtisqu4XwPGrK8qcmT2rflJJ1mRIV9j0Qk=",
+        "lastModified": 1727470707,
+        "narHash": "sha256-BqkwZ2mvzn+COdfIuzllSzWmiaBwQktt4sw9slfwM70=",
        "owner": "hraban",
        "repo": "mac-app-util",
-        "rev": "63f269f737cafb2219ba38780c1ecb1dc24bc4a2",
+        "rev": "9c6bbe2a6a7ec647d03f64f0fadb874284f59eac",
        "type": "github"
      },
      "original": {
@ -346,7 +362,7 @@
    "nextcloud-snappymail": {
      "flake": false,
      "locked": {
-        "lastModified": 1726976693,
+        "lastModified": 1728704544,
        "narHash": "sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q=",
        "type": "tarball",
        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz"
@ -364,11 +380,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718621825,
-        "narHash": "sha256-bSfjwRgKKpLyjEDPRAF1hlJKc7QDoqopalHwNCB/eAA=",
+        "lastModified": 1727867024,
+        "narHash": "sha256-yimXLupF3hG57imRMpqWho/Wstcj7P8Yh8t0SBiX+dQ=",
        "owner": "gytis-ivaskevicius",
        "repo": "nix2vim",
-        "rev": "1db11dbf8a4d124e02244fa5c4ff219b672a8e5b",
+        "rev": "da26caae6c7776eedbc6514a0f57f1ccd6a759ed",
        "type": "github"
      },
      "original": {
@ -379,11 +395,11 @@
    },
    "nixlib": {
      "locked": {
-        "lastModified": 1726362065,
-        "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=",
+        "lastModified": 1728176478,
+        "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555",
+        "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c",
        "type": "github"
      },
      "original": {
@ -400,11 +416,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726817511,
-        "narHash": "sha256-r3R7zZzGklN0udSO/JhWbU/xyq6i1aXKKwfs33LUVls=",
+        "lastModified": 1728522165,
+        "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "bfa25c9065f4cb5d884a0ad70f6e82f55ae90448",
+        "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3",
        "type": "github"
      },
      "original": {
@ -415,11 +431,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1726755586,
-        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
+        "lastModified": 1728492678,
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
        "type": "github"
      },
      "original": {
@ -447,11 +463,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1726838390,
-        "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=",
+        "lastModified": 1728627514,
+        "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101",
+        "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
        "type": "github"
      },
      "original": {
@ -463,11 +479,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1726976544,
-        "narHash": "sha256-8QDBuOC8x/ZdHY0nHxQ57bREw6FpT+Vtv7rQiYsbf+E=",
+        "lastModified": 1728704557,
+        "narHash": "sha256-HnYBB+oE+03rNDzTTVazBcysPOu5udRpTOGpP7/A5Ow=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "9552e6f691915e173c3dac2e7d96bd2d9d2c2416",
+        "rev": "1d143f52b0a046924ee7fe74bce0bd2e10e07c3d",
        "type": "github"
      },
      "original": {
@ -479,11 +495,11 @@
    "nvim-lint-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1726856518,
-        "narHash": "sha256-yxidmZDPnxDn1saLxdlaXENqVkBj/eSj4ZXNxIRbt6g=",
+        "lastModified": 1728582620,
+        "narHash": "sha256-wfui4kE3oxveCJPjJfkJSbE69zVTeAsasDdfJkElmn8=",
        "owner": "mfussenegger",
        "repo": "nvim-lint",
-        "rev": "c823e2d0621b5c15aa6b46be4d69b1379bcb8fa6",
+        "rev": "f707b3ae50417067fa63fdfe179b0bff6b380da1",
        "type": "github"
      },
      "original": {
@ -512,11 +528,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1726884765,
-        "narHash": "sha256-nS3kNJIbFjH4lr6ppQ2/YkYaamu7hCD+fhBCBoxMpA4=",
+        "lastModified": 1728614821,
+        "narHash": "sha256-WYtu+jtsQSFqruTxdzkHE9UQJBE2TGoNoFar36AAoqo=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "e7cdecc6363acef8232f2f099fe21096ffdc071f",
+        "rev": "5ad87620ec9d1190d15c88171a3f0122bc16b0fe",
        "type": "github"
      },
      "original": {
@ -528,16 +544,16 @@
    "nvim-treesitter-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1726901409,
-        "narHash": "sha256-PYZ1/kmhZIdK0mGZP6Hikm4CIysbA88jUkXLUmbQB98=",
+        "lastModified": 1705679158,
+        "narHash": "sha256-zAyiitJIgOCZTB0CmgNt0MHENM70SOHLIoWrVwOJKFg=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter",
-        "rev": "929ca9c76ee20bb27cffbde4ee90583b6c54d616",
+        "rev": "f197a15b0d1e8d555263af20add51450e5aaa1f0",
        "type": "github"
      },
      "original": {
        "owner": "nvim-treesitter",
-        "ref": "master",
+        "ref": "v0.9.2",
        "repo": "nvim-treesitter",
        "type": "github"
      }
@ -584,6 +600,7 @@
        "disko": "disko",
        "fidget-nvim-src": "fidget-nvim-src",
        "firefox-darwin": "firefox-darwin",
+        "gh-collaborators": "gh-collaborators",
        "hmts-nvim-src": "hmts-nvim-src",
        "home-manager": "home-manager",
        "mac-app-util": "mac-app-util",
@ -733,16 +750,16 @@
    "toggleterm-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1713792255,
-        "narHash": "sha256-mM5bGgAemsRJD9U6U5K6ia5qb8NaTusM99x6xrtEBfw=",
+        "lastModified": 1721232722,
+        "narHash": "sha256-hJ6nBCgSyYF1pY4lX+b8WZd49i5F6BwOmrl7xVSIwRw=",
        "owner": "akinsho",
        "repo": "toggleterm.nvim",
-        "rev": "066cccf48a43553a80a210eb3be89a15d789d6e6",
+        "rev": "48be57eaba817f038d61bbf64d2c597f578c0827",
        "type": "github"
      },
      "original": {
        "owner": "akinsho",
-        "ref": "v2.11.0",
+        "ref": "v2.12.0",
        "repo": "toggleterm.nvim",
        "type": "github"
      }
@ -887,11 +904,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1726868415,
-        "narHash": "sha256-alIPV2Da8TQPFs3j+yrnGGDcIrSes1n1WgTEHIr48kk=",
+        "lastModified": 1728588346,
+        "narHash": "sha256-P1j+Nf+pzxPYK2Qe7lF2yB0vR3YvW8Td5sD0ZvrKIq8=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "cc84991d069d1948bb7c2c24a9874c0a835621e6",
+        "rev": "0fc8d9bb51cc46b31d950513df6d088905c8fe55",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -91,7 +91,7 @@
    };
    nvim-treesitter-src = {
      # https://github.com/nvim-treesitter/nvim-treesitter/tags
-      url = "github:nvim-treesitter/nvim-treesitter/master";
+      url = "github:nvim-treesitter/nvim-treesitter/v0.9.2";
      flake = false;
    };
    telescope-nvim-src = {
@ -105,7 +105,7 @@
    };
    toggleterm-nvim-src = {
      # https://github.com/akinsho/toggleterm.nvim/tags
-      url = "github:akinsho/toggleterm.nvim/v2.11.0";
+      url = "github:akinsho/toggleterm.nvim/v2.12.0";
      flake = false;
    };
    bufferline-nvim-src = {
@ -185,6 +185,11 @@
      flake = false;
    };

+    gh-collaborators = {
+      url = "github:katiem0/gh-collaborators";
+      flake = false;
+    };
+
    # Nextcloud Apps
    nextcloud-news = {
      # https://github.com/nextcloud/news/releases
@ -230,6 +235,7 @@
          mail.smtpHost = "smtp.purelymail.com";
          dotfilesRepo = "https://github.com/nmasur/dotfiles";
          hostnames = {
+            audiobooks = "read.${baseName}";
            files = "files.${baseName}";
            git = "git.${baseName}";
            influxdb = "influxdb.${baseName}";
@ -260,7 +266,7 @@
        (import ./overlays/mpv-scripts.nix inputs)
        (import ./overlays/nextcloud-apps.nix inputs)
        (import ./overlays/betterlockscreen.nix)
-        (import ./overlays/gh-collaborators.nix)
+        (import ./overlays/gh-collaborators.nix inputs)
        (import ./overlays/ren-rep.nix inputs)
      ];

--- a/hosts/swan/default.nix
+++ b/hosts/swan/default.nix
@ -67,6 +67,14 @@ inputs.nixpkgs.lib.nixosSystem rec {
        devices = (import ../../disks/root.nix { disk = "/dev/nvme0n1"; });
      };

+      zramSwap.enable = true;
+      swapDevices = [
+        {
+          device = "/swapfile";
+          size = 4 * 1024; # 4 GB
+        }
+      ];
+
      boot.zfs = {
        # Automatically load the ZFS pool on boot
        extraPools = [ "tank" ];
@ -98,6 +106,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
      dotfiles.enable = true;
      arrs.enable = true;
      filebrowser.enable = true;
+      services.audiobookshelf.enable = true;
      services.bind.enable = true;
      services.caddy.enable = true;
      services.jellyfin.enable = true;
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@ -71,6 +71,8 @@
            "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
+            "browser.tabs.hoverPreview.enabled" = false; # Disable tab previews
+            "browser.tabs.hoverPreview.showThumbnails" = false; # Disable tab previews
          };
          userChrome = ''
            :root {
@ -157,6 +159,15 @@
        };
      };

+      # Mimic nixpkgs package environment for read-only profiles.ini management
+      # From: https://github.com/booxter/home-manager/commit/dd1602e306fec366280f5953c5e1b553e3d9672a
+      home.sessionVariables = {
+        MOZ_LEGACY_PROFILES = 1;
+        MOZ_ALLOW_DOWNGRADE = 1;
+      };
+
+      # launchd.user.envVariables = config.home-manager.users.${config.user}.home.sessionVariables;
+
      xdg.mimeApps = {
        associations.added = {
          "text/html" = [ "firefox.desktop" ];
--- a/modules/common/applications/wezterm.nix
+++ b/modules/common/applications/wezterm.nix
@ -119,8 +119,8 @@
                font = wezterm.font('${font}', { weight = 'Bold'}),
                font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"},

-		-- Fix color blocks instead of text
-		front_end = "WebGpu",
+                -- Fix color blocks instead of text
+                front_end = "WebGpu",

                -- Tab Bar
                hide_tab_bar_if_only_one_tab = true,
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@ -137,6 +137,10 @@
        type = lib.types.str;
        description = "Hostname for push notification services (ntfy).";
      };
+      status = lib.mkOption {
+        type = lib.types.str;
+        description = "Hostname for status page (Uptime-Kuma).";
+      };
      transmission = lib.mkOption {
        type = lib.types.str;
        description = "Hostname for peer2peer downloads (Transmission).";
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@ -11,6 +11,11 @@
  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.nixosConfiguration = lib.mkOption {
+    type = lib.types.str;
+    description = "Configuration to use for nixd options checking";
+    default = "default";
+  };

  config = {
    plugins = [
@ -43,6 +48,21 @@
    use.lspconfig.nixd.setup = dsl.callWith {
      cmd = [ "${pkgs.nixd}/bin/nixd" ];
      capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+      # settings = {
+      #   nixd = {
+      #     options = {
+      #       nixos = {
+      #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).nixosConfigurations.${config.nixosConfiguration}.options";
+      #       };
+      #       home-manager = {
+      #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).homeConfigurations.${config.nixosConfiguration}.options";
+      #       };
+      #       darwin = {
+      #         expr = "(builtins.getFlake (\"git+file://\" + toString ./.)).darwinConfigurations.${config.nixosConfiguration}.options";
+      #       };
+      #     };
+      #   };
+      # };
    };

    use.lspconfig.pyright.setup = dsl.callWith {
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@ -13,6 +13,7 @@ let
    terraform = config.terraform.enable;
    github = true;
    kubernetes = config.kubernetes.enable;
+    nixosConfiguration = config.networking.hostName; # Used for Nixd
  };
 in
 {
@ -50,9 +51,9 @@ in

        # Create a desktop option for launching Neovim from a file manager
        # (Requires launching the terminal and then executing Neovim)
-        xdg.desktopEntries.nvim = lib.mkIf pkgs.stdenv.isLinux {
+        xdg.desktopEntries.nvim = lib.mkIf (pkgs.stdenv.isLinux && config.gui.enable) {
          name = "Neovim wrapper";
-          exec = "kitty nvim %F";
+          exec = "${config.home-manager.users.${config.user}.programs.rofi.terminal} nvim %F";
          mimeType = [
            "text/plain"
            "text/markdown"
--- a/modules/common/neovim/package/default.nix
+++ b/modules/common/neovim/package/default.nix
@ -32,6 +32,7 @@
  terraform ? false,
  github ? false,
  kubernetes ? false,
+  nixosConfiguration ? "default",
  ...
 }:

@ -44,6 +45,7 @@ pkgs.neovimBuilder {
    terraform
    github
    kubernetes
+    nixosConfiguration
    ;
  imports = [
    ../config/align.nix
--- a/modules/common/shell/fish/default.nix
+++ b/modules/common/shell/fish/default.nix
@ -76,6 +76,10 @@
          description = "Full git commit on notes";
          body = builtins.readFile ./functions/syncnotes.fish;
        };
+        _which = {
+          description = "Identify the path to a program in the shell";
+          body = "command --search (string sub --start=2 $argv)";
+        };
      };
      interactiveShellInit = ''
        fish_vi_key_bindings
@ -101,6 +105,13 @@
        "-" = "cd -";
        mkd = "mkdir -pv";

+        # Convert a program into its full path
+        "=" = {
+          position = "anywhere";
+          regex = "=\\w+";
+          function = "_which";
+        };
+
        # System
        s = "sudo";
        sc = "systemctl";
--- a/modules/common/shell/git.nix
+++ b/modules/common/shell/git.nix
@ -113,6 +113,11 @@ in
        gpd = "git push origin -d";
        gbd = "git branch -d";
        gbD = "git branch -D";
+        gdd = {
+          position = "anywhere";
+          setCursor = true;
+          expansion = "BRANCH=% git push origin -d $BRANCH and git branch -d $BRANCH";
+        };
        gr = "git reset";
        grh = "git reset --hard";
        gm = "git merge";
@ -158,6 +163,13 @@ in
                and git branch -D $branch
              '';
            };
+            git-delete-both = {
+              argumentNames = "branch";
+              body = ''
+                git push origin -d $branch
+                git branch -d $branch
+              '';
+            };
            git-merge-fuzzy = {
              body = ''
                set branch (git-fuzzy-branch "merge from...")
--- a/modules/common/shell/work.nix
+++ b/modules/common/shell/work.nix
@ -12,34 +12,36 @@
    home.packages =
      let
        ldap_scheme = "ldaps";
-        magic_number = "2";
-        magic_end_seq = "corp";
        magic_prefix = "take";
-        ldap_host = "${magic_prefix}${magic_number}.t${magic_number}.${magic_end_seq}";
        ldap_port = 636;
-        ldap_dc_1 = "${magic_prefix}${magic_number}";
-        ldap_dc_2 = "t${magic_number}";
-        ldap_dc_3 = magic_end_seq;
        ldap_script = pkgs.writeShellScriptBin "ldap" ''
-          # if ! [ "$LDAP_HOST" ]; then
-          #     echo "No LDAP_HOST specified!"
-          #     exit 1
-          # fi
+          if ! [ "$LDAP_HOST" ]; then
+              echo "No LDAP_HOST specified!"
+              exit 1
+          fi
          SEARCH_FILTER="$@"
          ldapsearch -LLL \
              -B -o ldif-wrap=no \
-              -H "${ldap_scheme}://${ldap_host}:${builtins.toString ldap_port}" \
-              -D "${pkgs.lib.toUpper magic_prefix}${magic_number}\\${pkgs.lib.toLower config.user}" \
-              -w "$(${pkgs._1password}/bin/op item get T${magic_number} --fields label=password)" \
-              -b "DC=${ldap_dc_1},DC=${ldap_dc_2},DC=${ldap_dc_3}" \
-              -s "sub" -x "(cn=$SEARCH_FILTER)" \
+              -H "${ldap_scheme}://''${LDAP_HOST}:${builtins.toString ldap_port}" \
+              -D "${pkgs.lib.toUpper magic_prefix}2\\${pkgs.lib.toLower config.user}" \
+              -w "$(${pkgs._1password}/bin/op item get T2 --fields label=password)" \
+              -b "dc=''${LDAP_HOST//./,dc=}" \
+              -s "sub" -x "(cn=''${SEARCH_FILTER})" \
              | jq --slurp \
                  --raw-input 'split("\n\n")|map(split("\n")|map(select(.[0:1]!="#" and length>0)) |select(length > 0)|map(capture("^(?<key>[^:]*:?): *(?<value>.*)") |if .key[-1:.key|length] == ":" then .key=.key[0:-1]|.value=(.value|@base64d) else . end)| group_by(.key) | map({key:.[0].key,value:(if .|length > 1 then [.[].value] else .[].value end)}) | from_entries)' | jq -r 'del(.[].thumbnailPhoto)'
        '';
        ldapm_script = pkgs.writeShellScriptBin "ldapm" ''
+          if ! [ "$LDAP_HOST" ]; then
+              echo "No LDAP_HOST specified!"
+              exit 1
+          fi
          ${ldap_script}/bin/ldap "$@" | jq '[ .[].memberOf] | add'
        '';
        ldapg_script = pkgs.writeShellScriptBin "ldapg" ''
+          if ! [ "$LDAP_HOST" ]; then
+              echo "No LDAP_HOST specified!"
+              exit 1
+          fi
          ${ldap_script}/bin/ldap "$@" | jq '[ .[].member] | add'
        '';
      in
--- a/modules/darwin/system.nix
+++ b/modules/darwin/system.nix
@ -23,6 +23,8 @@

    system = {

+      stateVersion = 5;
+
      keyboard = {
        remapCapsLockToControl = true;
        enableKeyMapping = true; # Allows for skhd
--- a/modules/nixos/gaming/dwarf-fortress.nix
+++ b/modules/nixos/gaming/dwarf-fortress.nix
@ -9,7 +9,10 @@
  options.gaming.dwarf-fortress.enable = lib.mkEnableOption "Dwarf Fortress free edition.";

  config = lib.mkIf config.gaming.dwarf-fortress.enable {
-    unfreePackages = [ "dwarf-fortress" ];
+    unfreePackages = [
+      "dwarf-fortress"
+      "phoebus-theme"
+    ];
    environment.systemPackages =
      let
        dfDesktopItem = pkgs.makeDesktopItem {
--- a/modules/nixos/hardware/zfs.nix
+++ b/modules/nixos/hardware/zfs.nix
@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {

  options = {
@ -8,7 +13,7 @@
  config = lib.mkIf (config.server && config.zfs.enable) {

    # Only use compatible Linux kernel, since ZFS can be behind
-    boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+    boot.kernelPackages = pkgs.linuxPackages; # Defaults to latest LTS
    boot.kernelParams = [ "nohibernate" ];
    boot.supportedFilesystems = [ "zfs" ];
    services.prometheus.exporters.zfs.enable = config.prometheus.exporters.enable;
--- a/modules/nixos/services/arr.nix
+++ b/modules/nixos/services/arr.nix
@ -14,6 +14,11 @@ let
      url = "localhost:7878";
      apiKey = config.secrets.radarrApiKey.dest;
    };
+    readarr = {
+      exportarrPort = "9711";
+      url = "localhost:8787";
+      apiKey = config.secrets.readarrApiKey.dest;
+    };
    sonarr = {
      exportarrPort = "9708";
      url = "localhost:8989";
@ -61,6 +66,10 @@ in
        enable = true;
        group = "media";
      };
+      readarr = {
+        enable = true;
+        group = "media";
+      };
    };

    # Create a media group to be shared between services
@ -110,6 +119,21 @@ in
          }
        ];
      }
+      {
+        group = "download";
+        match = [
+          {
+            host = [ config.hostnames.download ];
+            path = [ "/readarr*" ];
+          }
+        ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = arrConfig.readarr.url; } ];
+          }
+        ];
+      }
      {
        group = "download";
        match = [
@ -223,6 +247,11 @@ in
      dest = "/var/private/radarr-api";
      prefix = "API_KEY=";
    };
+    secrets.readarrApiKey = {
+      source = ../../../private/radarr-api-key.age;
+      dest = "/var/private/readarr-api";
+      prefix = "API_KEY=";
+    };
    secrets.sonarrApiKey = {
      source = ../../../private/sonarr-api-key.age;
      dest = "/var/private/sonarr-api";
--- a/modules/nixos/services/audiobookshelf.nix
+++ b/modules/nixos/services/audiobookshelf.nix
@ -0,0 +1,44 @@
+{ config, lib, ... }:
+{
+
+  options = {
+    hostnames.audiobooks = lib.mkOption {
+      type = lib.types.str;
+      description = "Hostname for audiobook server (Audiobookshelf).";
+    };
+  };
+
+  config = lib.mkIf config.services.audiobookshelf.enable {
+
+    services.audiobookshelf = {
+      dataDir = "audiobookshelf";
+    };
+
+    # Allow web traffic to Caddy
+    caddy.routes = [
+      {
+        match = [ { host = [ config.hostnames.audiobooks ]; } ];
+        handle = [
+          {
+            handler = "reverse_proxy";
+            upstreams = [ { dial = "localhost:${builtins.toString config.services.audiobookshelf.port}"; } ];
+          }
+        ];
+      }
+    ];
+
+    # Configure Cloudflare DNS to point to this machine
+    services.cloudflare-dyndns.domains = [ config.hostnames.audiobooks ];
+
+    # Grant user access to Audiobookshelf directories
+    users.users.${config.user}.extraGroups = [ config.services.audiobookshelf.group ];
+
+    # Grant audiobookshelf access to media and Calibre directories
+    users.users.${config.services.audiobookshelf.user}.extraGroups = [
+      "media"
+      "calibre-web"
+    ];
+
+  };
+
+}
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@ -5,6 +5,7 @@
 {

  imports = [
+    ./audiobookshelf.nix
    ./arr.nix
    ./backups.nix
    ./bind.nix
--- a/modules/nixos/services/grafana.nix
+++ b/modules/nixos/services/grafana.nix
@ -53,6 +53,7 @@ in
            uid = promUid;
          }
        ];
+        # TODO: Add option to pull services from a list like Caddy does
        dashboards.settings.providers = [
          {
            name = "test";
@ -368,6 +369,18 @@ in
                          range = true;
                          refId = "C";
                        }
+                        {
+                          datasource = {
+                            type = "prometheus";
+                            uid = promUid;
+                          };
+                          editorMode = "code";
+                          expr = "readarr_system_status";
+                          hide = false;
+                          legendFormat = "Readarr";
+                          range = true;
+                          refId = "F";
+                        }
                        {
                          datasource = {
                            type = "prometheus";
@ -819,6 +832,28 @@ in
                              }
                            ];
                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:8787";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Readarr";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.download}/readarr";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
                          {
                            matcher = {
                              id = "byName";
@ -1105,6 +1140,28 @@ in
                              }
                            ];
                          }
+                          {
+                            matcher = {
+                              id = "byName";
+                              options = "localhost:${builtins.toString config.services.audiobookshelf.port}";
+                            };
+                            properties = [
+                              {
+                                id = "displayName";
+                                value = "Audiobookshelf";
+                              }
+                              {
+                                id = "links";
+                                value = [
+                                  {
+                                    targetBlank = true;
+                                    title = "";
+                                    url = "https://${config.hostnames.audiobooks}";
+                                  }
+                                ];
+                              }
+                            ];
+                          }
                        ];
                      };
                      gridPos = {
--- a/modules/nixos/services/samba.nix
+++ b/modules/nixos/services/samba.nix
@ -7,7 +7,7 @@

    services.samba = lib.mkIf config.services.samba.enable {
      openFirewall = true;
-      shares.data = {
+      settings.data = {
        path = "/data";
        browseable = "yes";
        "read only" = "no";
--- a/modules/nixos/services/uptime-kuma.nix
+++ b/modules/nixos/services/uptime-kuma.nix
@ -1,13 +1,6 @@
 { config, lib, ... }:
 {

-  options = {
-    hostnames.status = lib.mkOption {
-      type = lib.types.str;
-      description = "Hostname for status page (Uptime-Kuma).";
-    };
-  };
-
  config = lib.mkIf config.services.uptime-kuma.enable {

    services.uptime-kuma = {
--- a/overlays/gh-collaborators.nix
+++ b/overlays/gh-collaborators.nix
@ -1,15 +1,9 @@
-_final: prev: {
+inputs: _final: prev: {

  gh-collaborators = prev.buildGoModule rec {
    pname = "gh-collaborators";
    version = "v2.0.3";
-
-    src = prev.fetchFromGitHub {
-      owner = "nmasur";
-      repo = "gh-collaborators";
-      rev = version;
-      sha256 = "sha256-XgAZ/+7QxIRKiAZ4Gp/rLgTABSXkVjFQ8TbXOFj9vpM=";
-    };
+    src = inputs.gh-collaborators;

    # vendorHash = "sha256-rsRDOgJBa8T6+bC/APcmuRmg6ykbIp9pwRnJ9rrfHEs=";
    vendorHash = "sha256-fykxRb2U9DDsXorRTLiVWmhMY89N7RS07sal8ww6gz4=";
Author	SHA1	Message	Date
Noah Masur	6cf5f08fd5	nixd neovim setup	2024-10-25 08:53:27 -04:00
Noah Masur	8cba026f10	temp: not sure if this is even required	2024-10-25 08:53:04 -04:00
Noah Masur	a6e4b3130d	fix: tabs should be spaces	2024-10-19 09:01:26 -04:00
Noah Masur	33868c1add	fix: only setup desktop entry for gui	2024-10-19 08:45:26 -04:00
Noah Masur	d806bd7f56	use dynamic terminal for neovim based on rofi in linux	2024-10-12 11:57:38 -04:00
Noah Masur	120b97f970	audiobookshelf	2024-10-12 15:18:58 +00:00
Noah Masur	5f71437e57	fix: samba setting renamed	2024-10-12 15:18:15 +00:00
Noah Masur	e8e65ba4d1	fix: zfs deprecated latest compatible linux	2024-10-12 15:17:51 +00:00
Noah Masur	c594a0b161	use flake input for gh-collaborators	2024-10-12 10:52:04 -04:00
github-actions[bot]	57c3719600	flake.lock: Update Flake lock file updates: • Updated input 'darwin': 'github:lnl7/nix-darwin/8c8388ade72e58efdeae71b4cbb79e872c23a56b' (2024-10-03) → 'github:lnl7/nix-darwin/48b50b3b137be5cfb9f4d006835ce7c3fe558ccc' (2024-10-08) • Updated input 'disko': 'github:nix-community/disko/48ebb577855fb2398653f033b3b2208a9249203d' (2024-10-05) → 'github:nix-community/disko/bdbdb725d632863bdedb80baabf21327614dd237' (2024-10-11) • Updated input 'firefox-darwin': 'github:bandithedoge/nixpkgs-firefox-darwin/1cab93c0c087555cb21dd9ceb383b0d15deade32' (2024-10-06) → 'github:bandithedoge/nixpkgs-firefox-darwin/8a3143c1ce147481db4463e71bc3b7002e6ebc56' (2024-10-12) • Updated input 'home-manager': 'github:nix-community/home-manager/509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e' (2024-10-04) → 'github:nix-community/home-manager/2b13611eaed8326789f76f70d21d06fbb14e3e47' (2024-10-11) • Updated input 'nextcloud-snappymail': 'https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz?narHash=sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q%3D' (2024-10-06) → 'https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz?narHash=sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q%3D' (2024-10-12) • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/9ae128172f823956e54947fe471bc6dfa670ecb4' (2024-10-03) → 'github:nix-community/nixos-generators/40c8d30c490414910fc63626ad1b67af7db40cd3' (2024-10-10) • Updated input 'nixos-generators/nixlib': 'github:nix-community/nixpkgs.lib/bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1' (2024-09-29) → 'github:nix-community/nixpkgs.lib/b61309c3c1b6013d36299bc8285612865b3b9e4c' (2024-10-06) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb' (2024-10-04) → 'github:nixos/nixpkgs/5633bcff0c6162b9e4b5f1264264611e950c8ec7' (2024-10-09) • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/6e6b3dd395c3b1eb9be9f2d096383a8d05add030' (2024-10-04) → 'github:nixos/nixpkgs/c505ebf777526041d792a49d5f6dd4095ea391a7' (2024-10-11) • Updated input 'nur': 'github:nix-community/nur/1841d27c08fb58b1bb3e7944711938e719dd532e' (2024-10-06) → 'github:nix-community/nur/1d143f52b0a046924ee7fe74bce0bd2e10e07c3d' (2024-10-12) • Updated input 'nvim-lint-src': 'github:mfussenegger/nvim-lint/27f44d1cc3d733a38a736acb902f94879d99c76c' (2024-10-03) → 'github:mfussenegger/nvim-lint/f707b3ae50417067fa63fdfe179b0bff6b380da1' (2024-10-10) • Updated input 'nvim-tree-lua-src': 'github:kyazdani42/nvim-tree.lua/c9104a5d079db5a158c9562c54689df27d52dccc' (2024-09-30) → 'github:kyazdani42/nvim-tree.lua/5ad87620ec9d1190d15c88171a3f0122bc16b0fe' (2024-10-11) • Updated input 'wsl': 'github:nix-community/NixOS-WSL/31a18ceaeac81e75d10b05ab0dfb4fcc79d4ed1a' (2024-10-05) → 'github:nix-community/NixOS-WSL/0fc8d9bb51cc46b31d950513df6d088905c8fe55' (2024-10-10)	2024-10-12 03:46:46 +00:00
Noah Masur	98c9c85e95	change update to saturday	2024-10-07 21:00:45 -04:00
Noah Masur	3ef36c4873	remove magic prefix from ldap script	2024-10-07 19:23:35 -04:00
github-actions[bot]	1d1d5014a0	flake.lock: Update Flake lock file updates: • Updated input 'darwin': 'github:lnl7/nix-darwin/c03f85fa42d68d1056ca1740f3113b04f3addff2' (2024-09-19) → 'github:lnl7/nix-darwin/8c8388ade72e58efdeae71b4cbb79e872c23a56b' (2024-10-03) • Updated input 'disko': 'github:nix-community/disko/51994df8ba24d5db5459ccf17b6494643301ad28' (2024-09-20) → 'github:nix-community/disko/48ebb577855fb2398653f033b3b2208a9249203d' (2024-10-05) • Updated input 'firefox-darwin': 'github:bandithedoge/nixpkgs-firefox-darwin/947d22726be0ef737ebbe6ffa6f7ff9908576011' (2024-09-22) → 'github:bandithedoge/nixpkgs-firefox-darwin/1cab93c0c087555cb21dd9ceb383b0d15deade32' (2024-10-06) • Updated input 'hmts-nvim-src': 'github:calops/hmts.nvim/19a91816c123173a4551a6a04f2882338f20db1d' (2024-05-07) → 'github:calops/hmts.nvim/1ecb68b9f89abdb23d2754f9d69f90eab2d33eaa' (2024-09-26) • Updated input 'home-manager': 'github:nix-community/home-manager/14929f7089268481d86b83ed31ffd88713dcd415' (2024-09-21) → 'github:nix-community/home-manager/509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e' (2024-10-04) • Updated input 'mac-app-util': 'github:hraban/mac-app-util/63f269f737cafb2219ba38780c1ecb1dc24bc4a2' (2024-07-02) → 'github:hraban/mac-app-util/9c6bbe2a6a7ec647d03f64f0fadb874284f59eac' (2024-09-27) • Updated input 'nextcloud-snappymail': 'https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz?narHash=sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q%3D' (2024-09-22) → 'https://snappymail.eu/repository/nextcloud/snappymail-2.37.2-nextcloud.tar.gz?narHash=sha256-WwCRAZzxYWUpOy6iVTDpVIr/DrkJkQGjgIdVWNfCH3Q%3D' (2024-10-06) • Updated input 'nix2vim': 'github:gytis-ivaskevicius/nix2vim/1db11dbf8a4d124e02244fa5c4ff219b672a8e5b' (2024-06-17) → 'github:gytis-ivaskevicius/nix2vim/da26caae6c7776eedbc6514a0f57f1ccd6a759ed' (2024-10-02) • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/bfa25c9065f4cb5d884a0ad70f6e82f55ae90448' (2024-09-20) → 'github:nix-community/nixos-generators/9ae128172f823956e54947fe471bc6dfa670ecb4' (2024-10-03) • Updated input 'nixos-generators/nixlib': 'github:nix-community/nixpkgs.lib/9db4db09d82e4b2207bfa7f1e747a4f49d214555' (2024-09-15) → 'github:nix-community/nixpkgs.lib/bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1' (2024-09-29) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/c04d5652cfa9742b1d519688f65d1bbccea9eb7e' (2024-09-19) → 'github:nixos/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb' (2024-10-04) • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/944b2aea7f0a2d7c79f72468106bc5510cbf5101' (2024-09-20) → 'github:nixos/nixpkgs/6e6b3dd395c3b1eb9be9f2d096383a8d05add030' (2024-10-04) • Updated input 'nur': 'github:nix-community/nur/9552e6f691915e173c3dac2e7d96bd2d9d2c2416' (2024-09-22) → 'github:nix-community/nur/1841d27c08fb58b1bb3e7944711938e719dd532e' (2024-10-06) • Updated input 'nvim-lint-src': 'github:mfussenegger/nvim-lint/c823e2d0621b5c15aa6b46be4d69b1379bcb8fa6' (2024-09-20) → 'github:mfussenegger/nvim-lint/27f44d1cc3d733a38a736acb902f94879d99c76c' (2024-10-03) • Updated input 'nvim-tree-lua-src': 'github:kyazdani42/nvim-tree.lua/e7cdecc6363acef8232f2f099fe21096ffdc071f' (2024-09-21) → 'github:kyazdani42/nvim-tree.lua/c9104a5d079db5a158c9562c54689df27d52dccc' (2024-09-30) • Updated input 'wsl': 'github:nix-community/NixOS-WSL/cc84991d069d1948bb7c2c24a9874c0a835621e6' (2024-09-20) → 'github:nix-community/NixOS-WSL/31a18ceaeac81e75d10b05ab0dfb4fcc79d4ed1a' (2024-10-05) • Updated input 'wsl/flake-utils': 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) → 'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)	2024-10-06 03:51:27 +00:00
Noah Masur	1f64ed0bb8	fix: dwarf fortress phoebus-theme now unfree `e40e703411`	2024-09-30 20:30:29 -04:00
Noah Masur	2bfb8ea8b5	disable tab previews in firefox	2024-09-27 14:28:44 -04:00
Noah Masur	e91d6665fb	add git abbreviation for deleting branches	2024-09-27 14:28:13 -04:00
Noah Masur	7e3ab279af	update neovim plugins	2024-09-25 16:59:40 -04:00
Noah Masur	cdb9da9c50	add gdd to delete git local and remote branch	2024-09-25 16:58:42 -04:00
Noah Masur	46bbd2c967	add darwin stateversion (required by nix-darwin)	2024-09-25 16:58:03 -04:00
Noah Masur	51bee71faf	move hostname to common because services aren't in darwin	2024-09-25 16:57:44 -04:00
Noah Masur	a7adc18463	add = to convert program to full path	2024-09-25 16:43:48 -04:00