move keybinds to sxhkd

.github/workflows/check.yml

@@ -1,20 +0,0 @@
-name: Check Build
-
-on:
-  workflow_dispatch: # allows manual triggering
-
-jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
-      - name: Check Nixpkgs Inputs
-        uses: DeterminateSystems/flake-checker-action@v5
-      - name: Add Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v2
-      - name: Check the Flake
-        run: nix flake check

.github/workflows/update.yml

@@ -1,38 +0,0 @@
-name: Update Flake
-
-on:
-  workflow_dispatch: # allows manual triggering
-  schedule:
-    - cron: '33 3 * * 0' # runs weekly on Sunday at 03:33
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  lockfile:
-    name: Lockfile
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Install Nix
-        uses: DeterminateSystems/nix-installer-action@v4
-      - name: Check Nixpkgs Inputs
-        uses: DeterminateSystems/flake-checker-action@v5
-      - name: Add Nix Cache
-        uses: DeterminateSystems/magic-nix-cache-action@v2
-      - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v19
-        id: update
-        with:
-          pr-title: "Update flake.lock" # Title of PR to be created
-          pr-labels: |                  # Labels to be set on the PR
-            dependencies
-            automated
-      - name: Check the Flake
-        run: nix flake check
-      - name: Enable Pull Request Automerge
-        run: gh pr merge --rebase --auto ${{ steps.update.outputs.pull-request-number }}
-        env:
-          GH_TOKEN: ${{ github.token }}

.gitignore

@@ -3,6 +3,7 @@
 *.db
 **/.direnv/**
 result
+.luarc.json
 private/**
-templates/**/flake.lock
 !private/**.age
+!private/**.sha512

apps/neovim.nix

@@ -5,7 +5,7 @@
   program = "${
       (import ../modules/common/neovim/package {
         inherit pkgs;
-        colors = (import ../colorscheme/nord).dark;
+        colors = (import ../colorscheme/gruvbox).dark;
       })
     }/bin/nvim";
 

colorscheme/everforest/default.nix

@@ -1,24 +1,20 @@
 {
   name = "everforest"; # dark, hard
   author = "Sainnhe Park";
-  dark = {
+  base00 = "#2b3339"; # Default Background
-    base00 = "#2b3339"; # Default Background
+  base01 = "#323c41"; # Lighter Background
-    base01 = "#323c41"; # Lighter Background
+  base02 = "#503946"; # Selection Background
-    base02 = "#503946"; # Selection Background
+  base03 = "#868d80"; # Comments, Invisibles, Line Highlighting
-    base03 = "#868d80"; # Comments, Invisibles, Line Highlighting
+  base04 = "#d3c6aa"; # Dark Foreground (Used for status bars)
-    base04 = "#d3c6aa"; # Dark Foreground (Used for status bars)
+  base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators
-    base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators
+  base06 = "#e9e8d2"; # Light Foreground (Not often used)
-    base06 = "#e9e8d2"; # Light Foreground (Not often used)
+  base07 = "#fff9e8"; # Light Background (Not often used)
-    base07 = "#fff9e8"; # Light Background (Not often used)
+  base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ...
-    base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ...
+  base09 = "#d699b6"; # Integers, Boolean, Constants, ...
-    base09 = "#d699b6"; # Integers, Boolean, Constants, ...
+  base0A = "#83c092"; # Classes, Markup Bold, Search Text Background
-    base0A = "#83c092"; # Classes, Markup Bold, Search Text Background
+  base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
-    base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
+  base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
-    base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
+  base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
-    base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
+  base0E = "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
-    base0E =
+  base0F = "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
-      "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
-    base0F =
-      "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
-  };
 }

colorscheme/nord/default.nix

@@ -1,7 +1,7 @@
 {
-  name = "nord";
-  author = "arcticicestudio";
   dark = {
+    name = "nord";
+    author = "arcticicestudio";
     base00 = "#2E3440";
     base01 = "#3B4252";
     base02 = "#434C5E";

colorscheme/nord/neovim.lua

@@ -0,0 +1,13 @@
+local M = {}
+
+M.packer = function(use)
+    use({
+        "shaunsingh/nord.nvim",
+        config = function()
+            vim.g.nord_italic = true
+            vim.cmd("colorscheme nord")
+        end,
+    })
+end
+
+return M

flake.lock

@@ -17,22 +17,6 @@
         "type": "github"
       }
     },
-    "baleia-nvim-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1681806450,
-        "narHash": "sha256-jxRlIzWbnSj89032msc5w+2TVt7zVyzlxdXxiH1dQqY=",
-        "owner": "m00qek",
-        "repo": "baleia.nvim",
-        "rev": "00bb4af31c8c3865b735d40ebefa6c3f07b2dd16",
-        "type": "github"
-      },
-      "original": {
-        "owner": "m00qek",
-        "repo": "baleia.nvim",
-        "type": "github"
-      }
-    },
     "bufferline-nvim-src": {
       "flake": false,
       "locked": {
@@ -73,11 +57,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690431538,
+        "lastModified": 1687517837,
-        "narHash": "sha256-Uml8ivMMOFPB9fNSDcw72imGHRdJpaK12sRm2DTLLe8=",
+        "narHash": "sha256-Ea+JTy6NSf+wWIFrgC8gnOnyt01xwmtDEn2KecvaBkg=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "16c07487ac9bc59f58b121d13160c67befa3342e",
+        "rev": "6460468e7a3e1290f132fee4170ebeaa127f6f32",
         "type": "github"
       },
       "original": {
@@ -94,11 +78,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690548222,
+        "lastModified": 1687598357,
-        "narHash": "sha256-EcVjLOpbAuL/y55fLlEl3BNM4FP5Pwtp+6DbTiL6FDM=",
+        "narHash": "sha256-70ciIe8415oQnQypawaqocEaLJcI1XtkqRNmle8vsrg=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "43f17a8b31c49f6696b8b258d317161afdc7e36b",
+        "rev": "1e7098ee0448dc5d33df394d040f454cd42a809c",
         "type": "github"
       },
       "original": {
@@ -109,16 +93,14 @@
     },
     "firefox-darwin": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1690505116,
+        "lastModified": 1687568341,
-        "narHash": "sha256-ec0yX+DdfGtw2TQnG29jt1X/89OHTF0VsRrpp0+7s8Y=",
+        "narHash": "sha256-5mnjEy1tPfWjlFq/3UB/AyoqkDOJeVu/y/C6Yw2MW9k=",
         "owner": "bandithedoge",
         "repo": "nixpkgs-firefox-darwin",
-        "rev": "69010f2ef9fbcef70d12541910ccc6db7a9997db",
+        "rev": "0bb6fa671d1f1964b2cab7a3774cba1e071aa26e",
         "type": "github"
       },
       "original": {
@@ -181,11 +163,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1689068808,
+        "lastModified": 1685518550,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
         "type": "github"
       },
       "original": {
@@ -201,11 +183,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690652600,
+        "lastModified": 1687627695,
-        "narHash": "sha256-Dy09g7mezToVwtFPyY25fAx1hzqNXv73/QmY5/qyR44=",
+        "narHash": "sha256-6Pu7nWb52PRtUmihwuDNShDmsZiXgtXR0OARtH4DSik=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f58889c07efa8e1328fdf93dc1796ec2a5c47f38",
+        "rev": "172d46d4b2677b32277d903bdf4cff77c2cc6477",
         "type": "github"
       },
       "original": {
@@ -218,9 +200,7 @@
     "nil": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2",
-          "nixpkgs"
-        ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
@@ -261,11 +241,11 @@
     },
     "nixlib": {
       "locked": {
-        "lastModified": 1689469483,
+        "lastModified": 1687049841,
-        "narHash": "sha256-2SBhY7rZQ/iNCxe04Eqxlz9YK9KgbaTMBssq3/BgdWY=",
+        "narHash": "sha256-FBNZQfWtA7bb/rwk92mfiWc85x4hXta2OAouDqO5W8w=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "02fea408f27186f139153e1ae88f8ab2abd9c22c",
+        "rev": "908af6d1fa3643c5818ea45aa92b21d6385fbbe5",
         "type": "github"
       },
       "original": {
@@ -282,11 +262,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1690133435,
+        "lastModified": 1687398392,
-        "narHash": "sha256-YNZiefETggroaTLsLJG2M+wpF0pJPwiauKG4q48ddNU=",
+        "narHash": "sha256-T6kc3NMTpGJk1/dve8PGupeVcxboEb78xtTKhe3LL/A=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "b1171de4d362c022130c92d7c8adc4bf2b83d586",
+        "rev": "649171f56a45af13ba693c156207eafbbbf7edfe",
         "type": "github"
       },
       "original": {
@@ -297,11 +277,43 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1690548937,
+        "lastModified": 1639237670,
-        "narHash": "sha256-x3ZOPGLvtC0/+iFAg9Kvqm/8hTAIkGjc634SqtgaXTA=",
+        "narHash": "sha256-RTdL4rEQcgaZGpvtDgkp3oK/V+1LM3I53n0ACPSroAQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "edfb969386ebe6c3cf8f878775a7975cd88f926d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1680487167,
+        "narHash": "sha256-9FNIqrxDZgSliGGN2XJJSvcDYmQbgOANaZA4UWnTdg4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2a9d660ff0f7ffde9d73be328ee6e6f10ef66b28",
+        "rev": "53dad94e874c9586e71decf82d972dfb640ef044",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1687502512,
+        "narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "3ae20aa58a6c0d1ca95c9b11f59a2d12eebc511f",
         "type": "github"
       },
       "original": {
@@ -311,18 +323,18 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_4": {
       "locked": {
-        "lastModified": 1690470004,
+        "lastModified": 1686929285,
-        "narHash": "sha256-l57RmPhPz9r1LGDg/0v8bYgJO8R+GGTQZtkIxE7negU=",
+        "narHash": "sha256-WGtVzn+vGMPTXDO0DMNKVFtf+zUSqeW+KKk4Y/Ae99I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9462344318b376e157c94fa60c20a25b913b2381",
+        "rev": "93fddcf640ceca0be331210ba3101cee9d91c13d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-22.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -330,11 +342,11 @@
     "null-ls-nvim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1688652536,
+        "lastModified": 1686871437,
-        "narHash": "sha256-6KJtj9pbvBm6fOVpnyzO2fEVC+cVrw2XtZHOgq9ieIw=",
+        "narHash": "sha256-MxIZqyRW8jStiDNXt7Bsw8peDLKpqxKEaUuIJsXkGMI=",
         "owner": "jose-elias-alvarez",
         "repo": "null-ls.nvim",
-        "rev": "db09b6c691def0038c456551e4e2772186449f35",
+        "rev": "bbaf5a96913aa92281f154b08732be2f57021c45",
         "type": "github"
       },
       "original": {
@@ -345,11 +357,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1690721668,
+        "lastModified": 1687625402,
-        "narHash": "sha256-550poDnDiMXLPQBJnUwhEzv0ZC4zjiFiwTaOIi3jfs4=",
+        "narHash": "sha256-V+vSWypmm/tGbwNXGhqzmiV7vTjV2gNCEh9N7OhNnyA=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "1c4ba84e2cbfd43976a0fd3f848b536611735a79",
+        "rev": "aeaf37c7538965e45700d39e6b5dc9c9a0e0749c",
         "type": "github"
       },
       "original": {
@@ -378,11 +390,11 @@
     "nvim-tree-lua-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1690616703,
+        "lastModified": 1687132855,
-        "narHash": "sha256-kTbYvT21wLfiwEpQAgGZtep2GP4F9e7e6XGVpr4D1hY=",
+        "narHash": "sha256-ZRUoCDBv8rO8ZUBUMLgo33EBbqD9+ZOSET9rkFsA++E=",
         "owner": "kyazdani42",
         "repo": "nvim-tree.lua",
-        "rev": "4bd30f0137e44dcf3e74cc1164efb568f78f2b02",
+        "rev": "c3c6544ee00333b0f1d6a13735d0dd302dba4f70",
         "type": "github"
       },
       "original": {
@@ -411,7 +423,6 @@
     "root": {
       "inputs": {
         "Comment-nvim-src": "Comment-nvim-src",
-        "baleia-nvim-src": "baleia-nvim-src",
         "bufferline-nvim-src": "bufferline-nvim-src",
         "cmp-nvim-lsp-src": "cmp-nvim-lsp-src",
         "darwin": "darwin",
@@ -421,7 +432,7 @@
         "nil": "nil",
         "nix2vim": "nix2vim",
         "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_3",
         "null-ls-nvim-src": "null-ls-nvim-src",
         "nur": "nur",
         "nvim-lspconfig-src": "nvim-lspconfig-src",
@@ -430,7 +441,6 @@
         "telescope-nvim-src": "telescope-nvim-src",
         "telescope-project-nvim-src": "telescope-project-nvim-src",
         "toggleterm-nvim-src": "toggleterm-nvim-src",
-        "vscode-terraform-snippets": "vscode-terraform-snippets",
         "wallpapers": "wallpapers",
         "wsl": "wsl"
       }
@@ -540,22 +550,6 @@
         "type": "github"
       }
     },
-    "vscode-terraform-snippets": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1614849738,
-        "narHash": "sha256-v392tyzXV+zyBNt5OCB2NBCK7JcByrTa5Ne/nFtSCJI=",
-        "owner": "run-at-scale",
-        "repo": "vscode-terraform-doc-snippets",
-        "rev": "6ab3e44b566e660f38922cf908e6e547eaa5d4b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "run-at-scale",
-        "repo": "vscode-terraform-doc-snippets",
-        "type": "github"
-      }
-    },
     "wallpapers": {
       "flake": false,
       "locked": {
@@ -576,14 +570,14 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1690553050,
+        "lastModified": 1687279045,
-        "narHash": "sha256-pK3kF30OykL3v6P8UP6ipihlS34KoGq9SryCj3tHrFw=",
+        "narHash": "sha256-LR0dsXd/A07M61jclyBUW0wRojEQteWReKM35zoJXp0=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "f7a95a37306c46b42e9ce751977c44c752fd5eca",
+        "rev": "a8486b5d191f11d571f15d80b6e265d1712d01cf",
         "type": "github"
       },
       "original": {

flake.nix

@@ -20,17 +20,14 @@
     home-manager = {
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows =
-        "nixpkgs"; # Use system packages list for their inputs
+        "nixpkgs"; # Use system packages list where available
     };
 
     # Community packages; used for Firefox extensions
     nur.url = "github:nix-community/nur";
 
     # Use official Firefox binary for macOS
-    firefox-darwin = {
+    firefox-darwin.url = "github:bandithedoge/nixpkgs-firefox-darwin";
-      url = "github:bandithedoge/nixpkgs-firefox-darwin";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
     # Manage disk format and partitioning
     disko = {
@@ -57,10 +54,7 @@
     };
 
     # Nix language server
-    nil = {
+    nil.url = "github:oxalica/nil/2023-04-03";
-      url = "github:oxalica/nil/2023-04-03";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
 
     # Neovim plugins
     nvim-lspconfig-src = {
@@ -75,10 +69,6 @@
       url = "github:jose-elias-alvarez/null-ls.nvim";
       flake = false;
     };
-    baleia-nvim-src = {
-      url = "github:m00qek/baleia.nvim";
-      flake = false;
-    };
     Comment-nvim-src = {
       url = "github:numToStr/Comment.nvim/v0.8.0";
       flake = false;
@@ -107,10 +97,6 @@
       url = "github:kyazdani42/nvim-tree.lua";
       flake = false;
     };
-    vscode-terraform-snippets = {
-      url = "github:run-at-scale/vscode-terraform-doc-snippets";
-      flake = false;
-    };
 
   };
 
@@ -119,8 +105,7 @@
     let
 
       # Global configuration for my systems
-      globals = let baseName = "masu.rs";
+      globals = rec {
-      in rec {
         user = "noah";
         fullName = "Noah Masur";
         gitName = fullName;
@@ -128,17 +113,7 @@
         mail.server = "noahmasur.com";
         mail.imapHost = "imap.purelymail.com";
         mail.smtpHost = "smtp.purelymail.com";
-        dotfilesRepo = "https://github.com/nmasur/dotfiles";
+        dotfilesRepo = "git@github.com:nmasur/dotfiles";
-        hostnames = {
-          git = "git.${baseName}";
-          metrics = "metrics.${baseName}";
-          prometheus = "prom.${baseName}";
-          secrets = "vault.${baseName}";
-          stream = "stream.${baseName}";
-          content = "cloud.${baseName}";
-          books = "books.${baseName}";
-          download = "download.${baseName}";
-        };
       };
 
       # Common overlays to always use
@@ -148,8 +123,6 @@
         (import ./overlays/neovim-plugins.nix inputs)
         (import ./overlays/calibre-web.nix)
         (import ./overlays/disko.nix inputs)
-        (import ./overlays/tree-sitter.nix inputs)
-        (import ./overlays/betterlockscreen.nix)
       ];
 
       # System types to support.
@@ -177,7 +150,7 @@
           import ./hosts/lookingglass { inherit inputs globals overlays; };
       };
 
-      # For quickly applying home-manager settings with:
+      # For quickly applying local settings with:
       # home-manager switch --flake .#tempest
       homeConfigurations = {
         tempest =
@@ -228,24 +201,6 @@
 
         });
 
-      checks = forAllSystems (system:
-        let pkgs = import nixpkgs { inherit system overlays; };
-        in {
-          neovim = pkgs.runCommand "neovim-check-health" {
-            buildInputs = [ inputs.self.packages.${system}.neovim ];
-          } ''
-            mkdir -p $out
-            export HOME=$TMPDIR
-            nvim -c "checkhealth" -c "write $out/health.log" -c "quitall"
-
-            # Check for errors inside the health log
-            if $(grep "ERROR" $out/health.log); then
-              cat $out/health.log
-              exit 1
-            fi
-          '';
-        });
-
       # Templates for starting other projects quickly
       templates = rec {
         default = basic;

hosts/aws/default.nix

@@ -4,10 +4,14 @@ inputs.nixos-generators.nixosGenerate {
   inherit system;
   format = "amazon";
   modules = [
-    globals
     inputs.home-manager.nixosModules.home-manager
     {
       nixpkgs.overlays = overlays;
+      user = globals.user;
+      fullName = globals.fullName;
+      dotfilesRepo = globals.dotfilesRepo;
+      gitName = globals.gitName;
+      gitEmail = globals.gitEmail;
       networking.hostName = "sheep";
       gui.enable = false;
       theme.colors = (import ../../colorscheme/gruvbox).dark;

hosts/flame/default.nix

@@ -10,7 +10,7 @@ inputs.nixpkgs.lib.nixosSystem {
   system = "aarch64-linux";
   specialArgs = { };
   modules = [
-    globals
+    (removeAttrs globals [ "mail.server" ])
     inputs.home-manager.nixosModules.home-manager
     ../../modules/common
     ../../modules/nixos
@@ -43,27 +43,14 @@ inputs.nixpkgs.lib.nixosSystem {
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB+AbmjGEwITk5CK9y7+Rg27Fokgj9QEjgc9wST6MA3s";
 
       # Programs and services
+      caddy.enable = true;
       cloudflare.enable = true; # Proxy traffic with Cloudflare
       dotfiles.enable = true; # Clone dotfiles
+      gaming.minecraft-server.enable = true; # Setup Minecraft server
+      giteaServer = "git.masu.rs";
+      metricsServer = "metrics.masu.rs";
       neovim.enable = true;
-
+      vaultwardenServer = "vault.masu.rs";
-      services.caddy.enable = true;
-      services.grafana.enable = true;
-      services.openssh.enable = true;
-      services.victoriametrics.enable = true;
-      services.gitea.enable = true;
-      services.vaultwarden.enable = true;
-      services.minecraft-server.enable = true; # Setup Minecraft server
-
-      cloudflareTunnel = {
-        enable = true;
-        id = "bd250ee1-ed2e-42d2-b627-039f1eb5a4d2";
-        credentialsFile = ../../private/cloudflared-flame.age;
-        ca =
-          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
-      };
-
-      giteaRunner.enable = true;
 
       # Nextcloud backup config
       backup.s3 = {

hosts/lookingglass/default.nix

@@ -21,7 +21,7 @@ inputs.darwin.lib.darwinSystem {
       identityFile = "/Users/Noah.Masur/.ssh/id_ed25519";
       gui.enable = true;
       theme = {
-        colors = (import ../../colorscheme/gruvbox-dark).dark;
+        colors = (import ../../colorscheme/gruvbox).dark;
         dark = true;
       };
       mail.user = globals.user;

hosts/swan/default.nix

@@ -15,7 +15,6 @@ inputs.nixpkgs.lib.nixosSystem {
     {
       # Hardware
       server = true;
-      physical = true;
       networking.hostName = "swan";
 
       boot.initrd.availableKernelModules =
@@ -49,19 +48,14 @@ inputs.nixpkgs.lib.nixosSystem {
       theme = { colors = (import ../../colorscheme/gruvbox).dark; };
       nixpkgs.overlays = overlays;
       neovim.enable = true;
+      caddy.enable = true;
       cloudflare.enable = true;
       dotfiles.enable = true;
-      arrs.enable = true;
+      streamServer = "stream.masu.rs";
-
+      nextcloudServer = "cloud.masu.rs";
-      services.bind.enable = true;
+      bookServer = "books.masu.rs";
-      services.caddy.enable = true;
+      arrServer = "download.masu.rs";
-      services.jellyfin.enable = true;
+      samba.enable = true;
-      services.nextcloud.enable = true;
-      services.calibre-web.enable = true;
-      services.openssh.enable = true;
-      services.prometheus.enable = false;
-      services.vmagent.enable = true;
-      services.samba.enable = true;
 
       cloudflareTunnel = {
         enable = true;

hosts/tempest/default.nix

@@ -91,19 +91,6 @@ inputs.nixpkgs.lib.nixosSystem {
         leagueoflegends.enable = true;
         ryujinx.enable = true;
       };
-      services.vmagent.enable = true;
-
-      services.openssh.enable = true; # Required for Cloudflare tunnel
-      cloudflareTunnel = {
-        enable = true;
-        id = "ac133a82-31fb-480c-942a-cdbcd4c58173";
-        credentialsFile = ../../private/cloudflared-tempest.age;
-        ca =
-          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPY6C0HmdFCaxYtJxFr3qV4/1X4Q8KrYQ1hlme3u1hJXK+xW+lc9Y9glWHrhiTKilB7carYTB80US0O47gI5yU4= open-ssh-ca@cloudflareaccess.org";
-      };
-
-      # Allows requests to force machine to wake up
-      networking.interfaces.enp5s0.wakeOnLan.enable = true;
 
     }
   ];

modules/common/applications/firefox.nix

@@ -33,6 +33,7 @@
             vimium
             multi-account-containers
             facebook-container
+            temporary-containers
             (lib.mkIf config._1password.enable onepassword-password-manager)
             okta-browser-plugin
             sponsorblock
@@ -73,7 +74,6 @@
             "media.ffmpeg.vaapi.enabled" =
               true; # Enable hardware video acceleration
             "cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
-            "svg.context-properties.content.enabled" = true; # Sidebery styling
           };
           userChrome = ''
             :root {

modules/common/applications/kitty.nix

@@ -15,22 +15,13 @@
 
     home-manager.users.${config.user} = {
 
-      # Display images in the terminal
-      programs.fish.shellAliases = {
-        icat = "kitty +kitten icat";
-        ssh = "kitty +kitten ssh";
-      };
-
       programs.kitty = {
         enable = true;
         environment = { };
         extraConfig = "";
         font.size = 14;
         keybindings = {
-          # Use shift+enter to complete text suggestions in fish
           "shift+enter" = "send_text all \\x1F";
-
-          # Easy fullscreen toggle (for macOS)
           "super+f" = "toggle_fullscreen";
         };
         settings = {
@@ -81,6 +72,7 @@
           # Scrollback
           scrolling_lines = 10000;
           scrollback_pager_history_size = 10; # MB
+          scrollback_pager = "${pkgs.neovim}/bin/nvim -c 'normal G'";
 
           # Window
           window_padding_width = 6;
@@ -88,7 +80,7 @@
           tab_bar_edge = "top";
           tab_bar_style = "slant";
 
-          # Disable audio
+          # Audio
           enable_audio_bell = false;
         };
       };

modules/common/applications/media.nix

@@ -22,8 +22,8 @@
         enable = true;
         bindings = { };
         config = {
-          image-display-duration = 2; # For cycling through images
+          image-display-duration = 2;
-          hwdec = "auto-safe"; # Attempt to use GPU decoding for video
+          hwdec = "auto-safe";
         };
         scripts = [
 
@@ -49,7 +49,7 @@
         ];
       };
 
-      # Set default programs for opening PDFs and other media
+      # Set default for opening PDFs
       xdg.mimeApps = {
         associations.added = {
           "application/pdf" = [ "pwmt.zathura-cb.desktop" ];

modules/common/default.nix

@@ -59,47 +59,13 @@
     };
     dotfilesRepo = lib.mkOption {
       type = lib.types.str;
-      description = "Link to dotfiles repository HTTPS URL.";
+      description = "Link to dotfiles repository.";
     };
     unfreePackages = lib.mkOption {
       type = lib.types.listOf lib.types.str;
       description = "List of unfree packages to allow.";
       default = [ ];
     };
-    hostnames = {
-      git = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for git server (Gitea).";
-      };
-      metrics = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for metrics server.";
-      };
-      prometheus = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for Prometheus server.";
-      };
-      secrets = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for passwords and secrets (Vaultwarden).";
-      };
-      stream = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for video/media library (Jellyfin).";
-      };
-      content = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for personal content system (Nextcloud).";
-      };
-      books = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for books library (Calibre-Web).";
-      };
-      download = lib.mkOption {
-        type = lib.types.str;
-        description = "Hostname for download services.";
-      };
-    };
   };
 
   config = let stateVersion = "23.05";

modules/common/mail/default.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: {
 
-  imports = [ ./himalaya.nix ./aerc.nix ./system.nix ];
+  imports = [ ./himalaya.nix ./aerc.nix ];
 
   options = {
     mail.enable = lib.mkEnableOption "Mail service.";
@@ -27,31 +27,15 @@
 
     home-manager.users.${config.user} = {
       programs.mbsync = { enable = true; };
-
-      # Automatically check for mail and keep files synced locally
       services.mbsync = lib.mkIf pkgs.stdenv.isLinux {
         enable = true;
         frequency = "*:0/5";
         postExec = "${pkgs.notmuch}/bin/notmuch new";
       };
-
-      # Used to watch for new mail and trigger sync
       services.imapnotify.enable = pkgs.stdenv.isLinux;
-
+      programs.notmuch.enable = true;
-      # Allows sending email from CLI/sendmail
-      programs.msmtp.enable = true;
-
-      # Better local mail search
-      programs.notmuch = {
-        enable = true;
-        new.ignore = [ ".mbsyncstate.lock" ".mbsyncstate.journal" ];
-      };
-
       accounts.email = {
-
-        # Where email files are stored
         maildirBasePath = "${config.homePath}/mail";
-
         accounts = {
           home = let address = "${config.mail.user}@${config.mail.server}";
           in {
@@ -64,17 +48,13 @@
               "hey"
               "admin"
             ];
-
-            # Options for contact completion
             alot = { };
-
+            flavor = "plain";
             imap = {
               host = config.mail.imapHost;
               port = 993;
               tls.enable = true;
             };
-
-            # Watch for mail and run notifications or sync
             imapnotify = {
               enable = true;
               boxes = [ "Inbox" ];
@@ -83,11 +63,7 @@
                 config.home-manager.users.${config.user}.services.dunst.enable
                 "${pkgs.libnotify}/bin/notify-send 'New mail arrived'";
             };
-
-            # Name of the directory in maildir for this account
             maildir = { path = "main"; };
-
-            # Bi-directional syncing options for local files
             mbsync = {
               enable = true;
               create = "both";
@@ -98,17 +74,12 @@
                 CopyArrivalDate = "yes"; # Sync time of original message
               };
             };
-
-            # Enable indexing
             notmuch.enable = true;
-
-            # Used to login and send and receive emails
             passwordCommand =
               "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${
                 pkgs.writeText "mailpass.age"
                 (builtins.readFile ../../../private/mailpass.age)
               }";
-
             smtp = {
               host = config.mail.smtpHost;
               port = 465;

modules/common/mail/system.nix

@@ -1,34 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  config = lib.mkIf (config.mail.enable || config.server) {
-
-    home-manager.users.${config.user} = {
-
-      programs.msmtp.enable = true;
-
-      # The system user for sending automatic notifications
-      accounts.email.accounts.system =
-        let address = "system@${config.mail.server}";
-        in {
-          userName = address;
-          realName = "NixOS System";
-          primary = !config.mail.enable; # Only primary if mail not enabled
-          inherit address;
-          passwordCommand =
-            "${pkgs.age}/bin/age --decrypt --identity ${config.identityFile} ${
-              pkgs.writeText "mailpass-system.age"
-              (builtins.readFile ../../../private/mailpass-system.age)
-            }";
-          msmtp.enable = true;
-          smtp = {
-            host = config.mail.smtpHost;
-            port = 465;
-            tls.enable = true;
-          };
-        };
-
-    };
-
-  };
-
-}

modules/common/neovim/config/align.nix

@@ -1,7 +1,4 @@
 { pkgs, ... }: {
-
-  # Plugin for aligning text programmatically
-
   plugins = [ pkgs.vimPlugins.tabular ];
   lua = ''
     -- Align

modules/common/neovim/config/bufferline.nix

@@ -1,7 +1,4 @@
 { pkgs, ... }: {
-
-  # Shows buffers in a VSCode-style tab layout
-
   plugins = [
     pkgs.vimPlugins.bufferline-nvim
     pkgs.vimPlugins.vim-bbye # Better closing of buffers

modules/common/neovim/config/colors.nix

@@ -1,7 +1,5 @@
 { pkgs, lib, config, ... }: {
 
-  # Sets Neovim colors based on Nix colorscheme
-
   options.colors = lib.mkOption {
     type = lib.types.attrsOf lib.types.str;
     description = "Attrset of base16 colorscheme key value pairs.";

modules/common/neovim/config/completion.nix

@@ -24,14 +24,12 @@
       end
     '';
 
-    # Enable Luasnip snippet completion
     snippet.expand = dsl.rawLua ''
       function(args)
           require("luasnip").lsp_expand(args.body)
       end
     '';
 
-    # Basic completion keybinds
     mapping = {
       "['<C-n>']" = dsl.rawLua
         "require('cmp').mapping.select_next_item({ behavior = require('cmp').SelectBehavior.Insert })";
@@ -66,26 +64,24 @@
       '';
     };
 
-    # These are where the completion engine gets its suggestions
     sources = [
-      { name = "nvim_lua"; } # Fills in common Neovim lua functions
+      { name = "nvim_lua"; }
-      { name = "nvim_lsp"; } # LSP results
+      { name = "nvim_lsp"; }
-      { name = "luasnip"; } # Snippets
+      { name = "luasnip"; }
-      { name = "path"; } # Shell completion from current PATH
+      { name = "path"; }
       {
-        name = "buffer"; # Grep for text from the current text buffer
+        name = "buffer";
         keyword_length = 3;
         max_item_count = 10;
       }
       {
-        name = "rg"; # Grep for text from the current directory
+        name = "rg";
         keyword_length = 6;
         max_item_count = 10;
         option = { additional_arguments = "--ignore-case"; };
       }
     ];
 
-    # Styling of the completion menu
     formatting = {
       fields = [ "kind" "abbr" "menu" ];
       format = dsl.rawLua ''
@@ -139,13 +135,6 @@
   };
 
   lua = ''
-    -- Load snippets
-    -- Check status: :lua require("luasnip").log.open()
-    require("luasnip.loaders.from_vscode").lazy_load()
-    require("luasnip.loaders.from_vscode").lazy_load({ paths = { "${
-      builtins.toString pkgs.vscode-terraform-snippets
-    }" } })
-
     -- Use buffer source for `/`
     require('cmp').setup.cmdline("/", {
         sources = {

modules/common/neovim/config/lsp.nix

@@ -29,9 +29,6 @@
   lua = ''
     ${builtins.readFile ./lsp.lua}
 
-    -- Prevent infinite log size (change this when debugging)
-    vim.lsp.set_log_level("off")
-
     require("null-ls").setup({
         sources = {
             require("null-ls").builtins.formatting.stylua.with({ command = "${pkgs.stylua}/bin/stylua" }),

modules/common/neovim/config/misc.nix

@@ -7,14 +7,10 @@
     pkgs.vimPlugins.comment-nvim # Smart comment commands
     pkgs.vimPlugins.glow-nvim # Markdown preview popup
     pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
-    pkgs.vimPlugins.which-key-nvim # Keybind helper
   ];
 
-  # Initialize some plugins
   setup.Comment = { };
   setup.colorizer = { };
-  setup.glow = { };
-  setup.which-key = { };
 
   vim.o = {
     termguicolors = true; # Set to truecolor
@@ -44,10 +40,6 @@
     relativenumber = true; # Relative numbers instead of absolute
   };
 
-  # For which-key-nvim
-  vim.o.timeout = true;
-  vim.o.timeoutlen = 300;
-
   # Better backup, swap and undo storage
   vim.o.backup = true; # Easier to recover and more secure
   vim.bo.swapfile = false; # Instead of swaps, create backups

modules/common/neovim/config/statusline.nix

@@ -2,7 +2,7 @@
   plugins = [ pkgs.vimPlugins.lualine-nvim ];
   setup.lualine = {
     options = {
-      theme = "base16";
+      theme = "gruvbox";
       icons_enabled = true;
     };
   };

modules/common/neovim/config/syntax.nix

@@ -1,39 +1,26 @@
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {
 
   plugins = [
     (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
       with pkgs.tree-sitter-grammars; [
-        tree-sitter-bash
-        tree-sitter-fish
         tree-sitter-hcl
-        tree-sitter-ini
-        tree-sitter-json
-        tree-sitter-lua
-        tree-sitter-markdown
-        tree-sitter-markdown-inline
-        tree-sitter-nix
-        tree-sitter-puppet
         tree-sitter-python
-        tree-sitter-rasi
+        tree-sitter-lua
+        tree-sitter-nix
+        tree-sitter-fish
         tree-sitter-toml
         tree-sitter-yaml
+        tree-sitter-json
       ]))
     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.vimPlugins.vim-puppet
-    (pkgs.vimUtils.buildVimPluginFrom2Nix {
-      pname = "nmasur";
-      version = "0.1";
-      src = ../plugin;
-    })
   ];
 
   setup."nvim-treesitter.configs" = {
     highlight = { enable = true; };
     indent = { enable = true; };
-    matchup = { enable = true; }; # Uses vim-matchup
 
     textobjects = {
       select = {
@@ -62,10 +49,4 @@
     };
   };
 
-  # Use mkAfter to ensure tree-sitter is already loaded
-  lua = lib.mkAfter ''
-    -- Use HCL parser with .tf files
-    vim.treesitter.language.register('hcl', 'terraform')
-  '';
-
 }

modules/common/neovim/config/telescope.nix

@@ -1,7 +1,5 @@
 { pkgs, dsl, ... }: {
 
-  # Telescope is a fuzzy finder that can work with different sub-plugins
-
   plugins = [
     pkgs.vimPlugins.telescope-nvim
     pkgs.vimPlugins.project-nvim

modules/common/neovim/config/toggleterm.lua

@@ -12,8 +12,6 @@ vim.api.nvim_create_autocmd("TermOpen", {
     end,
 })
 
--- These are all the different types of terminals we can trigger
-
 local terminal = require("toggleterm.terminal").Terminal
 
 local basicterminal = terminal:new()

modules/common/neovim/config/toggleterm.nix

@@ -1,7 +1,5 @@
 { pkgs, dsl, ... }: {
 
-  # Toggleterm provides a floating terminal inside the editor for quick access
-
   plugins = [ pkgs.vimPlugins.toggleterm-nvim ];
 
   use.toggleterm.setup = dsl.callWith {

modules/common/neovim/config/tree.nix

@@ -1,7 +1,5 @@
 { pkgs, dsl, ... }: {
 
-  # This plugin creates a side drawer for navigating the current project
-
   plugins = [ pkgs.vimPlugins.nvim-tree-lua pkgs.vimPlugins.nvim-web-devicons ];
 
   # Disable netrw eagerly
@@ -12,16 +10,16 @@
   };
 
   setup.nvim-tree = {
-    disable_netrw = true; # Disable the built-in file manager
+    disable_netrw = true;
-    hijack_netrw = true; # Works as the file manager
+    hijack_netrw = true;
-    sync_root_with_cwd = true; # Change project whenever currend dir changes
+    sync_root_with_cwd = true;
-    respect_buf_cwd = true; # Change to exact location of focused buffer
+    respect_buf_cwd = true;
-    update_focused_file = { # Change project based on the focused buffer
+    update_focused_file = {
       enable = true;
       update_root = true;
       ignore_list = { };
     };
-    diagnostics = { # Enable LSP and linter integration
+    diagnostics = {
       enable = true;
       icons = {
         hint = "";
@@ -30,7 +28,7 @@
         error = "";
       };
     };
-    renderer = { # Show files with changes vs. current commit
+    renderer = {
       icons = {
         glyphs = {
           git = {
@@ -45,7 +43,6 @@
         };
       };
     };
-    # Set keybinds and initialize program
     on_attach = dsl.rawLua ''
       function (bufnr)
         local api = require('nvim-tree.api')
@@ -61,7 +58,7 @@
         vim.keymap.set('n', 'v', api.node.open.vertical, opts('Open: Vertical Split'))
       end
     '';
-    view = { # Set look and feel
+    view = {
       width = 30;
       hide_root_folder = false;
       side = "left";
@@ -70,7 +67,6 @@
     };
   };
 
-  # Toggle the sidebar
   lua = ''
     vim.keymap.set("n", "<Leader>e", ":NvimTreeFindFileToggle<CR>", { silent = true })
   '';

modules/common/neovim/default.nix

@@ -18,16 +18,11 @@ in {
 
         home.packages = [ neovim ];
 
-        # Use Neovim as the editor for git commit messages
         programs.git.extraConfig.core.editor = "nvim";
-
-        # Set Neovim as the default app for text editing and manual pages
         home.sessionVariables = {
           EDITOR = "nvim";
           MANPAGER = "nvim +Man!";
         };
-
-        # Create quick aliases for launching Neovim
         programs.fish = {
           shellAliases = { vim = "nvim"; };
           shellAbbrs = {
@@ -36,20 +31,12 @@ in {
             vll = "nvim -c 'Telescope oldfiles'";
           };
         };
+        programs.kitty.settings.scrollback_pager = lib.mkForce ''
+          ${neovim}/bin/nvim -c 'setlocal nonumber nolist showtabline=0 foldcolumn=0|Man!' -c "autocmd VimEnter * normal G" -'';
 
-        # Set Neovim as the kitty terminal "scrollback" (vi mode) option.
-        # Requires removing some of the ANSI escape codes that are sent to the
-        # scrollback using sed and baleia, as well as removing several
-        # unnecessary features.
-        programs.kitty.settings.scrollback_pager = ''
-          $SHELL -c 'sed -r "s/[[:cntrl:]]\]133;[AC]..//g" | ${neovim}/bin/nvim -c "setlocal nonumber norelativenumber nolist laststatus=0" -c "lua baleia = require(\"baleia\").setup({}); baleia.once(0)" -c "map <silent> q :qa!<CR>" -c "autocmd VimEnter * normal G"' '';
-
-        # 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 {
           name = "Neovim wrapper";
           exec = "kitty nvim %F";
-          mimeType = [ "text/plain" "text/markdown" ];
         };
         xdg.mimeApps.defaultApplications = lib.mkIf pkgs.stdenv.isLinux {
           "text/plain" = [ "nvim.desktop" ];
@@ -58,6 +45,9 @@ in {
 
       };
 
+    # # Used for icons in Vim
+    # fonts.fonts = with pkgs; [ nerdfonts ];
+
   };
 
 }

modules/common/neovim/lua/keybinds.lua

@@ -39,7 +39,7 @@ 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>gr", ":!gh repo view -w<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/lua/settings.lua

@@ -4,9 +4,9 @@
 
 vim.filetype.add({
     pattern = {
-        [".*%.tfvars"] = "terraform",
+        [".*%.tfvars"] = "hcl",
-        [".*%.tf"] = "terraform",
+        [".*%.tf"] = "hcl",
-        [".*%.rasi"] = "rasi",
+        [".*%.rasi"] = "css",
     },
 })
 

modules/common/neovim/package/default.nix

@@ -28,8 +28,6 @@
 
 { pkgs, colors, ... }:
 
-# Comes from nix2vim overlay:
-# https://github.com/gytis-ivaskevicius/nix2vim/blob/master/lib/neovim-builder.nix
 pkgs.neovimBuilder {
   package = pkgs.neovim-unwrapped;
   inherit colors;

modules/common/neovim/plugin/after/queries/nix/injections.scm

@@ -1,8 +0,0 @@
-expression: (apply_expression
-  function: (apply_expression
-    function: (select_expression
-      attrpath: (attrpath) @writeshell (#match? @writeshell "^writeShell.*$")
-      )
-    )
-  (indented_string_expression) @bash
-)

modules/common/repositories/dotfiles.nix

@@ -1,7 +1,5 @@
 { config, pkgs, lib, ... }: {
 
-  # Allows me to make sure I can work on my dotfiles locally
-
   options.dotfiles.enable = lib.mkEnableOption "Clone dotfiles.";
 
   config = lib.mkIf config.dotfiles.enable {
@@ -16,8 +14,13 @@
           [ "writeBoundary" ] ''
             if [ ! -d "${config.dotfilesPath}" ]; then
                 $DRY_RUN_CMD mkdir --parents $VERBOSE_ARG $(dirname "${config.dotfilesPath}")
-                $DRY_RUN_CMD ${pkgs.git}/bin/git \
+
-                    clone ${config.dotfilesRepo} "${config.dotfilesPath}"
+                # Force HTTPS because anonymous SSH doesn't work
+                GIT_CONFIG_COUNT=1 \
+                    GIT_CONFIG_KEY_0="url.https://github.com/.insteadOf" \
+                    GIT_CONFIG_VALUE_0="git@github.com:" \
+                    $DRY_RUN_CMD \
+                    ${pkgs.git}/bin/git clone ${config.dotfilesRepo} "${config.dotfilesPath}"
             fi
           '';
 

modules/common/repositories/notes.nix

@@ -1,8 +1,5 @@
 { config, ... }: {
 
-  # This is just a placeholder as I expect to interact with my notes in a
-  # certain location
-
   home-manager.users.${config.user} = {
 
     home.sessionVariables = {

modules/common/shell/charm.nix

@@ -1,7 +1,5 @@
 { config, pkgs, lib, ... }: {
 
-  # Convenience utilities from charm.sh
-
   options.charm.enable = lib.mkEnableOption "Charm utilities.";
 
   config.home-manager.users.${config.user} = lib.mkIf config.charm.enable {

modules/common/shell/direnv.nix

@@ -1,6 +1,5 @@
 { config, ... }: {
 
-  # Enables quickly entering Nix shells when changing directories
   home-manager.users.${config.user}.programs.direnv = {
     enable = true;
     nix-direnv.enable = true;

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

@@ -14,7 +14,7 @@ bind -M insert \cp projects
 bind -M default \cp projects
 bind -M insert \x1F accept-autosuggestion
 bind -M default \x1F accept-autosuggestion
-bind -M insert \cn 'commandline -r "nix shell nixpkgs#"'
+bind -M insert \cn 'commandline -r "nix run nixpkgs#"'
-bind -M default \cn 'commandline -r "nix shell nixpkgs#"'
+bind -M default \cn 'commandline -r "nix run nixpkgs#"'
 bind -M insert \x11F nix-fzf
 bind -M default \x11F nix-fzf

modules/common/shell/fzf.nix

@@ -1,7 +1,5 @@
 { config, ... }: {
 
-  # FZF is a fuzzy-finder for the terminal
-
   home-manager.users.${config.user} = {
 
     programs.fzf.enable = true;

modules/common/shell/nixpkgs.nix

@@ -73,9 +73,6 @@
       path = builtins.toString pkgs.path;
     };
 
-    # For security, only allow specific users
-    settings.allowed-users = [ "@wheel" config.user ];
-
   };
 
 }

modules/common/shell/utilities.nix

@@ -23,7 +23,6 @@ in {
         dig # DNS lookup
         fd # find
         htop # Show system processes
-        killall # Force quit
         inetutils # Includes telnet, whois
         jq # JSON manipulation
         lf # File viewer
@@ -35,9 +34,6 @@ in {
         tree # View directory hierarchy
         vimv-rs # Batch rename files
         unzip # Extract zips
-        dua # File sizes (du)
-        du-dust # Disk usage tree (ncdu)
-        duf # Basic disk information (df)
       ];
 
       programs.zoxide.enable = true; # Shortcut jump command
@@ -56,6 +52,10 @@ in {
         };
       };
 
+      programs.fish.shellAbbrs = {
+        cat = "bat"; # Swap cat with bat
+      };
+
       programs.fish.functions = {
         ping = {
           description = "Improved ping";

modules/darwin/hammerspoon.nix

@@ -20,22 +20,12 @@
         };
       xdg.configFile."hammerspoon/Spoons/MoveWindow.spoon".source =
         ./hammerspoon/Spoons/MoveWindow.spoon;
-
-      home.activation.reloadHammerspoon =
-        config.home-manager.users.${config.user}.lib.dag.entryAfter
-        [ "writeBoundary" ] ''
-          $DRY_RUN_CMD /usr/local/bin/hs -c "hs.reload()"
-          $DRY_RUN_CMD sleep 1
-          $DRY_RUN_CMD /usr/local/bin/hs -c "hs.console.clearConsole()"
-        '';
-
     };
 
     homebrew.casks = [ "hammerspoon" ];
 
     system.activationScripts.postUserActivation.text = ''
       defaults write org.hammerspoon.Hammerspoon MJConfigFile "~/.config/hammerspoon/init.lua"
-      sudo killall Dock
     '';
 
   };

modules/darwin/hammerspoon/init.lua

@@ -2,4 +2,3 @@ hs.loadSpoon("ControlEscape"):start() -- Load Hammerspoon bits from https://gith
 hs.loadSpoon("Launcher"):init()
 hs.loadSpoon("DismissAlerts"):init()
 hs.loadSpoon("MoveWindow"):init()
-hs.ipc.cliInstall() -- Install Hammerspoon CLI program

modules/nixos/applications/calibre.nix

@@ -14,8 +14,6 @@
       home.packages = with pkgs; [ calibre ];
       # home.sessionVariables = { CALIBRE_USE_DARK_PALETTE = 1; };
     };
-
-    # Forces Calibre to use dark mode
     environment.sessionVariables = { CALIBRE_USE_DARK_PALETTE = "1"; };
   };
 }

modules/nixos/applications/nautilus.nix

@@ -18,14 +18,12 @@
 
     home-manager.users.${config.user} = {
 
-      # Quick button for launching nautilus
       xsession.windowManager.i3.config.keybindings = {
         "${
           config.home-manager.users.${config.user}.xsession.windowManager.i3.config.modifier
         }+n" = "exec --no-startup-id ${pkgs.gnome.nautilus}/bin/nautilus";
       };
 
-      # Generates a QR code and previews it with sushi
       programs.fish.functions = {
         qr = {
           body =
@@ -33,7 +31,7 @@
         };
       };
 
-      # Set Nautilus as default for opening directories
+      # Set default for opening directories
       xdg.mimeApps = {
         associations.added."inode/directory" = [ "org.gnome.Nautilus.desktop" ];
         # associations.removed = {
@@ -42,7 +40,6 @@
         defaultApplications."inode/directory" =
           lib.mkBefore [ "org.gnome.Nautilus.desktop" ];
       };
-
     };
 
     # # Set default for opening directories
@@ -53,13 +50,6 @@
     #     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";
-      wantedBy = [ "default.target" ];
-      script = "${pkgs.trash-cli}/bin/trash-empty 7";
-    };
-
   };
 
 }

modules/nixos/gaming/minecraft-server.nix

@@ -9,11 +9,15 @@ let
 
 in {
 
-  config = lib.mkIf config.services.minecraft-server.enable {
+  options.gaming.minecraft-server.enable =
+    lib.mkEnableOption "Minecraft Server.";
+
+  config = lib.mkIf config.gaming.minecraft-server.enable {
 
     unfreePackages = [ "minecraft-server" ];
 
     services.minecraft-server = {
+      enable = true;
       eula = true;
       declarative = true;
       whitelist = { };

modules/nixos/graphical/fonts.nix

@@ -6,7 +6,7 @@ in {
 
   config = lib.mkIf (config.gui.enable && pkgs.stdenv.isLinux) {
 
-    fonts.packages = with pkgs; [
+    fonts.fonts = with pkgs; [
       victor-mono # Used for Vim and Terminal
       (nerdfonts.override { fonts = [ "Hack" ]; }) # For Polybar, Rofi
     ];

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 pulseaudio date power";
             cursor-click = "pointer";
             cursor-scroll = "ns-resize";
             enable-ipc = true;
@@ -106,14 +106,8 @@
             interval = 10;
             format = "<label>";
             exec = builtins.toString (pkgs.writeShellScript "mailcount.sh" ''
-              ${pkgs.notmuch}/bin/notmuch new --quiet 2>&1>/dev/null
+              ${pkgs.notmuch}/bin/notmuch new > /dev/null
-              UNREAD=$(
+              UNREAD=$(${pkgs.notmuch}/bin/notmuch count is:inbox and is:unread and folder:main/Inbox)
-                  ${pkgs.notmuch}/bin/notmuch count \
-                      is:inbox and \
-                      is:unread and \
-                      folder:main/Inbox \
-                      2>/dev/null
-              )
               if [ $UNREAD = "0" ]; then
                 echo ""
               else
@@ -124,16 +118,6 @@
               "i3-msg 'exec --no-startup-id kitty --class aerc aerc'; sleep 0.15; i3-msg '[class=aerc] focus'";
 
           };
-          "module/network" = {
-            type = "internal/network";
-            interface-type = "wired";
-            interval = 3;
-            accumulate-stats = true;
-            format-connected = "<label-connected>";
-            format-disconnected = "<label-disconnected>";
-            label-connected = "";
-            label-disconnected = "";
-          };
           "module/pulseaudio" = {
             type = "internal/pulseaudio";
             # format-volume-prefix = "VOL ";
@@ -143,10 +127,10 @@
             # label-volume-background = colors.background;
             format-volume-foreground = config.theme.colors.base0B;
             label-volume = "%percentage%%";
-            label-muted = "󰝟 ---";
+            label-muted = "ﱝ ---";
             label-muted-foreground = config.theme.colors.base03;
             ramp-volume-0 = "";
-            ramp-volume-1 = "󰕾";
+            ramp-volume-1 = "墳";
             ramp-volume-2 = "";
             click-right = config.audioSwitchCommand;
           };

modules/nixos/hardware/boot.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: {
 
-  boot.loader = lib.mkIf (config.physical && !config.server) {
+  boot.loader = lib.mkIf config.physical {
     grub = {
       enable = true;
 

modules/nixos/hardware/keyboard.nix

@@ -15,12 +15,7 @@
     # Use capslock as escape and/or control
     services.keyd = {
       enable = true;
-      keyboards = {
+      settings = { main = { capslock = "overload(control, esc)"; }; };
-        default = {
-          ids = [ "*" ];
-          settings = { main = { capslock = "overload(control, esc)"; }; };
-        };
-      };
     };
 
     # Enable num lock on login

modules/nixos/hardware/networking.nix

@@ -1,8 +1,13 @@
-{ config, pkgs, lib, ... }: {
+{ config, lib, ... }: {
 
   config = lib.mkIf config.physical {
 
-    networking.useDHCP = true;
+    # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+    # Per-interface useDHCP will be mandatory in the future, so this generated config
+    # replicates the default behaviour.
+    networking.useDHCP = false;
+    networking.interfaces.enp5s0.useDHCP = true;
+    networking.interfaces.wlp4s0.useDHCP = true;
 
     networking.firewall.allowPing = lib.mkIf config.server true;
 
@@ -10,9 +15,6 @@
     services.avahi = {
       enable = true;
       domainName = "local";
-      ipv6 = false; # Should work either way
-      # Resolve local hostnames using Avahi DNS
-      nssmdns = true;
       publish = {
         enable = true;
         addresses = true;
@@ -21,10 +23,8 @@
       };
     };
 
-    environment.systemPackages = [
+    # Resolve local hostnames using Avahi DNS
-      (pkgs.writeShellScriptBin "wake-tempest"
+    services.avahi.nssmdns = true;
-        "${pkgs.wakeonlan}/bin/wakeonlan --ip=192.168.1.255 74:56:3C:40:37:5D")
-    ];
 
   };
 

modules/nixos/hardware/server.nix

@@ -1,6 +1,6 @@
-{ config, lib, ... }: {
+{ config, pkgs, lib, ... }: {
 
-  config = lib.mkIf config.server {
+  config = lib.mkIf (pkgs.stdenv.isLinux && config.server) {
 
     # Servers need a bootloader or they won't start
     boot.loader.systemd-boot.enable = true;

modules/nixos/hardware/sleep.nix

@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: {
 
-  config = lib.mkIf (config.physical && !config.server) {
+  config = lib.mkIf config.physical {
 
     # Prevent wake from keyboard
     powerManagement.powerDownCommands = ''

modules/nixos/hardware/zfs.nix

@@ -1,21 +1,16 @@
-{ config, lib, ... }: {
+{ config, pkgs, lib, ... }: {
 
   options = { zfs.enable = lib.mkEnableOption "ZFS file system."; };
 
-  config = lib.mkIf (config.server && config.zfs.enable) {
+  config =
+    lib.mkIf (pkgs.stdenv.isLinux && config.server && config.zfs.enable) {
 
-    # Only use compatible Linux kernel, since ZFS can be behind
+      # Only use compatible Linux kernel, since ZFS can be behind
-    boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+      boot.kernelPackages =
-    boot.kernelParams = [ "nohibernate" ];
+        config.boot.zfs.package.latestCompatibleLinuxPackages;
-    boot.supportedFilesystems = [ "zfs" ];
+      boot.kernelParams = [ "nohibernate" ];
-    services.prometheus.exporters.zfs.enable =
+      boot.supportedFilesystems = [ "zfs" ];
-      config.prometheus.exporters.enable;
-    prometheus.scrapeTargets = [
-      "127.0.0.1:${
-        builtins.toString config.services.prometheus.exporters.zfs.port
-      }"
-    ];
 
-  };
+    };
 
 }

modules/nixos/services/arr.nix

@@ -1,35 +1,14 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }: {
 
-let
+  options = {
-
+    arrServer = lib.mkOption {
-  arrConfig = {
+      type = lib.types.nullOr lib.types.str;
-    radarr = {
+      description = "Hostname for arr services";
-      exportarrPort = "9707";
+      default = null;
-      url = "localhost:7878";
-      apiKey = config.secrets.radarrApiKey.dest;
-    };
-    sonarr = {
-      exportarrPort = "9708";
-      url = "localhost:8989";
-      apiKey = config.secrets.sonarrApiKey.dest;
-    };
-    prowlarr = {
-      exportarrPort = "9709";
-      url = "localhost:9696";
-      apiKey = config.secrets.prowlarrApiKey.dest;
-    };
-    sabnzbd = {
-      exportarrPort = "9710";
-      url = "localhost:8085";
-      apiKey = config.secrets.sabnzbdApiKey.dest;
     };
   };
 
-in {
+  config = lib.mkIf (config.arrServer != null) {
-
-  options = { arrs.enable = lib.mkEnableOption "Arr services"; };
-
-  config = lib.mkIf config.arrs.enable {
 
     services = {
       bazarr = {
@@ -65,29 +44,29 @@ in {
       {
         group = "download";
         match = [{
-          host = [ config.hostnames.download ];
+          host = [ config.arrServer ];
           path = [ "/sonarr*" ];
         }];
         handle = [{
           handler = "reverse_proxy";
-          upstreams = [{ dial = arrConfig.sonarr.url; }];
+          upstreams = [{ dial = "localhost:8989"; }];
         }];
       }
       {
         group = "download";
         match = [{
-          host = [ config.hostnames.download ];
+          host = [ config.arrServer ];
           path = [ "/radarr*" ];
         }];
         handle = [{
           handler = "reverse_proxy";
-          upstreams = [{ dial = arrConfig.radarr.url; }];
+          upstreams = [{ dial = "localhost:7878"; }];
         }];
       }
       {
         group = "download";
         match = [{
-          host = [ config.hostnames.download ];
+          host = [ config.arrServer ];
           path = [ "/prowlarr*" ];
         }];
         handle = [{
@@ -98,111 +77,35 @@ in {
       {
         group = "download";
         match = [{
-          host = [ config.hostnames.download ];
+          host = [ config.arrServer ];
           path = [ "/bazarr*" ];
         }];
         handle = [{
           handler = "reverse_proxy";
-          upstreams = [{
+          upstreams = [{ dial = "localhost:6767"; }];
-            dial = "localhost:${
-                builtins.toString config.services.bazarr.listenPort
-              }";
-          }];
         }];
       }
       {
         group = "download";
         match = [{
-          host = [ config.hostnames.download ];
+          host = [ config.arrServer ];
           path = [ "/sabnzbd*" ];
         }];
         handle = [{
           handler = "reverse_proxy";
-          upstreams = [{ dial = arrConfig.sabnzbd.url; }];
+          upstreams = [{ dial = "localhost:8085"; }];
         }];
       }
       {
         group = "download";
-        match = [{ host = [ config.hostnames.download ]; }];
+        match = [{ host = [ config.arrServer ]; }];
         handle = [{
           handler = "reverse_proxy";
-          upstreams = [{
+          upstreams = [{ dial = "localhost:5055"; }];
-            dial =
-              "localhost:${builtins.toString config.services.jellyseerr.port}";
-          }];
         }];
       }
     ];
 
-    # Enable Prometheus exporters
-    systemd.services = lib.mapAttrs' (name: attrs: {
-      name = "prometheus-${name}-exporter";
-      value = {
-        description = "Export Prometheus metrics for ${name}";
-        after = [ "network.target" ];
-        wantedBy = [ "${name}.service" ];
-        serviceConfig = {
-          Type = "simple";
-          DynamicUser = true;
-          ExecStart = let
-            url = if name != "sabnzbd" then
-              "http://${attrs.url}/${name}"
-            else
-              "http://${attrs.url}";
-          in ''
-            ${pkgs.exportarr}/bin/exportarr ${name} \
-                        --url ${url} \
-                        --port ${attrs.exportarrPort}'';
-          EnvironmentFile =
-            lib.mkIf (builtins.hasAttr "apiKey" attrs) attrs.apiKey;
-          Restart = "on-failure";
-          ProtectHome = true;
-          ProtectSystem = "strict";
-          PrivateTmp = true;
-          PrivateDevices = true;
-          ProtectHostname = true;
-          ProtectClock = true;
-          ProtectKernelTunables = true;
-          ProtectKernelModules = true;
-          ProtectKernelLogs = true;
-          ProtectControlGroups = true;
-          NoNewPrivileges = true;
-          RestrictRealtime = true;
-          RestrictSUIDSGID = true;
-          RemoveIPC = true;
-          PrivateMounts = true;
-        };
-      };
-    }) arrConfig;
-
-    # Secrets for Prometheus exporters
-    secrets.radarrApiKey = {
-      source = ../../../private/radarr-api-key.age;
-      dest = "/var/private/radarr-api";
-      prefix = "API_KEY=";
-    };
-    secrets.sonarrApiKey = {
-      source = ../../../private/sonarr-api-key.age;
-      dest = "/var/private/sonarr-api";
-      prefix = "API_KEY=";
-    };
-    secrets.prowlarrApiKey = {
-      source = ../../../private/prowlarr-api-key.age;
-      dest = "/var/private/prowlarr-api";
-      prefix = "API_KEY=";
-    };
-    secrets.sabnzbdApiKey = {
-      source = ../../../private/sabnzbd-api-key.age;
-      dest = "/var/private/sabnzbd-api";
-      prefix = "API_KEY=";
-    };
-
-    # Prometheus scrape targets
-    prometheus.scrapeTargets = map (key:
-      "127.0.0.1:${
-        lib.attrsets.getAttrFromPath [ key "exportarrPort" ] arrConfig
-      }") (builtins.attrNames arrConfig);
-
   };
 
 }

modules/nixos/services/bind.nix

@@ -1,55 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-
-  localIp = "192.168.1.218";
-  localServices = [
-    config.hostnames.stream
-    config.hostnames.content
-    config.hostnames.books
-    config.hostnames.download
-  ];
-  mkRecord = service: "${service}       A       ${localIp}";
-  localRecords = lib.concatLines (map mkRecord localServices);
-
-in {
-
-  config = lib.mkIf config.services.bind.enable {
-
-    caddy.cidrAllowlist = [ "192.168.0.0/16" ];
-
-    services.bind = {
-      cacheNetworks = [ "127.0.0.0/24" "192.168.0.0/16" ];
-      forwarders = [ "1.1.1.1" "1.0.0.1" ];
-      ipv4Only = true;
-
-      # Use rpz zone as an override
-      extraOptions = ''response-policy { zone "rpz"; };'';
-
-      zones = {
-        rpz = {
-          master = true;
-          file = pkgs.writeText "db.rpz" ''
-            $TTL 60  ; 1 minute
-            @       IN      SOA     localhost. root.localhost. (
-                                    2023071800      ; serial
-                                    1h              ; refresh
-                                    30m             ; retry
-                                    1w              ; expire
-                                    30m             ; minimum ttl
-                                    )
-                    IN      NS      localhost.
-            localhost       A       127.0.0.1
-            ${localRecords}
-          '';
-        };
-      };
-
-    };
-
-    networking.firewall.allowedTCPPorts = [ 53 ];
-    networking.firewall.allowedUDPPorts = [ 53 ];
-
-  };
-
-}

modules/nixos/services/caddy.nix

@@ -1,43 +1,28 @@
 { config, pkgs, lib, ... }: {
 
   options = {
-    caddy = {
+    caddy.enable = lib.mkEnableOption "Caddy reverse proxy.";
-      tlsPolicies = lib.mkOption {
+    caddy.tlsPolicies = lib.mkOption {
-        type = lib.types.listOf lib.types.attrs;
+      type = lib.types.listOf lib.types.attrs;
-        description = "Caddy JSON TLS policies";
+      description = "Caddy JSON TLS policies";
-        default = [ ];
+      default = [ ];
-      };
+    };
-      routes = lib.mkOption {
+    caddy.routes = lib.mkOption {
-        type = lib.types.listOf lib.types.attrs;
+      type = lib.types.listOf lib.types.attrs;
-        description = "Caddy JSON routes for http servers";
+      description = "Caddy JSON routes for http servers";
-        default = [ ];
+      default = [ ];
-      };
+    };
-      blocks = lib.mkOption {
+    caddy.blocks = lib.mkOption {
-        type = lib.types.listOf lib.types.attrs;
+      type = lib.types.listOf lib.types.attrs;
-        description = "Caddy JSON error blocks for http servers";
+      description = "Caddy JSON error blocks for http servers";
-        default = [ ];
+      default = [ ];
-      };
-      cidrAllowlist = lib.mkOption {
-        type = lib.types.listOf lib.types.str;
-        description = "CIDR blocks to allow for requests";
-        default = [ ];
-      };
     };
   };
 
-  config = lib.mkIf config.services.caddy.enable {
+  config = lib.mkIf (config.caddy.enable && config.caddy.routes != [ ]) {
-
-    # Force Caddy to 403 if not coming from allowlisted source
-    caddy.cidrAllowlist = [ "127.0.0.1/32" ];
-    caddy.routes = [{
-      match = [{ not = [{ remote_ip.ranges = config.caddy.cidrAllowlist; }]; }];
-      handle = [{
-        handler = "static_response";
-        status_code = "403";
-      }];
-    }];
 
     services.caddy = {
+      enable = true;
       adapter = "''"; # Required to enable JSON
       configFile = pkgs.writeText "Caddyfile" (builtins.toJSON {
         apps.http.servers.main = {
@@ -46,7 +31,6 @@
           errors.routes = config.caddy.blocks;
           # logs = { }; # Uncomment to collect access logs
         };
-        apps.http.servers.metrics = { }; # Enables Prometheus metrics
         apps.tls.automation.policies = config.caddy.tlsPolicies;
         logging.logs.main = {
           encoder = { format = "console"; };
@@ -64,8 +48,6 @@
     networking.firewall.allowedTCPPorts = [ 80 443 ];
     networking.firewall.allowedUDPPorts = [ 443 ];
 
-    prometheus.scrapeTargets = [ "127.0.0.1:2019" ];
-
   };
 
 }

modules/nixos/services/calibre.nix

@@ -7,6 +7,11 @@ let
 in {
 
   options = {
+    bookServer = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Hostname for Calibre library";
+      default = null;
+    };
     backups.calibre = lib.mkOption {
       type = lib.types.bool;
       description = "Whether to backup Calibre library";
@@ -14,9 +19,10 @@ in {
     };
   };
 
-  config = lib.mkIf config.services.calibre-web.enable {
+  config = lib.mkIf (config.bookServer != null) {
 
     services.calibre-web = {
+      enable = true;
       openFirewall = true;
       options = {
         reverseProxyAuth.enable = false;
@@ -27,7 +33,7 @@ in {
     };
 
     caddy.routes = [{
-      match = [{ host = [ config.hostnames.books ]; }];
+      match = [{ host = [ config.bookServer ]; }];
       handle = [{
         handler = "reverse_proxy";
         upstreams = [{ dial = "localhost:8083"; }];

modules/nixos/services/cloudflare-tunnel.nix

@@ -10,11 +10,6 @@
 # Set tunnel.id = "<id>"
 # Remove ~/.cloudflared/
 
-# For SSH access:
-# Cloudflare Zero Trust -> Access -> Applications -> Create Application
-# Service Auth -> SSH -> Select Application -> Generate Certificate
-# Set ca = "<public key>"
-
 {
 
   options.cloudflareTunnel = {

modules/nixos/services/cloudflare.nix

@@ -41,7 +41,13 @@ in {
   config = lib.mkIf config.cloudflare.enable {
 
     # Forces Caddy to error if coming from a non-Cloudflare IP
-    caddy.cidrAllowlist = cloudflareIpRanges;
+    caddy.blocks = [{
+      match = [{ not = [{ remote_ip.ranges = cloudflareIpRanges; }]; }];
+      handle = [{
+        handler = "static_response";
+        abort = true;
+      }];
+    }];
 
     # Tell Caddy to use Cloudflare DNS for ACME challenge validation
     services.caddy.package = (pkgs.callPackage ../../../overlays/caddy.nix {

modules/nixos/services/default.nix

@@ -3,15 +3,12 @@
   imports = [
     ./arr.nix
     ./backups.nix
-    ./bind.nix
     ./caddy.nix
     ./calibre.nix
     ./cloudflare-tunnel.nix
     ./cloudflare.nix
-    ./gitea-runner.nix
     ./gitea.nix
     ./gnupg.nix
-    ./grafana.nix
     ./honeypot.nix
     ./jellyfin.nix
     ./keybase.nix
@@ -25,7 +22,6 @@
     ./sshd.nix
     ./transmission.nix
     ./vaultwarden.nix
-    ./victoriametrics.nix
     ./wireguard.nix
   ];
 

modules/nixos/services/gitea-runner.nix

@@ -1,58 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  options.giteaRunner.enable =
-    lib.mkEnableOption "Enable Gitea Actions runner.";
-
-  config = lib.mkIf config.giteaRunner.enable {
-
-    services.gitea-actions-runner.instances.${config.networking.hostName} = {
-      enable = true;
-      labels = [
-        # Provide a Debian base with NodeJS for actions
-        # "debian-latest:docker://node:18-bullseye"
-        # Fake the Ubuntu name, because Node provides no Ubuntu builds
-        # "ubuntu-latest:docker://node:18-bullseye"
-        # Provide native execution on the host using below packages
-        "native:host"
-      ];
-      hostPackages = with pkgs; [
-        bash
-        coreutils
-        curl
-        gawk
-        gitMinimal
-        gnused
-        nodejs
-        wget
-      ];
-      name = config.networking.hostName;
-      url = "https://${config.hostnames.git}";
-      tokenFile = config.secrets.giteaRunnerToken.dest;
-    };
-
-    # Make sure the runner doesn't start until after Gitea
-    systemd.services."gitea-runner-${config.networking.hostName}".after =
-      [ "gitea.service" ];
-
-    # API key needed to connect to Gitea
-    secrets.giteaRunnerToken = {
-      source = ../../../private/gitea-runner-token.age; # TOKEN=xyz
-      dest = "${config.secretsDirectory}/gitea-runner-token";
-    };
-    systemd.services.giteaRunnerToken-secret = {
-      requiredBy = [
-        "gitea-runner-${
-          config.services.gitea-actions-runner.instances.${config.networking.hostName}.name
-        }.service"
-      ];
-      before = [
-        "gitea-runner-${
-          config.services.gitea-actions-runner.instances.${config.networking.hostName}.name
-        }.service"
-      ];
-    };
-
-  };
-
-}

modules/nixos/services/gitea.nix

@@ -1,19 +1,28 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 let giteaPath = "/var/lib/gitea"; # Default service directory
 
 in {
 
-  config = lib.mkIf config.services.gitea.enable {
+  options = {
+
+    giteaServer = lib.mkOption {
+      description = "Hostname for Gitea.";
+      type = lib.types.nullOr lib.types.str;
+      default = null;
+    };
+
+  };
+
+  config = lib.mkIf (config.giteaServer != null) {
     services.gitea = {
+      enable = true;
       database.type = "sqlite3";
       settings = {
-        actions.ENABLED = true;
-        metrics.ENABLED = true;
         repository = {
           DEFAULT_PUSH_CREATE_PRIVATE = true;
           DISABLE_HTTP_GIT = false;
-          ACCESS_CONTROL_ALLOW_ORIGIN = config.hostnames.git;
+          ACCESS_CONTROL_ALLOW_ORIGIN = config.giteaServer;
           ENABLE_PUSH_CREATE_USER = true;
           ENABLE_PUSH_CREATE_ORG = true;
           DEFAULT_BRANCH = "main";
@@ -21,7 +30,7 @@ in {
         server = {
           HTTP_PORT = 3001;
           HTTP_ADDRESS = "127.0.0.1";
-          ROOT_URL = "https://${config.hostnames.git}/";
+          ROOT_URL = "https://${config.giteaServer}/";
           SSH_PORT = 22;
           START_SSH_SERVER = false; # Use sshd instead
           DISABLE_SSH = false;
@@ -36,38 +45,14 @@ in {
     };
 
     networking.firewall.allowedTCPPorts = [ 122 ];
-    users.users.${config.user}.extraGroups = [ "gitea" ];
 
-    caddy.routes = [
+    caddy.routes = [{
-      {
+      match = [{ host = [ config.giteaServer ]; }];
-        match = [{
+      handle = [{
-          host = [ config.hostnames.git ];
+        handler = "reverse_proxy";
-          path = [ "/metrics*" ];
+        upstreams = [{ dial = "localhost:3001"; }];
-        }];
+      }];
-        handle = [{
+    }];
-          handler = "static_response";
-          status_code = "403";
-        }];
-      }
-      {
-        match = [{ host = [ config.hostnames.git ]; }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{
-            dial = "localhost:${
-                builtins.toString
-                config.services.gitea.settings.server.HTTP_PORT
-              }";
-          }];
-        }];
-      }
-    ];
-
-    prometheus.scrapeTargets = [
-      "127.0.0.1:${
-        builtins.toString config.services.gitea.settings.server.HTTP_PORT
-      }"
-    ];
 
     ## Backup config
 
@@ -100,34 +85,6 @@ in {
       requires = [ "gitea.service" ];
     };
 
-    # Run a repository file backup on a schedule
-    systemd.timers.gitea-backup = lib.mkIf (config.backup.s3.endpoint != null) {
-      timerConfig = {
-        OnCalendar = "*-*-* 00:00:00"; # Once per day
-        Unit = "gitea-backup.service";
-      };
-      wantedBy = [ "timers.target" ];
-    };
-
-    # Backup Gitea repos to object storage
-    systemd.services.gitea-backup =
-      lib.mkIf (config.backup.s3.endpoint != null) {
-        description = "Backup Gitea data";
-        environment.AWS_ACCESS_KEY_ID = config.backup.s3.accessKeyId;
-        serviceConfig = {
-          Type = "oneshot";
-          User = "gitea";
-          Group = "backup";
-          EnvironmentFile = config.secrets.backup.dest;
-        };
-        script = ''
-          ${pkgs.awscli2}/bin/aws s3 sync --exclude */gitea.db* \
-              ${giteaPath}/ \
-              s3://${config.backup.s3.bucket}/gitea-data/ \
-              --endpoint-url=https://${config.backup.s3.endpoint}
-        '';
-      };
-
   };
 
 }

modules/nixos/services/grafana.nix

@@ -1,27 +0,0 @@
-{ config, lib, ... }: {
-
-  config = lib.mkIf config.services.grafana.enable {
-
-    services.grafana.settings.server = {
-      domain = config.hostnames.metrics;
-      http_addr = "127.0.0.1";
-      http_port = 3000;
-      protocol = "http";
-    };
-
-    caddy.routes = [{
-      match = [{ host = [ config.hostnames.metrics ]; }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{
-          dial = "localhost:${
-              builtins.toString
-              config.services.grafana.settings.server.http_port
-            }";
-        }];
-      }];
-    }];
-
-  };
-
-}

modules/nixos/services/jellyfin.nix

@@ -1,29 +1,26 @@
 { config, pkgs, lib, ... }: {
 
-  config = lib.mkIf config.services.jellyfin.enable {
+  options = {
+    streamServer = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Hostname for Jellyfin library";
+      default = null;
+    };
+  };
 
+  config = lib.mkIf (config.streamServer != null) {
+
+    services.jellyfin.enable = true;
     services.jellyfin.group = "media";
     users.users.jellyfin = { isSystemUser = true; };
 
-    caddy.routes = [
+    caddy.routes = [{
-      {
+      match = [{ host = [ config.streamServer ]; }];
-        match = [{
+      handle = [{
-          host = [ config.hostnames.stream ];
+        handler = "reverse_proxy";
-          path = [ "/metrics*" ];
+        upstreams = [{ dial = "localhost:8096"; }];
-        }];
+      }];
-        handle = [{
+    }];
-          handler = "static_response";
-          status_code = "403";
-        }];
-      }
-      {
-        match = [{ host = [ config.hostnames.stream ]; }];
-        handle = [{
-          handler = "reverse_proxy";
-          upstreams = [{ dial = "localhost:8096"; }];
-        }];
-      }
-    ];
 
     # Create videos directory, allow anyone in Jellyfin group to manage it
     systemd.tmpfiles.rules = [
@@ -47,9 +44,6 @@
     users.users.jellyfin.extraGroups =
       [ "render" "video" ]; # Access to /dev/dri
 
-    # Requires MetricsEnable is true in /var/lib/jellyfin/config/system.xml
-    prometheus.scrapeTargets = [ "127.0.0.1:8096" ];
-
   };
 
 }

modules/nixos/services/nextcloud.nix

@@ -1,134 +1,43 @@
 { config, pkgs, lib, ... }: {
 
-  config = lib.mkIf config.services.nextcloud.enable {
+  options = {
+
+    nextcloudServer = lib.mkOption {
+      type = lib.types.nullOr lib.types.str;
+      description = "Hostname for Nextcloud";
+      default = null;
+    };
+
+  };
+
+  config = lib.mkIf (config.nextcloudServer != null) {
 
     services.nextcloud = {
-      package = pkgs.nextcloud27; # Required to specify
+      enable = true;
+      package = pkgs.nextcloud26; # Required to specify
       datadir = "/data/nextcloud";
       https = true;
       hostName = "localhost";
       maxUploadSize = "50G";
       config = {
         adminpassFile = config.secrets.nextcloud.dest;
-        extraTrustedDomains = [ config.hostnames.content ];
+        extraTrustedDomains = [ config.nextcloudServer ];
-        trustedProxies = [ "127.0.0.1" ];
       };
     };
 
     # Don't let Nginx use main ports (using Caddy instead)
-    services.nginx.enable = false;
+    services.nginx.virtualHosts."localhost".listen = [{
-
+      addr = "127.0.0.1";
-    services.phpfpm.pools.nextcloud.settings = {
+      port = 8080;
-      "listen.owner" = config.services.caddy.user;
+    }];
-      "listen.group" = config.services.caddy.group;
-    };
-    users.users.caddy.extraGroups = [ "nextcloud" ];
 
     # Point Caddy to Nginx
     caddy.routes = [{
-      match = [{ host = [ config.hostnames.content ]; }];
+      match = [{ host = [ config.nextcloudServer ]; }];
       handle = [{
-        handler = "subroute";
+        handler = "reverse_proxy";
-        routes = [
+        upstreams = [{ dial = "localhost:8080"; }];
-          # Sets variables and headers
-          {
-            handle = [
-              {
-                handler = "vars";
-                root = config.services.nextcloud.package;
-              }
-              {
-                handler = "headers";
-                response.set.Strict-Transport-Security =
-                  [ "max-age=31536000;" ];
-              }
-            ];
-          }
-          {
-            match = [{ path = [ "/nix-apps*" "/store-apps*" ]; }];
-            handle = [{
-              handler = "vars";
-              root = config.services.nextcloud.home;
-            }];
-          }
-          # Reroute carddav and caldav traffic
-          {
-            match =
-              [{ path = [ "/.well-known/carddav" "/.well-known/caldav" ]; }];
-            handle = [{
-              handler = "static_response";
-              headers = { Location = [ "/remote.php/dav" ]; };
-              status_code = 301;
-            }];
-          }
-          # Block traffic to sensitive files
-          {
-            match = [{
-              path = [
-                "/.htaccess"
-                "/data/*"
-                "/config/*"
-                "/db_structure"
-                "/.xml"
-                "/README"
-                "/3rdparty/*"
-                "/lib/*"
-                "/templates/*"
-                "/occ"
-                "/console.php"
-              ];
-            }];
-            handle = [{
-              handler = "static_response";
-              status_code = 404;
-            }];
-          }
-          # Redirect index.php to the homepage
-          {
-            match = [{
-              file = { try_files = [ "{http.request.uri.path}/index.php" ]; };
-              not = [{ path = [ "*/" ]; }];
-            }];
-            handle = [{
-              handler = "static_response";
-              headers = { Location = [ "{http.request.orig_uri.path}/" ]; };
-              status_code = 308;
-            }];
-          }
-          # Rewrite paths to be relative
-          {
-            match = [{
-              file = {
-                split_path = [ ".php" ];
-                try_files = [
-                  "{http.request.uri.path}"
-                  "{http.request.uri.path}/index.php"
-                  "index.php"
-                ];
-              };
-            }];
-            handle = [{
-              handler = "rewrite";
-              uri = "{http.matchers.file.relative}";
-            }];
-          }
-          # Send all PHP traffic to Nextcloud PHP service
-          {
-            match = [{ path = [ "*.php" ]; }];
-            handle = [{
-              handler = "reverse_proxy";
-              transport = {
-                protocol = "fastcgi";
-                split_path = [ ".php" ];
-              };
-              upstreams = [{ dial = "unix//run/phpfpm/nextcloud.sock"; }];
-            }];
-          }
-          # Finally, send the rest to the file server
-          { handle = [{ handler = "file_server"; }]; }
-        ];
       }];
-      terminal = true;
     }];
 
     # Create credentials file for nextcloud
@@ -176,24 +85,6 @@
       requires = [ "phpfpm-nextcloud.service" ];
     };
 
-    # Log metrics to prometheus
-    networking.hosts."127.0.0.1" = [ config.hostnames.content ];
-    services.prometheus.exporters.nextcloud = {
-      enable = config.prometheus.exporters.enable;
-      username = config.services.nextcloud.config.adminuser;
-      url = "https://${config.hostnames.content}";
-      passwordFile = config.services.nextcloud.config.adminpassFile;
-    };
-    prometheus.scrapeTargets = [
-      "127.0.0.1:${
-        builtins.toString config.services.prometheus.exporters.nextcloud.port
-      }"
-    ];
-    # Allows nextcloud-exporter to read passwordFile
-    users.users.nextcloud-exporter.extraGroups =
-      lib.mkIf config.services.prometheus.exporters.nextcloud.enable
-      [ "nextcloud" ];
-
   };
 
 }

modules/nixos/services/prometheus.nix

@@ -1,103 +1,32 @@
-{ config, pkgs, lib, ... }: {
+{ config, lib, ... }: {
 
-  options.prometheus = {
+  options.metricsServer = lib.mkOption {
-    exporters.enable = lib.mkEnableOption "Enable Prometheus exporters";
+    type = lib.types.nullOr lib.types.str;
-    scrapeTargets = lib.mkOption {
+    description = "Hostname of the Grafana server.";
-      type = lib.types.listOf lib.types.str;
+    default = null;
-      description = "Prometheus scrape targets";
-      default = [ ];
-    };
   };
 
-  config = let
+  config = lib.mkIf (config.metricsServer != null) {
 
-    # If hosting Grafana, host local Prometheus and listen for inbound jobs. If
+    services.grafana.enable = true;
-    # not hosting Grafana, send remote Prometheus writes to primary host.
-    isServer = config.services.grafana.enable;
 
-  in {
+    # Required to fix error in latest nixpkgs
-
+    services.grafana.settings = { };
-    # Turn on exporters if any Prometheus scraper is running
-    prometheus.exporters.enable = builtins.any (x: x) [
-      config.services.prometheus.enable
-      config.services.victoriametrics.enable
-      config.services.vmagent.enable
-    ];
-
-    prometheus.scrapeTargets = [
-      "127.0.0.1:${
-        builtins.toString config.services.prometheus.exporters.node.port
-      }"
-      "127.0.0.1:${
-        builtins.toString config.services.prometheus.exporters.systemd.port
-      }"
-      "127.0.0.1:${
-        builtins.toString config.services.prometheus.exporters.process.port
-      }"
-    ];
 
     services.prometheus = {
-      exporters.node.enable = config.prometheus.exporters.enable;
+      enable = true;
-      exporters.node.enabledCollectors = [ ];
+      exporters.node.enable = true;
-      exporters.node.disabledCollectors = [ "cpufreq" ];
-      exporters.systemd.enable = config.prometheus.exporters.enable;
-      exporters.process.enable = config.prometheus.exporters.enable;
-      exporters.process.settings.process_names = [
-        # Remove nix store path from process name
-        {
-          name = "{{.Matches.Wrapped}} {{ .Matches.Args }}";
-          cmdline = [ "^/nix/store[^ ]*/(?P<Wrapped>[^ /]*) (?P<Args>.*)" ];
-        }
-      ];
-      extraFlags = lib.mkIf isServer [ "--web.enable-remote-write-receiver" ];
       scrapeConfigs = [{
-        job_name = config.networking.hostName;
+        job_name = "local";
-        static_configs = [{ targets = config.scrapeTargets; }];
+        static_configs = [{ targets = [ "127.0.0.1:9100" ]; }];
-      }];
-      webExternalUrl =
-        lib.mkIf isServer "https://${config.hostnames.prometheus}";
-      # Web config file: https://prometheus.io/docs/prometheus/latest/configuration/https/
-      webConfigFile = lib.mkIf isServer
-        ((pkgs.formats.yaml { }).generate "webconfig.yml" {
-          basic_auth_users = {
-            # Generate password: htpasswd -nBC 10 "" | tr -d ':\n'
-            # Encrypt and place in private/prometheus.age
-            "prometheus" =
-              "$2y$10$r7FWHLHTGPAY312PdhkPEuvb05aGn9Nk1IO7qtUUUjmaDl35l6sLa";
-          };
-        });
-      remoteWrite = lib.mkIf (!isServer) [{
-        name = config.networking.hostName;
-        url = "https://${config.hostnames.prometheus}/api/v1/write";
-        basic_auth = {
-          # Uses password hashed with bcrypt above
-          username = "prometheus";
-          password_file = config.secrets.prometheus.dest;
-        };
       }];
     };
 
-    # Create credentials file for remote Prometheus push
+    caddy.routes = [{
-    secrets.prometheus =
+      match = [{ host = [ config.metricsServer ]; }];
-      lib.mkIf (config.services.prometheus.enable && !isServer) {
-        source = ../../../private/prometheus.age;
-        dest = "${config.secretsDirectory}/prometheus";
-        owner = "prometheus";
-        group = "prometheus";
-        permissions = "0440";
-      };
-    systemd.services.prometheus-secret =
-      lib.mkIf (config.services.prometheus.enable && !isServer) {
-        requiredBy = [ "prometheus.service" ];
-        before = [ "prometheus.service" ];
-      };
-
-    caddy.routes = lib.mkIf (config.services.prometheus.enable && isServer) [{
-      match = [{ host = [ config.hostnames.prometheus ]; }];
       handle = [{
         handler = "reverse_proxy";
-        upstreams =
+        upstreams = [{ dial = "localhost:3000"; }];
-          [{ dial = "localhost:${config.services.prometheus.port}"; }];
       }];
     }];
 

modules/nixos/services/samba.nix

@@ -1,8 +1,11 @@
 { config, lib, ... }: {
 
+  options = { samba.enable = lib.mkEnableOption "Enable Samba sharing."; };
+
   config = {
 
-    services.samba = lib.mkIf config.services.samba.enable {
+    services.samba = lib.mkIf (config.samba.enable) {
+      enable = true;
       openFirewall = true;
       shares.data = {
         path = "/data";

modules/nixos/services/secrets.nix

@@ -39,11 +39,6 @@
             type = lib.types.str;
             description = "Permissions expressed as octal.";
           };
-          prefix = lib.mkOption {
-            default = "";
-            type = lib.types.str;
-            description = "Prefix for secret value (for environment files).";
-          };
         };
       });
       description = "Set of secrets to decrypt to disk.";
@@ -70,10 +65,10 @@
         wantedBy = [ "multi-user.target" ];
         serviceConfig.Type = "oneshot";
         script = ''
-          echo "${attrs.prefix}$(
+          ${pkgs.age}/bin/age --decrypt \
-            ${pkgs.age}/bin/age --decrypt \
+            --identity ${config.identityFile} \
-                --identity ${config.identityFile} ${attrs.source}
+            --output ${attrs.dest} \
-          )" > ${attrs.dest}
+            ${attrs.source}
 
           chown '${attrs.owner}':'${attrs.group}' '${attrs.dest}'
           chmod '${attrs.permissions}' '${attrs.dest}'

modules/nixos/services/sshd.nix

@@ -13,8 +13,9 @@
     };
   };
 
-  config = lib.mkIf config.services.openssh.enable {
+  config = lib.mkIf (config.publicKey != null) {
     services.openssh = {
+      enable = true;
       ports = [ 22 ];
       allowSFTP = true;
       settings = {
@@ -26,7 +27,7 @@
     };
 
     users.users.${config.user}.openssh.authorizedKeys.keys =
-      lib.mkIf (config.publicKey != null) [ config.publicKey ];
+      [ config.publicKey ];
 
     # Implement a simple fail2ban service for sshd
     services.sshguard.enable = true;

modules/nixos/services/transmission.nix

@@ -42,7 +42,7 @@
 
     # Create reverse proxy for web UI
     caddy.routes = lib.mkAfter [{
-      group = if (config.hostnames.download == config.transmissionServer) then
+      group = if (config.arrServer == config.transmissionServer) then
         "download"
       else
         "transmission";

modules/nixos/services/vaultwarden.nix

@@ -4,10 +4,21 @@ let vaultwardenPath = "/var/lib/bitwarden_rs"; # Default service directory
 
 in {
 
-  config = lib.mkIf config.services.vaultwarden.enable {
+  options = {
+
+    vaultwardenServer = lib.mkOption {
+      description = "Hostname for Vaultwarden.";
+      type = lib.types.nullOr lib.types.str;
+      default = null;
+    };
+
+  };
+
+  config = lib.mkIf (config.vaultwardenServer != null) {
     services.vaultwarden = {
+      enable = true;
       config = {
-        DOMAIN = "https://${config.hostnames.secrets}";
+        DOMAIN = "https://${config.vaultwardenServer}";
         SIGNUPS_ALLOWED = false;
         SIGNUPS_VERIFY = true;
         INVITATIONS_ALLOWED = true;
@@ -36,7 +47,7 @@ in {
     networking.firewall.allowedTCPPorts = [ 3012 ];
 
     caddy.routes = [{
-      match = [{ host = [ config.hostnames.secrets ]; }];
+      match = [{ host = [ config.vaultwardenServer ]; }];
       handle = [{
         handler = "reverse_proxy";
         upstreams = [{ dial = "localhost:8222"; }];

modules/nixos/services/victoriametrics.nix

@@ -1,95 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-let
-
-  username = "prometheus";
-
-  prometheusConfig = (pkgs.formats.yaml { }).generate "prometheus.yml" {
-    scrape_configs = [{
-      job_name = config.networking.hostName;
-      stream_parse = true;
-      static_configs = [{ targets = config.prometheus.scrapeTargets; }];
-    }];
-  };
-
-  authConfig = (pkgs.formats.yaml { }).generate "auth.yml" {
-    users = [{
-      username = username;
-      password = "%{PASSWORD}";
-      url_prefix =
-        "http://localhost${config.services.victoriametrics.listenAddress}";
-    }];
-  };
-
-  authPort = "8427";
-
-in {
-
-  config = {
-
-    services.victoriametrics.extraOptions =
-      [ "-promscrape.config=${prometheusConfig}" ];
-
-    systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
-      description = "VictoriaMetrics basic auth proxy";
-      after = [ "network.target" ];
-      startLimitBurst = 5;
-      serviceConfig = {
-        Restart = "on-failure";
-        RestartSec = 1;
-        DynamicUser = true;
-        EnvironmentFile = config.secrets.vmauth.dest;
-        ExecStart = ''
-          ${pkgs.victoriametrics}/bin/vmauth \
-                    -auth.config=${authConfig} \
-                    -httpListenAddr=:${authPort}'';
-      };
-      wantedBy = [ "multi-user.target" ];
-    };
-
-    secrets.vmauth = lib.mkIf config.services.victoriametrics.enable {
-      source = ../../../private/prometheus.age;
-      dest = "${config.secretsDirectory}/vmauth";
-      prefix = "PASSWORD=";
-    };
-    systemd.services.vmauth-secret =
-      lib.mkIf config.services.victoriametrics.enable {
-        requiredBy = [ "vmauth.service" ];
-        before = [ "vmauth.service" ];
-      };
-
-    caddy.routes = lib.mkIf config.services.victoriametrics.enable [{
-      match = [{ host = [ config.hostnames.prometheus ]; }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{ dial = "localhost:${authPort}"; }];
-      }];
-    }];
-
-    # VMAgent
-
-    services.vmagent.prometheusConfig = prometheusConfig; # Overwritten below
-    systemd.services.vmagent.serviceConfig =
-      lib.mkIf config.services.vmagent.enable {
-        ExecStart = lib.mkForce ''
-          ${pkgs.victoriametrics}/bin/vmagent \
-                  -promscrape.config=${prometheusConfig} \
-                  -remoteWrite.url="https://${config.hostnames.prometheus}/api/v1/write" \
-                  -remoteWrite.basicAuth.username=${username} \
-                  -remoteWrite.basicAuth.passwordFile=${config.secrets.vmagent.dest}'';
-      };
-
-    secrets.vmagent = lib.mkIf config.services.vmagent.enable {
-      source = ../../../private/prometheus.age;
-      dest = "${config.secretsDirectory}/vmagent";
-      owner = "vmagent";
-      group = "vmagent";
-    };
-    systemd.services.vmagent-secret = lib.mkIf config.services.vmagent.enable {
-      requiredBy = [ "vmagent.service" ];
-      before = [ "vmagent.service" ];
-    };
-
-  };
-
-}

modules/nixos/system/auto-upgrade.nix

@@ -1,47 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  # This setting only applies to NixOS, different on Darwin
-  nix.gc.dates = "03:03"; # Run every morning (but before upgrade)
-
-  # Update the system daily by pointing it at the flake repository
-  system.autoUpgrade = {
-    enable = config.server; # Only auto upgrade servers
-    dates = "03:33";
-    flake = "git+${config.dotfilesRepo}";
-    randomizedDelaySec = "25min";
-    operation = "switch";
-    allowReboot = true;
-    rebootWindow = {
-      lower = "00:01";
-      upper = "06:00";
-    };
-  };
-
-  # Create an email notification service for failed jobs
-  systemd.services."notify-email@" =
-    let address = "system@${config.mail.server}";
-    in {
-      enable = config.mail.enable;
-      environment.SERVICE_ID = "%i";
-      script = ''
-        TEMPFILE=$(mktemp)
-        echo "From: ${address}" > $TEMPFILE
-        echo "To: ${address}" >> $TEMPFILE
-        echo "Subject: Failure in $SERVICE_ID" >> $TEMPFILE
-        echo -e "\nGot an error with $SERVICE_ID\n\n" >> $TEMPFILE
-        set +e
-        systemctl status $SERVICE_ID >> $TEMPFILE
-        set -e
-        ${pkgs.msmtp}/bin/msmtp \
-            --file=${config.homePath}/.config/msmtp/config \
-            --account=system \
-            ${address} < $TEMPFILE
-      '';
-    };
-
-  # Send an email whenever auto upgrade fails
-  systemd.services.nixos-upgrade.onFailure =
-    lib.mkIf config.systemd.services."notify-email@".enable
-    [ "notify-email@%i.service" ];
-
-}

modules/nixos/system/default.nix

@@ -1,7 +1,6 @@
 { config, pkgs, lib, ... }: {
 
-  imports =
+  imports = [ ./doas.nix ./journald.nix ./user.nix ./timezone.nix ];
-    [ ./auto-upgrade.nix ./doas.nix ./journald.nix ./user.nix ./timezone.nix ];
 
   config = lib.mkIf pkgs.stdenv.isLinux {
 
@@ -9,6 +8,13 @@
     system.stateVersion =
       config.home-manager.users.${config.user}.home.stateVersion;
 
+    # This setting only applies to NixOS, different on Darwin
+    nix.gc.dates = "weekly";
+
+    systemd.timers.nix-gc.timerConfig = { WakeSystem = true; };
+    systemd.services.nix-gc.postStop =
+      lib.mkIf (!config.server) "systemctl suspend";
+
   };
 
 }

modules/nixos/system/doas.nix

@@ -13,11 +13,11 @@
       doas = {
         enable = true;
 
-        # No password required for trusted users
+        # No password required
         wheelNeedsPassword = false;
 
         # Pass environment variables from user to root
-        # Also requires specifying that we are removing password here
+        # Also requires removing password here
         extraRules = [{
           groups = [ "wheel" ];
           noPass = true;
@@ -26,7 +26,6 @@
       };
     };
 
-    # Alias sudo to doas for convenience
     home-manager.users.${config.user}.programs.fish.shellAliases = {
       sudo = "doas";
     };

modules/nixos/system/journald.nix

@@ -1,7 +1,6 @@
 { ... }: {
 
   # How long to keep journalctl entries
-  # This helps to make sure log disk usage doesn't grow too unwieldy
   services.journald.extraConfig = ''
     SystemMaxUse=100M
     MaxFileSec=1month

modules/nixos/system/user.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }: {
+{ config, pkgs, lib, ... }: {
 
   options = {
 
@@ -11,7 +11,7 @@
 
   };
 
-  config = {
+  config = lib.mkIf (pkgs.stdenv.isLinux) {
 
     # Allows us to declaritively set password
     users.mutableUsers = false;

overlays/betterlockscreen.nix

@@ -1,4 +0,0 @@
-# Disable dunst so that it's not attempting to reach a non-existent dunst service
-_final: prev: {
-  betterlockscreen = prev.betterlockscreen.override { withDunst = false; };
-}

overlays/caddy.nix

@@ -1,5 +1,3 @@
-# Adds the Cloudflare DNS validation module
-
 { lib, buildGo118Module, fetchFromGitHub, plugins ? [ ] }:
 let
   goImports = lib.flip lib.concatMapStrings plugins (pkg: "   _ \"${pkg}\"\n");

overlays/neovim-plugins.nix

@@ -7,17 +7,16 @@ let
   # Use nixpkgs vimPlugin but with source directly from plugin author
   withSrc = pkg: src: pkg.overrideAttrs (_: { inherit src; });
 
-  # Package plugin - for plugins not found in nixpkgs at all
+  # Package plugin - disabling until in use
-  plugin = pname: src:
+  # plugin = pname: src:
-    prev.vimUtils.buildVimPluginFrom2Nix {
+  #   prev.vimUtils.buildVimPluginFrom2Nix {
-      inherit pname src;
+  #     inherit pname src;
-      version = "master";
+  #     version = "master";
-    };
+  #   };
 
 in {
 
   nil = inputs.nil.packages.${prev.system}.nil;
-  vscode-terraform-snippets = inputs.vscode-terraform-snippets;
 
   nvim-lspconfig =
     (withSrc prev.vimPlugins.nvim-lspconfig inputs.nvim-lspconfig);
@@ -36,7 +35,8 @@ in {
     (withSrc prev.vimPlugins.bufferline-nvim inputs.bufferline-nvim);
   nvim-tree-lua = (withSrc prev.vimPlugins.nvim-tree-lua inputs.nvim-tree-lua);
 
-  # Packaging plugins entirely with Nix
+  # Packaging plugins with Nix
-  baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
+  # comment-nvim = plugin "comment-nvim" comment-nvim-src;
+  # plenary-nvim = plugin "plenary-nvim" plenary-nvim-src;
 
 }

overlays/tree-sitter.nix

@@ -1,61 +0,0 @@
-inputs: _final: prev: {
-  tree-sitter-grammars = prev.tree-sitter-grammars // {
-
-    # Fix: bash highlighting doesn't work as of this commit:
-    # https://github.com/NixOS/nixpkgs/commit/49cce41b7c5f6b88570a482355d9655ca19c1029
-    tree-sitter-bash = prev.tree-sitter-grammars.tree-sitter-bash.overrideAttrs
-      (old: {
-        src = prev.fetchFromGitHub {
-          owner = "tree-sitter";
-          repo = "tree-sitter-bash";
-          rev = "493646764e7ad61ce63ce3b8c59ebeb37f71b841";
-          sha256 = "sha256-gl5F3IeZa2VqyH/qFj8ey2pRbGq4X8DL5wiyvRrH56U=";
-        };
-      });
-
-    # Fix: invalid node in position. Broken as of this commit (replaced with newer):
-    # https://github.com/NixOS/nixpkgs/commit/8ec3627796ecc899e6f47f5bf3c3220856ead9c5
-    tree-sitter-python =
-      prev.tree-sitter-grammars.tree-sitter-python.overrideAttrs (old: {
-        src = prev.fetchFromGitHub {
-          owner = "tree-sitter";
-          repo = "tree-sitter-python";
-          rev = "5af00f64af6bbf822f208243cce5cf75396fb6f5";
-          sha256 = "sha256-2btd/NRE6NuGNlx4cq535OrwtWXihiP3VMCJjPCiDOk=";
-        };
-      });
-
-    # Add grammars not in nixpks
-    tree-sitter-ini = prev.tree-sitter.buildGrammar {
-      language = "ini";
-      version = "1.0.0";
-      src = prev.fetchFromGitHub {
-        owner = "justinmk";
-        repo = "tree-sitter-ini";
-        rev = "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44";
-        sha256 = "sha256-pPtKokpTgjoNzPW4dRkOnyzBBJFeJj3+CW3LbHSKsmU=";
-      };
-    };
-    tree-sitter-puppet = prev.tree-sitter.buildGrammar {
-      language = "puppet";
-      version = "1.0.0";
-      src = prev.fetchFromGitHub {
-        owner = "amaanq";
-        repo = "tree-sitter-puppet";
-        rev = "v1.0.0";
-        sha256 = "sha256-vk5VJZ9zW2bBuc+DM+fwFyhM1htZGeLlmkjMAH66jBA=";
-      };
-    };
-    tree-sitter-rasi = prev.tree-sitter.buildGrammar {
-      language = "rasi";
-      version = "0.1.1";
-      src = prev.fetchFromGitHub {
-        owner = "Fymyte";
-        repo = "tree-sitter-rasi";
-        rev = "371dac6bcce0df5566c1cfebde69d90ecbeefd2d";
-        sha256 = "sha256-2nYZoLcrxxxiOJEySwHUm93lzMg8mU+V7LIP63ntFdA=";
-      };
-    };
-  };
-
-}

private/cloudflared-flame.age

@@ -1,15 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBQVzVy
-ZmRldHhVenI3RVdOQXkyQ3pQUWM3N2l0bFBqT3ozakp3Nk5nS1dVCmoxb1lzVWd1
-YWZ0UWd4TExELzJ1cElsQ0o2L1g4TVBpZW16TmxvT05GaFEKLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIDR2TjdhbG1MelVVTXF3WUhFRWZKRGVoYUNwdy9hc05uajg2enlY
-S0x5eWcKSlM2YjFCRi9yN3ozVkhScXM5S0dNRnhpeisvNlE1Q09CNVFvN0YwL2JR
-NAotPiBzc2gtZWQyNTUxOSBuanZYNUEgMEJtR2JpVk5PZnRpOUVuZHZJTDI3Z0Fa
-UUdwWXFLT1gxZ0c3WFBlU2dDawpreE0yYUxoUktveGF5NXE4VHRva1hNdjdpYmZn
-R08wQ0l6cXpvYmhRMXRvCi0tLSB0UmFTdVBlR3NTSkVzdGtzOTdmSFVERC85dU1z
-cHdMVFdYSTFWUGRDTm1nCrengYn1phCUDmVH29uRjKMLNDIucrpi1s4t8ciQ3ILG
-sz605ztO3UUlm4SQTJnXmktRDBlLu/xICzEo5okkNl9HwK7s2Ok2DAoz8K/KeFbS
-65K3a3RcZEdWryZyu/N12HAqu5FDw0wIbvLJP4X+EcpUJXYHr8FluLUSEQg+sORW
-FnL5tr1vK32ZQY4GIHZXh4hQbNoZo1v2ezkcK21siDkeA3e3PT6Bi0I90nuXS9Pc
-0rZFZeYlNtI1Y4aeg6NEWytt
------END AGE ENCRYPTED FILE-----

private/cloudflared-tempest.age

@@ -1,15 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyB1VnBt
-RTV5eWc3RDNUR2lOWFRaMlgzREQyMlcvUFNxV0N2Vm9lVVZKOUZ3ClJjaWtYZjR5
-ZTB4L2M4MFB0UThaMzlRT3JkUEE1N3RrSUlpZnRFbmFDdWcKLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIE5iTUs1ak9VZjRIRGpLMWtDcVB0RjVFRW8vOENQZlkzeGhsYmFB
-QzJ6Z00KZmcvZ0hYMjN1bGZwY3NvMjlCbnpHUWVjdVU4cnBGcDQxTU8wZ0EyQXdU
-MAotPiBzc2gtZWQyNTUxOSBuanZYNUEgazRzK2ZnSUZNWURoKzZMZmM4VTlDbVBh
-WGc4MlE5TGFiN1MzV01FT1oyQQppRUhUNjdlQURNQm8rR0JOOUJFNm9vaXhPTXFW
-U2lJU09jWVA0TDRrVHY4Ci0tLSBudWJTclRTek1RWHYzYzA4aTduODB0NUNWbVVP
-cUIyVzJncWhDS053d25nCneJhp1QT1v+dAguW9wAKDgWST59KNBgbY01jkf1IqXc
-FbmkctPIMggim3uCBqjzBboYvf+dtt0Fcu9aiB+4YmGUeQNb+9mdPweXoHmVrego
-XygVsbuSP4xKWtIJhBJ/3/jEK9LqBtv+owdUIxbw5Ci6A0JvSu+tnUj5oAgMyT2z
-YrGRK9plQZteeUkMcd6+anSEUpP45lzfz/T7loD9ViCbPHRuUFgwkwUcRGjQStm3
-pnx9bi8N4ac599f4KqInm5gd
------END AGE ENCRYPTED FILE-----

private/gitea-runner-token.age

@@ -1,12 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBoOVF1
-NmZocHpQQnRJcWpWUHh2bU93NkdnZWNzSlFiaHdTd24rcHpsczFRCmJaSzNkNGs1
-UDJCN2dYUVE3UTE1OU5RUWljQlN4dmxuUnpOMFYxQTdUaVEKLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIE5HdGd6aTlKM0lFUlYzT1VhS05nZ2ZxTndVZHBNQlJxYlovdXkx
-ei96d2cKdzlUYVFFaEIzaS9LZmY3MzM1RmNnR0xjOEpHK1kxM0FMTWRQSlVnczVF
-dwotPiBzc2gtZWQyNTUxOSBuanZYNUEgQ1lhMGQvUy9OWkRBR3BZV1pFNmNtb2pq
-Y2VEUzhRWGVWUkZJY1l4RGtWdwphdFZtM0ZLZURvYVZQYjV4bWVPdWJxa3RmWmVh
-SHl0T0pQWmxnVlFPR2drCi0tLSBnd2lwS3dqUk5Jelg0b3RxbFdEcnJ6ZkkvZTVN
-UllBeUUyOXBxVDBKMG5BCkGo9kj9sMVhbnXVM35lGScAb8r5LH9vf5jOdhLC/Wj2
-+uA0ONIh7F2GELzf5Cw1KZJ8aHTURM2r41vZvfAQN1RwrmYOiUzlyMrvTDe78cY=
------END AGE ENCRYPTED FILE-----

private/mailpass-system.age

@@ -1,12 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyA3Ynp0
-UUVDdVk1MG1nQmZ3cDl5UmY5VnpMSkdyYmluTlJGWUdnRVQyVWhvCkNlQkY0RUR5
-ODZTYUEzQlBmelBLcUxuWjdiYms2RUtmYlFFeEpXM3JCMlUKLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIFNySTEvUXhycFhZa3h5ZnZyaXJEZ3BGRW03WGRvM29FQlZJQ2xx
-ZnMwVzgKbGFVMDlYZjVzeUJyY1kyc0ZXRnVydHkzOWtPaE1uTXllbHhaQTdIa016
-VQotPiBzc2gtZWQyNTUxOSBuanZYNUEgdjh4T2FkckZYQlpsd3ZSTmc4VGRxWjg4
-TVRCTUl4U1BnanVwV29POXhIZwpEcHBUOFJjTXBGTExYTWtmd01XQlZndklXTkdU
-NHBnYkNBTSs5K1A3cE9vCi0tLSBBa01zRTdNYW5wRlltVkgrWG9mdHcrZ1NXRUwz
-UUhsalZSeU1CVENmbnp3CphGOZ7hu3mq3UI69UCJq7ptFDMUmdmYW4ydzz2RVlYX
-P1JWkX0IpnHtcFPK1XmRrBkiyto=
------END AGE ENCRYPTED FILE-----

private/prometheus.age

@@ -1,12 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBDRWNi
-YlJubmg1Ly94cHgxbHV3dStaRkZDRXdNZzVjRCt0R2RNMFkxUEZNCnJxZnc1UHFB
-MURselZuL1U5OHFQb0tPLytWelRzYXlvNngya3RQOXREUEkKLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIDRiR2ZEMUZsYTlGbXFoR0NyZXVXMEZmS3BONDNFQUo4VU1XNkZ0
-ZWFzMHcKM1crbDVsR2VmVTFNckxaa21MTW9UVWE3Z01qMi9VT0kwMm80V0tMSWM1
-bwotPiBzc2gtZWQyNTUxOSBuanZYNUEgd0tIampOVU5ZeWtxNWZpaGdFQTBlWlha
-Z0lBQWp0dzhMRHU5UnVzWVlUSQpnUHlCZ0w5Z1hMYm1Dc1UxQ1lLRHlnaUhJQllW
-RGMvTEhhc29VL2JXZnhNCi0tLSB6TThQbmV0eFJ0d2pZd1h0c2RuTGFzUHhyYWJp
-b2RhVTNkSXczRGJpN1UwCt7I+OsqQdQbFXhYPV5/kqDAr/jVoJ9H5PSfdLkeVIrr
-AqScUaOrdctUZEBIF8/FouJkSbIiU8muBNrBKx9CylI=
------END AGE ENCRYPTED FILE-----

private/prowlarr-api-key.age

@@ -1,12 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyAyVkNR
-d1lsUmJWVmlxb3NnNTJNN052ckRPOURYR3VCWUFpd25aQTBPVldJCnBNRTdlOTNP
-SkhHZkZVU2VrV1hVcGczUVVZVHBtRTNoNUliZHNpeXltZW8KLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIGJCWktmWDE1Z1Q4M0RDKytaZndtZmlCeU5paXUxTld4d2FNV3dT
-Nyt3aWsKTUlqTys0Q1RiTERlMnZRUDJMZHJheStYak0rY01jWVM3STF2QjExZzFm
-UQotPiBzc2gtZWQyNTUxOSBuanZYNUEgcm9wVTlCKzFEejdlNVp0ZVpnRUxDUmpo
-YmRlZWVpSGJocUtNN05KS0cwTQpYUmdpYVNVemZXWUd1ZUlQTks4VUdmaEZPZ2x2
-YVdqWG0ySkt2dDNSQzJvCi0tLSBaN0gwclJpcUFvT0pHcUhyVERnZ1Nralg5bGxZ
-b0hyaVB6OStpczQxclFJCmHfg8XI+AzbijptcC6Zhqigp8D3CvB8mSF5H6kPFmJU
-odbXmgzihXxWjnG6tH4LgEiEI2dWfbELIwqLs4BIiLlt
------END AGE ENCRYPTED FILE-----

private/radarr-api-key.age

@@ -1,12 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBuRldh
-Um5iYmpEZlZHMmFTMTQ0WVdUUllBeE9MNFFWdXlwNmoxUU1VdUQ4Clk3aXJMYlFM
-dFFWODlIamNoc0xGVUdSRktVUllhSHpXR2plbmNkcFR0VW8KLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIEp6RktOMFVLTi9NRTF3MHg0Uk4xRzRlNTlIajVKeWtxN3huNnZN
-bDdwRzQKMTUvQ21BWXliOFdNRVFUNjMyS0tyeEt1bURRM2JVMXFIV2cwZDA5WldC
-dwotPiBzc2gtZWQyNTUxOSBuanZYNUEgNWlWYUV5SXdCbUJjbnd4UjVqSllyNGZX
-bUtIenJJanZCNUdtZkIwQUZYdwowUUE3cHpTRW5zdy9MUlg5VlZGWlNiZ2pVbmUy
-c1V0WkZJckJUY25KWmowCi0tLSBxTWg3VHN4MHlVdWpLZzRtaXRYeGEvOFlLR00w
-bkVzRkltY0lON0FBYXpjChPtxNyevNnkMHYc7xbsZo/7ThtPB4uOqHfF8swX1efg
-AHsWemHnBEfsMBEmCtmczOhFwCNOtgc+q3rQCvmuU9tX
------END AGE ENCRYPTED FILE-----

private/sabnzbd-api-key.age

@@ -1,12 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBDbFRU
-RjZFN0Jtd3o4eWthZ09BRUIvNXFZOHVLdVIvRTJCd09ULzJpcjI4CmVjb2szMmtI
-N3I5a0FKQ2RpeHJ2NjhwbWM0OFZwUFUzZnV2QWI3VDEvZ2sKLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIHNEd1d6bGY3WVVVdVV6TFQ2V3NhN2xubWhwQVBIVVBmKzRBWStX
-eVpzaW8Ka0o2a3ArSjdsTEZSa1cyVGdzZThGcUVFKys2UURaRUxwd0FjdDI0VmVJ
-QQotPiBzc2gtZWQyNTUxOSBuanZYNUEgc243YjBiOFdrQlV3SDEwWjc1TVB1cita
-WVk4bk0wbUk3elBJMkg0Qy9DSQoyVnNWQTJzU1laZ0pGZVlsTEVWV2o2bEVpaVNh
-QVNaNXVMaUpKTzVlQW1zCi0tLSB6SG5LWng0OVFGd2NvODVXclgycXFpSVFrMnFk
-VlhaL0h2MnBZZDJrN0ZFCtbPQRVZWx65T3DGVY8yG9D2tj1R9ccMcPyJNxJsmfsx
-hcINJq2zJKLP2mtvADH95uoaQylwpQQiVd8s6fwMH5cX
------END AGE ENCRYPTED FILE-----

private/sonarr-api-key.age

@@ -1,12 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBtV2FM
-U09jOUsxNVVLQmFkOWxubGdlZGpGMlh0YjFqbTA5TG53SW9DRGt3CjNQeWRac3Ey
-YlRkRnN3YXFnSkxjOTd3eXZLVHRmK3BIdTlJL0ZQNUhHaGsKLT4gc3NoLWVkMjU1
-MTkgWXlTVU1RIHJaUE0rc0dXaXkvNlErTmd0R016aWZ4eFM2bVh4T1pMa1Z6NEpC
-aE14Z28KS2FpU2NCclBDMDJVVC9UMWJibmlsc3hnZE9GVUl5NUxBdVMwYXJXWXhz
-QQotPiBzc2gtZWQyNTUxOSBuanZYNUEgaS8zRkg4MWpLT3UwSWVBSmRUSW9KdXZ1
-c2Ywcy94YXdKSTZlcG5PSkF6UQpLMWpoaTZ6cjA5dFlZbXp5dm92U25EWnFKODJN
-MHM1RGtDTyt0UEdVZHEwCi0tLSA1LzRHMTN4S1ozd2FIN1g4aTR1Skx3SE0yanNM
-aUpZU2tkR2xaN0ZDa3NJCjuPq+1BQBbHCbJAiTBI9EiJ9ddYrJxEt7yxjnbRx5s+
-YsA15LKloxgnK+KU9TMLCFUIlgq0nheyeysMSnqgxhDv
------END AGE ENCRYPTED FILE-----

templates/basic/.envrc

@@ -0,0 +1 @@
+use flake

templates/basic/flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1659803779,
+        "narHash": "sha256-+5zkHlbcbFyN5f3buO1RAZ9pH1wXLxCesUJ0vFmLr9Y=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "f44884060cb94240efbe55620f38a8ec8d9af601",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

templates/haskell/.envrc

@@ -0,0 +1 @@
+use flake

templates/haskell/flake.lock

@@ -0,0 +1,419 @@
+{
+  "nodes": {
+    "HTTP": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1451647621,
+        "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=",
+        "owner": "phadej",
+        "repo": "HTTP",
+        "rev": "9bc0996d412fef1787449d841277ef663ad9a915",
+        "type": "github"
+      },
+      "original": {
+        "owner": "phadej",
+        "repo": "HTTP",
+        "type": "github"
+      }
+    },
+    "cabal-32": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1603716527,
+        "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=",
+        "owner": "haskell",
+        "repo": "cabal",
+        "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "haskell",
+        "ref": "3.2",
+        "repo": "cabal",
+        "type": "github"
+      }
+    },
+    "cabal-34": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1640353650,
+        "narHash": "sha256-N1t6M3/wqj90AEdRkeC8i923gQYUpzSr8b40qVOZ1Rk=",
+        "owner": "haskell",
+        "repo": "cabal",
+        "rev": "942639c18c0cd8ec53e0a6f8d120091af35312cd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "haskell",
+        "ref": "3.4",
+        "repo": "cabal",
+        "type": "github"
+      }
+    },
+    "cabal-36": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1641652457,
+        "narHash": "sha256-BlFPKP4C4HRUJeAbdembX1Rms1LD380q9s0qVDeoAak=",
+        "owner": "haskell",
+        "repo": "cabal",
+        "rev": "f27667f8ec360c475027dcaee0138c937477b070",
+        "type": "github"
+      },
+      "original": {
+        "owner": "haskell",
+        "ref": "3.6",
+        "repo": "cabal",
+        "type": "github"
+      }
+    },
+    "cardano-shell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1608537748,
+        "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=",
+        "owner": "input-output-hk",
+        "repo": "cardano-shell",
+        "rev": "9392c75087cb9a3d453998f4230930dea3a95725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "cardano-shell",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1656065134,
+        "narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "ghc-8.6.5-iohk": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1600920045,
+        "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=",
+        "owner": "input-output-hk",
+        "repo": "ghc",
+        "rev": "95713a6ecce4551240da7c96b6176f980af75cae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "ref": "release/8.6.5-iohk",
+        "repo": "ghc",
+        "type": "github"
+      }
+    },
+    "hackage": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1656724378,
+        "narHash": "sha256-JdtnbKzKiP1GMWuVt3aQYELxFb8A2OhH/TJBfPn3QMg=",
+        "owner": "input-output-hk",
+        "repo": "hackage.nix",
+        "rev": "6e2d054b0876d3f9709da1df9dfe27325886927e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "hackage.nix",
+        "type": "github"
+      }
+    },
+    "haskellNix": {
+      "inputs": {
+        "HTTP": "HTTP",
+        "cabal-32": "cabal-32",
+        "cabal-34": "cabal-34",
+        "cabal-36": "cabal-36",
+        "cardano-shell": "cardano-shell",
+        "flake-utils": "flake-utils_2",
+        "ghc-8.6.5-iohk": "ghc-8.6.5-iohk",
+        "hackage": "hackage",
+        "hpc-coveralls": "hpc-coveralls",
+        "hydra": "hydra",
+        "nix-tools": "nix-tools",
+        "nixpkgs": [
+          "haskellNix",
+          "nixpkgs-unstable"
+        ],
+        "nixpkgs-2003": "nixpkgs-2003",
+        "nixpkgs-2105": "nixpkgs-2105",
+        "nixpkgs-2111": "nixpkgs-2111",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "old-ghc-nix": "old-ghc-nix",
+        "stackage": "stackage"
+      },
+      "locked": {
+        "lastModified": 1656752829,
+        "narHash": "sha256-Xz7aGLynjihmgp5a9dTX5Ax5GsL3Fcd2GQUEJ2BEYAU=",
+        "owner": "input-output-hk",
+        "repo": "haskell.nix",
+        "rev": "4e100b2ad96c221a78580701aa0a5a4f48f49130",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "haskell.nix",
+        "type": "github"
+      }
+    },
+    "hpc-coveralls": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1607498076,
+        "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=",
+        "owner": "sevanspowell",
+        "repo": "hpc-coveralls",
+        "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sevanspowell",
+        "repo": "hpc-coveralls",
+        "type": "github"
+      }
+    },
+    "hydra": {
+      "inputs": {
+        "nix": "nix",
+        "nixpkgs": [
+          "haskellNix",
+          "hydra",
+          "nix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1646878427,
+        "narHash": "sha256-KtbrofMtN8GlM7D+n90kixr7QpSlVmdN+vK5CA/aRzc=",
+        "owner": "NixOS",
+        "repo": "hydra",
+        "rev": "28b682b85b7efc5cf7974065792a1f22203a5927",
+        "type": "github"
+      },
+      "original": {
+        "id": "hydra",
+        "type": "indirect"
+      }
+    },
+    "lowdown-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1633514407,
+        "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "type": "github"
+      }
+    },
+    "nix": {
+      "inputs": {
+        "lowdown-src": "lowdown-src",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-regression": "nixpkgs-regression"
+      },
+      "locked": {
+        "lastModified": 1643066034,
+        "narHash": "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg=",
+        "owner": "NixOS",
+        "repo": "nix",
+        "rev": "a1cd7e58606a41fcf62bf8637804cf8306f17f62",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "2.6.0",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
+    "nix-tools": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1649424170,
+        "narHash": "sha256-XgKXWispvv5RCvZzPb+p7e6Hy3LMuRjafKMl7kXzxGw=",
+        "owner": "input-output-hk",
+        "repo": "nix-tools",
+        "rev": "e109c94016e3b6e0db7ed413c793e2d4bdb24aa7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "nix-tools",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1632864508,
+        "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-21.05-small",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs-2003": {
+      "locked": {
+        "lastModified": 1620055814,
+        "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-20.03-darwin",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-2105": {
+      "locked": {
+        "lastModified": 1645296114,
+        "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-21.05-darwin",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-2111": {
+      "locked": {
+        "lastModified": 1648744337,
+        "narHash": "sha256-bYe1dFJAXovjqiaPKrmAbSBEK5KUkgwVaZcTbSoJ7hg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0a58eebd8ec65ffdef2ce9562784123a73922052",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-21.11-darwin",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-regression": {
+      "locked": {
+        "lastModified": 1643052045,
+        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1648219316,
+        "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "old-ghc-nix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1631092763,
+        "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=",
+        "owner": "angerman",
+        "repo": "old-ghc-nix",
+        "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "angerman",
+        "ref": "master",
+        "repo": "old-ghc-nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "haskellNix": "haskellNix",
+        "nixpkgs": [
+          "haskellNix",
+          "nixpkgs-unstable"
+        ]
+      }
+    },
+    "stackage": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1656638371,
+        "narHash": "sha256-waxiLSFvKxpaG4zl8YpLtuhLf5OrFi6CgAIZAOXpnQ8=",
+        "owner": "input-output-hk",
+        "repo": "stackage.nix",
+        "rev": "4f1ad0f4b0f01010df8dab254fc8b453934823e7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "input-output-hk",
+        "repo": "stackage.nix",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

templates/poetry/.envrc

@@ -0,0 +1 @@
+use flake . --no-use-registries