upgrade firefox to 115.0.2

kitty tweaks, fix scrollback character issues
neovim keybind to open specific file in gh web
2025-04-24 18:32:24 +00:00 · 2023-07-19 12:27:04 -04:00 · 2023-07-18 23:36:09 -04:00 · 2023-07-18 13:11:42 -04:00 · 2023-07-18 03:52:37 +00:00 · 2023-07-17 22:37:26 -04:00
62 changed files with 826 additions and 737 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,7 +3,6 @@
 *.db
 **/.direnv/**
 result
-.luarc.json
 private/**
+templates/**/flake.lock
 !private/**.age
-!private/**.sha512
--- a/apps/neovim.nix
+++ b/apps/neovim.nix
@ -5,7 +5,7 @@
  program = "${
      (import ../modules/common/neovim/package {
        inherit pkgs;
-        colors = (import ../colorscheme/gruvbox).dark;
+        colors = (import ../colorscheme/nord).dark;
      })
    }/bin/nvim";

--- a/colorscheme/everforest/default.nix
+++ b/colorscheme/everforest/default.nix
@ -1,20 +1,24 @@
 {
  name = "everforest"; # dark, hard
  author = "Sainnhe Park";
-  base00 = "#2b3339"; # Default Background
-  base01 = "#323c41"; # Lighter Background
-  base02 = "#503946"; # Selection Background
-  base03 = "#868d80"; # Comments, Invisibles, Line Highlighting
-  base04 = "#d3c6aa"; # Dark Foreground (Used for status bars)
-  base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators
-  base06 = "#e9e8d2"; # Light Foreground (Not often used)
-  base07 = "#fff9e8"; # Light Background (Not often used)
-  base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ...
-  base09 = "#d699b6"; # Integers, Boolean, Constants, ...
-  base0A = "#83c092"; # Classes, Markup Bold, Search Text Background
-  base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
-  base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
-  base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
-  base0E = "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
-  base0F = "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
+  dark = {
+    base00 = "#2b3339"; # Default Background
+    base01 = "#323c41"; # Lighter Background
+    base02 = "#503946"; # Selection Background
+    base03 = "#868d80"; # Comments, Invisibles, Line Highlighting
+    base04 = "#d3c6aa"; # Dark Foreground (Used for status bars)
+    base05 = "#d3c6aa"; # Default Foreground, Caret, Delimiters, Operators
+    base06 = "#e9e8d2"; # Light Foreground (Not often used)
+    base07 = "#fff9e8"; # Light Background (Not often used)
+    base08 = "#7fbbb3"; # Variables, XML Tags, Markup Link Text, ...
+    base09 = "#d699b6"; # Integers, Boolean, Constants, ...
+    base0A = "#83c092"; # Classes, Markup Bold, Search Text Background
+    base0B = "#dbbc7f"; # Strings, Inherited Class, Markup Code, Diff Inserted
+    base0C = "#e69875"; # Support, Regular Expressions, Escape Characters, ...
+    base0D = "#a7c080"; # Functions, Methods, Attribute IDs, Headings
+    base0E =
+      "#e67e80"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
+    base0F =
+      "#d699b6"; # Deprecated, Opening/Closing Embedded Language Tags, ...
+  };
 }
--- a/colorscheme/nord/default.nix
+++ b/colorscheme/nord/default.nix
@ -1,7 +1,7 @@
 {
+  name = "nord";
+  author = "arcticicestudio";
  dark = {
-    name = "nord";
-    author = "arcticicestudio";
    base00 = "#2E3440";
    base01 = "#3B4252";
    base02 = "#434C5E";
--- a/colorscheme/nord/neovim.lua
+++ b/colorscheme/nord/neovim.lua
@ -1,13 +0,0 @@
-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
--- a/flake.lock
+++ b/flake.lock
@ -17,6 +17,22 @@
        "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": {
@ -93,14 +109,16 @@
    },
    "firefox-darwin": {
      "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1687568341,
-        "narHash": "sha256-5mnjEy1tPfWjlFq/3UB/AyoqkDOJeVu/y/C6Yw2MW9k=",
+        "lastModified": 1689731219,
+        "narHash": "sha256-6S3XfZWe7x0zViHy2Ix0rzHL/RmVT3s0ZtI+LmJMC2g=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "0bb6fa671d1f1964b2cab7a3774cba1e071aa26e",
+        "rev": "7aa20dbbcbd2371ef13b622ac03f1c3cc5662f37",
        "type": "github"
      },
      "original": {
@ -200,7 +218,9 @@
    "nil": {
      "inputs": {
        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
        "rust-overlay": "rust-overlay"
      },
      "locked": {
@ -276,38 +296,6 @@
      }
    },
    "nixpkgs": {
-      "locked": {
-        "lastModified": 1639237670,
-        "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": "53dad94e874c9586e71decf82d972dfb640ef044",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
      "locked": {
        "lastModified": 1687502512,
        "narHash": "sha256-dBL/01TayOSZYxtY4cMXuNCBk8UMLoqRZA+94xiFpJA=",
@ -323,7 +311,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_4": {
+    "nixpkgs_2": {
      "locked": {
        "lastModified": 1686929285,
        "narHash": "sha256-WGtVzn+vGMPTXDO0DMNKVFtf+zUSqeW+KKk4Y/Ae99I=",
@ -423,6 +411,7 @@
    "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",
@ -432,7 +421,7 @@
        "nil": "nil",
        "nix2vim": "nix2vim",
        "nixos-generators": "nixos-generators",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs",
        "null-ls-nvim-src": "null-ls-nvim-src",
        "nur": "nur",
        "nvim-lspconfig-src": "nvim-lspconfig-src",
@ -441,6 +430,7 @@
        "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"
      }
@ -550,6 +540,22 @@
        "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": {
@ -570,7 +576,7 @@
      "inputs": {
        "flake-compat": "flake-compat",
        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
        "lastModified": 1687279045,
--- a/flake.nix
+++ b/flake.nix
@ -20,14 +20,17 @@
    home-manager = {
      url = "github:nix-community/home-manager/master";
      inputs.nixpkgs.follows =
-        "nixpkgs"; # Use system packages list where available
+        "nixpkgs"; # Use system packages list for their inputs
    };

    # Community packages; used for Firefox extensions
    nur.url = "github:nix-community/nur";

    # Use official Firefox binary for macOS
-    firefox-darwin.url = "github:bandithedoge/nixpkgs-firefox-darwin";
+    firefox-darwin = {
+      url = "github:bandithedoge/nixpkgs-firefox-darwin";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };

    # Manage disk format and partitioning
    disko = {
@ -54,7 +57,10 @@
    };

    # Nix language server
-    nil.url = "github:oxalica/nil/2023-04-03";
+    nil = {
+      url = "github:oxalica/nil/2023-04-03";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };

    # Neovim plugins
    nvim-lspconfig-src = {
@ -69,6 +75,10 @@
      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;
@ -97,6 +107,10 @@
      url = "github:kyazdani42/nvim-tree.lua";
      flake = false;
    };
+    vscode-terraform-snippets = {
+      url = "github:run-at-scale/vscode-terraform-doc-snippets";
+      flake = false;
+    };

  };

@ -105,7 +119,8 @@
    let

      # Global configuration for my systems
-      globals = rec {
+      globals = let baseName = "masu.rs";
+      in rec {
        user = "noah";
        fullName = "Noah Masur";
        gitName = fullName;
@ -114,6 +129,16 @@
        mail.imapHost = "imap.purelymail.com";
        mail.smtpHost = "smtp.purelymail.com";
        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
@ -123,6 +148,7 @@
        (import ./overlays/neovim-plugins.nix inputs)
        (import ./overlays/calibre-web.nix)
        (import ./overlays/disko.nix inputs)
+        (import ./overlays/tree-sitter.nix inputs)
      ];

      # System types to support.
@ -150,7 +176,7 @@
          import ./hosts/lookingglass { inherit inputs globals overlays; };
      };

-      # For quickly applying local settings with:
+      # For quickly applying home-manager settings with:
      # home-manager switch --flake .#tempest
      homeConfigurations = {
        tempest =
--- a/hosts/flame/default.nix
+++ b/hosts/flame/default.nix
@ -10,7 +10,7 @@ inputs.nixpkgs.lib.nixosSystem {
  system = "aarch64-linux";
  specialArgs = { };
  modules = [
-    (removeAttrs globals [ "mail.server" ])
+    globals
    inputs.home-manager.nixosModules.home-manager
    ../../modules/common
    ../../modules/nixos
@ -43,14 +43,17 @@ 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;
@ -60,6 +63,8 @@ inputs.nixpkgs.lib.nixosSystem {
          "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK/6oyVqjFGX3Uvrc3VS8J9sphxzAnRzKC85xgkHfYgR3TK6qBGXzHrknEj21xeZrr3G2y1UsGzphWJd9ZfIcdA= open-ssh-ca@cloudflareaccess.org";
      };

+      giteaRunner.enable = true;
+
      # Nextcloud backup config
      backup.s3 = {
        endpoint = "s3.us-west-002.backblazeb2.com";
--- a/hosts/lookingglass/default.nix
+++ b/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;
+        colors = (import ../../colorscheme/gruvbox-dark).dark;
        dark = true;
      };
      mail.user = globals.user;
--- a/hosts/swan/default.nix
+++ b/hosts/swan/default.nix
@ -15,6 +15,7 @@ inputs.nixpkgs.lib.nixosSystem {
    {
      # Hardware
      server = true;
+      physical = true;
      networking.hostName = "swan";

      boot.initrd.availableKernelModules =
@ -48,14 +49,19 @@ 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;
-      streamServer = "stream.masu.rs";
-      nextcloudServer = "cloud.masu.rs";
-      bookServer = "books.masu.rs";
-      arrServer = "download.masu.rs";
-      samba.enable = true;
+      arrs.enable = true;
+
+      services.bind.enable = true;
+      services.caddy.enable = true;
+      services.jellyfin.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;
--- a/hosts/tempest/default.nix
+++ b/hosts/tempest/default.nix
@ -91,6 +91,16 @@ 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";
+      };

    }
  ];
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@ -33,7 +33,6 @@
            vimium
            multi-account-containers
            facebook-container
-            temporary-containers
            (lib.mkIf config._1password.enable onepassword-password-manager)
            okta-browser-plugin
            sponsorblock
@ -74,6 +73,7 @@
            "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 {
--- a/modules/common/applications/kitty.nix
+++ b/modules/common/applications/kitty.nix
@ -28,6 +28,12 @@
      programs.rofi.terminal =
        lib.mkIf pkgs.stdenv.isLinux "${pkgs.kitty}/bin/kitty";

+      # Display images in the terminal
+      programs.fish.shellAliases = {
+        icat = "kitty +kitten icat";
+        ssh = "kitty +kitten ssh";
+      };
+
      programs.kitty = {
        enable = true;
        environment = { };
@ -85,7 +91,6 @@
          # Scrollback
          scrolling_lines = 10000;
          scrollback_pager_history_size = 10; # MB
-          scrollback_pager = "${pkgs.neovim}/bin/nvim -c 'normal G'";

          # Window
          window_padding_width = 6;
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@ -66,6 +66,40 @@
      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";
--- a/modules/common/neovim/config/completion.nix
+++ b/modules/common/neovim/config/completion.nix
@ -135,6 +135,13 @@
  };

  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 = {
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@ -29,6 +29,9 @@
  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" }),
--- a/modules/common/neovim/config/misc.nix
+++ b/modules/common/neovim/config/misc.nix
@ -11,6 +11,7 @@

  setup.Comment = { };
  setup.colorizer = { };
+  setup.glow = { };

  vim.o = {
    termguicolors = true; # Set to truecolor
--- a/modules/common/neovim/config/statusline.nix
+++ b/modules/common/neovim/config/statusline.nix
@ -2,7 +2,7 @@
  plugins = [ pkgs.vimPlugins.lualine-nvim ];
  setup.lualine = {
    options = {
-      theme = "gruvbox";
+      theme = "base16";
      icons_enabled = true;
    };
  };
--- a/modules/common/neovim/config/syntax.nix
+++ b/modules/common/neovim/config/syntax.nix
@ -1,26 +1,39 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {

  plugins = [
    (pkgs.vimPlugins.nvim-treesitter.withPlugins (_plugins:
      with pkgs.tree-sitter-grammars; [
-        tree-sitter-hcl
-        tree-sitter-python
-        tree-sitter-lua
-        tree-sitter-nix
+        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-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.vimPlugins.vim-puppet
+    pkgs.baleia-nvim # Clean ANSI from kitty scrollback
+    (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 = {
@ -49,4 +62,10 @@
    };
  };

+  # Use mkAfter to ensure tree-sitter is already loaded
+  lua = lib.mkAfter ''
+    -- Use HCL parser with .tf files
+    vim.treesitter.language.register('hcl', 'terraform')
+  '';
+
 }
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@ -31,8 +31,8 @@ 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" -'';
+        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"' '';

        xdg.desktopEntries.nvim = lib.mkIf pkgs.stdenv.isLinux {
          name = "Neovim wrapper";
--- a/modules/common/neovim/lua/keybinds.lua
+++ b/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 repo view -w<CR><CR>", { silent = true })
+key("n", "<Leader>gr", ":!gh browse %<CR><CR>", { silent = true })
 key("n", "<Leader>tt", [[<Cmd>exe 'edit $NOTES_PATH/journal/'.strftime("%Y-%m-%d_%a").'.md'<CR>]])
 key("n", "<Leader>jj", ":!journal<CR>:e<CR>")

--- a/modules/common/neovim/lua/settings.lua
+++ b/modules/common/neovim/lua/settings.lua
@ -4,9 +4,9 @@

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

--- a/modules/common/neovim/package/default.nix
+++ b/modules/common/neovim/package/default.nix
@ -28,6 +28,8 @@

 { 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;
--- a/modules/common/neovim/plugin/after/queries/nix/injections.scm
+++ b/modules/common/neovim/plugin/after/queries/nix/injections.scm
@ -0,0 +1,8 @@
+expression: (apply_expression
+  function: (apply_expression
+    function: (select_expression
+      attrpath: (attrpath) @writeshell (#match? @writeshell "^writeShell.*$")
+      )
+    )
+  (indented_string_expression) @bash
+)
--- a/modules/common/shell/fish/functions/fish_user_key_bindings.fish
+++ b/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 run nixpkgs#"'
-bind -M default \cn 'commandline -r "nix run nixpkgs#"'
+bind -M insert \cn 'commandline -r "nix shell nixpkgs#"'
+bind -M default \cn 'commandline -r "nix shell nixpkgs#"'
 bind -M insert \x11F nix-fzf
 bind -M default \x11F nix-fzf
--- a/modules/common/shell/utilities.nix
+++ b/modules/common/shell/utilities.nix
@ -52,10 +52,6 @@ in {
        };
      };

-      programs.fish.shellAbbrs = {
-        cat = "bat"; # Swap cat with bat
-      };
-
      programs.fish.functions = {
        ping = {
          description = "Improved ping";
--- a/modules/nixos/applications/nautilus.nix
+++ b/modules/nixos/applications/nautilus.nix
@ -40,6 +40,7 @@
        defaultApplications."inode/directory" =
          lib.mkBefore [ "org.gnome.Nautilus.desktop" ];
      };
+
    };

    # # Set default for opening directories
@ -50,6 +51,13 @@
    #     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";
+    };
+
  };

 }
--- a/modules/nixos/gaming/minecraft-server.nix
+++ b/modules/nixos/gaming/minecraft-server.nix
@ -9,15 +9,11 @@ let

 in {

-  options.gaming.minecraft-server.enable =
-    lib.mkEnableOption "Minecraft Server.";
-
-  config = lib.mkIf config.gaming.minecraft-server.enable {
+  config = lib.mkIf config.services.minecraft-server.enable {

    unfreePackages = [ "minecraft-server" ];

    services.minecraft-server = {
-      enable = true;
      eula = true;
      declarative = true;
      whitelist = { };
--- a/modules/nixos/hardware/boot.nix
+++ b/modules/nixos/hardware/boot.nix
@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: {

-  boot.loader = lib.mkIf config.physical {
+  boot.loader = lib.mkIf (config.physical && !config.server) {
    grub = {
      enable = true;

--- a/modules/nixos/hardware/networking.nix
+++ b/modules/nixos/hardware/networking.nix
@ -2,12 +2,7 @@

  config = lib.mkIf config.physical {

-    # 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.useDHCP = true;

    networking.firewall.allowPing = lib.mkIf config.server true;

@ -15,6 +10,9 @@
    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;
@ -22,10 +20,6 @@
        workstation = true;
      };
    };
-
-    # Resolve local hostnames using Avahi DNS
-    services.avahi.nssmdns = true;
-
  };

 }
--- a/modules/nixos/hardware/server.nix
+++ b/modules/nixos/hardware/server.nix
@ -1,6 +1,6 @@
-{ config, pkgs, lib, ... }: {
+{ config, lib, ... }: {

-  config = lib.mkIf (pkgs.stdenv.isLinux && config.server) {
+  config = lib.mkIf config.server {

    # Servers need a bootloader or they won't start
    boot.loader.systemd-boot.enable = true;
--- a/modules/nixos/hardware/sleep.nix
+++ b/modules/nixos/hardware/sleep.nix
@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }: {

-  config = lib.mkIf config.physical {
+  config = lib.mkIf (config.physical && !config.server) {

    # Prevent wake from keyboard
    powerManagement.powerDownCommands = ''
--- a/modules/nixos/hardware/zfs.nix
+++ b/modules/nixos/hardware/zfs.nix
@ -1,16 +1,21 @@
-{ config, pkgs, lib, ... }: {
+{ config, lib, ... }: {

  options = { zfs.enable = lib.mkEnableOption "ZFS file system."; };

-  config =
-    lib.mkIf (pkgs.stdenv.isLinux && config.server && config.zfs.enable) {
+  config = lib.mkIf (config.server && config.zfs.enable) {

-      # Only use compatible Linux kernel, since ZFS can be behind
-      boot.kernelPackages =
-        config.boot.zfs.package.latestCompatibleLinuxPackages;
-      boot.kernelParams = [ "nohibernate" ];
-      boot.supportedFilesystems = [ "zfs" ];
+    # Only use compatible Linux kernel, since ZFS can be behind
+    boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+    boot.kernelParams = [ "nohibernate" ];
+    boot.supportedFilesystems = [ "zfs" ];
+    services.prometheus.exporters.zfs.enable =
+      config.prometheus.exporters.enable;
+    prometheus.scrapeTargets = [
+      "127.0.0.1:${
+        builtins.toString config.services.prometheus.exporters.zfs.port
+      }"
+    ];

-    };
+  };

 }
--- a/modules/nixos/services/arr.nix
+++ b/modules/nixos/services/arr.nix
@ -1,14 +1,8 @@
 { config, lib, ... }: {

-  options = {
-    arrServer = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      description = "Hostname for arr services";
-      default = null;
-    };
-  };
+  options = { arrs.enable = lib.mkEnableOption "Arr services"; };

-  config = lib.mkIf (config.arrServer != null) {
+  config = lib.mkIf config.arrs.enable {

    services = {
      bazarr = {
@ -44,7 +38,7 @@
      {
        group = "download";
        match = [{
-          host = [ config.arrServer ];
+          host = [ config.hostnames.download ];
          path = [ "/sonarr*" ];
        }];
        handle = [{
@ -55,7 +49,7 @@
      {
        group = "download";
        match = [{
-          host = [ config.arrServer ];
+          host = [ config.hostnames.download ];
          path = [ "/radarr*" ];
        }];
        handle = [{
@ -66,7 +60,7 @@
      {
        group = "download";
        match = [{
-          host = [ config.arrServer ];
+          host = [ config.hostnames.download ];
          path = [ "/prowlarr*" ];
        }];
        handle = [{
@ -77,7 +71,7 @@
      {
        group = "download";
        match = [{
-          host = [ config.arrServer ];
+          host = [ config.hostnames.download ];
          path = [ "/bazarr*" ];
        }];
        handle = [{
@ -88,7 +82,7 @@
      {
        group = "download";
        match = [{
-          host = [ config.arrServer ];
+          host = [ config.hostnames.download ];
          path = [ "/sabnzbd*" ];
        }];
        handle = [{
@ -98,7 +92,7 @@
      }
      {
        group = "download";
-        match = [{ host = [ config.arrServer ]; }];
+        match = [{ host = [ config.hostnames.download ]; }];
        handle = [{
          handler = "reverse_proxy";
          upstreams = [{ dial = "localhost:5055"; }];
--- a/modules/nixos/services/bind.nix
+++ b/modules/nixos/services/bind.nix
@ -0,0 +1,55 @@
+{ 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 ];
+
+  };
+
+}
--- a/modules/nixos/services/caddy.nix
+++ b/modules/nixos/services/caddy.nix
@ -1,28 +1,42 @@
 { config, pkgs, lib, ... }: {

  options = {
-    caddy.enable = lib.mkEnableOption "Caddy reverse proxy.";
-    caddy.tlsPolicies = lib.mkOption {
-      type = lib.types.listOf lib.types.attrs;
-      description = "Caddy JSON TLS policies";
-      default = [ ];
-    };
-    caddy.routes = lib.mkOption {
-      type = lib.types.listOf lib.types.attrs;
-      description = "Caddy JSON routes for http servers";
-      default = [ ];
-    };
-    caddy.blocks = lib.mkOption {
-      type = lib.types.listOf lib.types.attrs;
-      description = "Caddy JSON error blocks for http servers";
-      default = [ ];
+    caddy = {
+      tlsPolicies = lib.mkOption {
+        type = lib.types.listOf lib.types.attrs;
+        description = "Caddy JSON TLS policies";
+        default = [ ];
+      };
+      routes = lib.mkOption {
+        type = lib.types.listOf lib.types.attrs;
+        description = "Caddy JSON routes for http servers";
+        default = [ ];
+      };
+      blocks = lib.mkOption {
+        type = lib.types.listOf lib.types.attrs;
+        description = "Caddy JSON error blocks for http servers";
+        default = [ ];
+      };
+      cidrAllowlist = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+        description = "CIDR blocks to allow for requests";
+        default = [ "127.0.0.1/32" ];
+      };
    };
  };

-  config = lib.mkIf (config.caddy.enable && config.caddy.routes != [ ]) {
+  config = lib.mkIf config.services.caddy.enable {
+
+    # Force Caddy to 403 if not coming from allowlisted source
+    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 = {
@ -31,6 +45,7 @@
          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"; };
@ -48,6 +63,8 @@
    networking.firewall.allowedTCPPorts = [ 80 443 ];
    networking.firewall.allowedUDPPorts = [ 443 ];

+    prometheus.scrapeTargets = [ "127.0.0.1:2019" ];
+
  };

 }
--- a/modules/nixos/services/calibre.nix
+++ b/modules/nixos/services/calibre.nix
@ -7,11 +7,6 @@ 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";
@ -19,10 +14,9 @@ in {
    };
  };

-  config = lib.mkIf (config.bookServer != null) {
+  config = lib.mkIf config.services.calibre-web.enable {

    services.calibre-web = {
-      enable = true;
      openFirewall = true;
      options = {
        reverseProxyAuth.enable = false;
@ -33,7 +27,7 @@ in {
    };

    caddy.routes = [{
-      match = [{ host = [ config.bookServer ]; }];
+      match = [{ host = [ config.hostnames.books ]; }];
      handle = [{
        handler = "reverse_proxy";
        upstreams = [{ dial = "localhost:8083"; }];
--- a/modules/nixos/services/cloudflare.nix
+++ b/modules/nixos/services/cloudflare.nix
@ -41,13 +41,7 @@ in {
  config = lib.mkIf config.cloudflare.enable {

    # Forces Caddy to error if coming from a non-Cloudflare IP
-    caddy.blocks = [{
-      match = [{ not = [{ remote_ip.ranges = cloudflareIpRanges; }]; }];
-      handle = [{
-        handler = "static_response";
-        abort = true;
-      }];
-    }];
+    caddy.cidrAllowlist = cloudflareIpRanges;

    # Tell Caddy to use Cloudflare DNS for ACME challenge validation
    services.caddy.package = (pkgs.callPackage ../../../overlays/caddy.nix {
--- a/modules/nixos/services/default.nix
+++ b/modules/nixos/services/default.nix
@ -3,12 +3,15 @@
  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
@ -22,6 +25,7 @@
    ./sshd.nix
    ./transmission.nix
    ./vaultwarden.nix
+    ./victoriametrics.nix
    ./wireguard.nix
  ];

--- a/modules/nixos/services/gitea-runner.nix
+++ b/modules/nixos/services/gitea-runner.nix
@ -0,0 +1,53 @@
+{ 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;
+    };
+
+    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"
+      ];
+    };
+
+  };
+
+}
--- a/modules/nixos/services/gitea.nix
+++ b/modules/nixos/services/gitea.nix
@ -1,28 +1,18 @@
-{ config, lib, ... }:
+{ config, pkgs, lib, ... }:

 let giteaPath = "/var/lib/gitea"; # Default service directory

 in {

-  options = {
-
-    giteaServer = lib.mkOption {
-      description = "Hostname for Gitea.";
-      type = lib.types.nullOr lib.types.str;
-      default = null;
-    };
-
-  };
-
-  config = lib.mkIf (config.giteaServer != null) {
+  config = lib.mkIf config.services.gitea.enable {
    services.gitea = {
-      enable = true;
      database.type = "sqlite3";
      settings = {
+        actions.ENABLED = true;
        repository = {
          DEFAULT_PUSH_CREATE_PRIVATE = true;
          DISABLE_HTTP_GIT = false;
-          ACCESS_CONTROL_ALLOW_ORIGIN = config.giteaServer;
+          ACCESS_CONTROL_ALLOW_ORIGIN = config.hostnames.git;
          ENABLE_PUSH_CREATE_USER = true;
          ENABLE_PUSH_CREATE_ORG = true;
          DEFAULT_BRANCH = "main";
@ -30,7 +20,7 @@ in {
        server = {
          HTTP_PORT = 3001;
          HTTP_ADDRESS = "127.0.0.1";
-          ROOT_URL = "https://${config.giteaServer}/";
+          ROOT_URL = "https://${config.hostnames.git}/";
          SSH_PORT = 22;
          START_SSH_SERVER = false; # Use sshd instead
          DISABLE_SSH = false;
@ -45,9 +35,10 @@ in {
    };

    networking.firewall.allowedTCPPorts = [ 122 ];
+    users.users.${config.user}.extraGroups = [ "gitea" ];

    caddy.routes = [{
-      match = [{ host = [ config.giteaServer ]; }];
+      match = [{ host = [ config.hostnames.git ]; }];
      handle = [{
        handler = "reverse_proxy";
        upstreams = [{ dial = "localhost:3001"; }];
@ -85,6 +76,34 @@ 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}
+        '';
+      };
+
  };

 }
--- a/modules/nixos/services/grafana.nix
+++ b/modules/nixos/services/grafana.nix
@ -0,0 +1,27 @@
+{ 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
+            }";
+        }];
+      }];
+    }];
+
+  };
+
+}
--- a/modules/nixos/services/jellyfin.nix
+++ b/modules/nixos/services/jellyfin.nix
@ -1,26 +1,29 @@
 { config, pkgs, lib, ... }: {

-  options = {
-    streamServer = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      description = "Hostname for Jellyfin library";
-      default = null;
-    };
-  };
+  config = lib.mkIf config.services.jellyfin.enable {

-  config = lib.mkIf (config.streamServer != null) {
-
-    services.jellyfin.enable = true;
    services.jellyfin.group = "media";
    users.users.jellyfin = { isSystemUser = true; };

-    caddy.routes = [{
-      match = [{ host = [ config.streamServer ]; }];
-      handle = [{
-        handler = "reverse_proxy";
-        upstreams = [{ dial = "localhost:8096"; }];
-      }];
-    }];
+    caddy.routes = [
+      {
+        match = [{
+          host = [ config.hostnames.stream ];
+          path = [ "/metrics*" ];
+        }];
+        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 = [
@ -44,6 +47,9 @@
    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" ];
+
  };

 }
--- a/modules/nixos/services/nextcloud.nix
+++ b/modules/nixos/services/nextcloud.nix
@ -1,42 +1,38 @@
-{ config, pkgs, lib, ... }: {
+{ config, pkgs, lib, ... }:

-  options = {
+let

-    nextcloudServer = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      description = "Hostname for Nextcloud";
-      default = null;
-    };
+  port = 8080;

-  };
+in {

-  config = lib.mkIf (config.nextcloudServer != null) {
+  config = lib.mkIf config.services.nextcloud.enable {

    services.nextcloud = {
-      enable = true;
-      package = pkgs.nextcloud26; # Required to specify
+      package = pkgs.nextcloud27; # Required to specify
      datadir = "/data/nextcloud";
      https = true;
      hostName = "localhost";
      maxUploadSize = "50G";
      config = {
        adminpassFile = config.secrets.nextcloud.dest;
-        extraTrustedDomains = [ config.nextcloudServer ];
+        extraTrustedDomains = [ config.hostnames.content ];
+        trustedProxies = [ "127.0.0.1" ];
      };
    };

    # Don't let Nginx use main ports (using Caddy instead)
    services.nginx.virtualHosts."localhost".listen = [{
      addr = "127.0.0.1";
-      port = 8080;
+      port = port;
    }];

    # Point Caddy to Nginx
    caddy.routes = [{
-      match = [{ host = [ config.nextcloudServer ]; }];
+      match = [{ host = [ config.hostnames.content ]; }];
      handle = [{
        handler = "reverse_proxy";
-        upstreams = [{ dial = "localhost:8080"; }];
+        upstreams = [{ dial = "localhost:${builtins.toString port}"; }];
      }];
    }];

@ -85,6 +81,23 @@
      requires = [ "phpfpm-nextcloud.service" ];
    };

+    # Log metrics to prometheus
+    services.prometheus.exporters.nextcloud = {
+      enable = config.prometheus.exporters.enable;
+      username = config.services.nextcloud.config.adminuser;
+      url = "http://localhost:${builtins.toString port}";
+      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" ];
+
  };

 }
--- a/modules/nixos/services/prometheus.nix
+++ b/modules/nixos/services/prometheus.nix
@ -1,32 +1,103 @@
-{ config, lib, ... }: {
+{ config, pkgs, lib, ... }: {

-  options.metricsServer = lib.mkOption {
-    type = lib.types.nullOr lib.types.str;
-    description = "Hostname of the Grafana server.";
-    default = null;
+  options.prometheus = {
+    exporters.enable = lib.mkEnableOption "Enable Prometheus exporters";
+    scrapeTargets = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      description = "Prometheus scrape targets";
+      default = [ ];
+    };
  };

-  config = lib.mkIf (config.metricsServer != null) {
+  config = let

-    services.grafana.enable = true;
+    # If hosting Grafana, host local Prometheus and listen for inbound jobs. If
+    # not hosting Grafana, send remote Prometheus writes to primary host.
+    isServer = config.services.grafana.enable;

-    # Required to fix error in latest nixpkgs
-    services.grafana.settings = { };
+  in {
+
+    # 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 = {
-      enable = true;
-      exporters.node.enable = true;
+      exporters.node.enable = config.prometheus.exporters.enable;
+      exporters.node.enabledCollectors = [ ];
+      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 = "local";
-        static_configs = [{ targets = [ "127.0.0.1:9100" ]; }];
+        job_name = config.networking.hostName;
+        static_configs = [{ targets = config.scrapeTargets; }];
+      }];
+      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;
+        };
      }];
    };

-    caddy.routes = [{
-      match = [{ host = [ config.metricsServer ]; }];
+    # Create credentials file for remote Prometheus push
+    secrets.prometheus =
+      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 = [{ dial = "localhost:3000"; }];
+        upstreams =
+          [{ dial = "localhost:${config.services.prometheus.port}"; }];
      }];
    }];

--- a/modules/nixos/services/samba.nix
+++ b/modules/nixos/services/samba.nix
@ -1,11 +1,8 @@
 { config, lib, ... }: {

-  options = { samba.enable = lib.mkEnableOption "Enable Samba sharing."; };
-
  config = {

-    services.samba = lib.mkIf (config.samba.enable) {
-      enable = true;
+    services.samba = lib.mkIf config.services.samba.enable {
      openFirewall = true;
      shares.data = {
        path = "/data";
--- a/modules/nixos/services/secrets.nix
+++ b/modules/nixos/services/secrets.nix
@ -39,6 +39,11 @@
            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.";
@ -65,10 +70,10 @@
        wantedBy = [ "multi-user.target" ];
        serviceConfig.Type = "oneshot";
        script = ''
-          ${pkgs.age}/bin/age --decrypt \
-            --identity ${config.identityFile} \
-            --output ${attrs.dest} \
-            ${attrs.source}
+          echo "${attrs.prefix}$(
+            ${pkgs.age}/bin/age --decrypt \
+                --identity ${config.identityFile} ${attrs.source}
+          )" > ${attrs.dest}

          chown '${attrs.owner}':'${attrs.group}' '${attrs.dest}'
          chmod '${attrs.permissions}' '${attrs.dest}'
--- a/modules/nixos/services/sshd.nix
+++ b/modules/nixos/services/sshd.nix
@ -13,9 +13,8 @@
    };
  };

-  config = lib.mkIf (config.publicKey != null) {
+  config = lib.mkIf config.services.openssh.enable {
    services.openssh = {
-      enable = true;
      ports = [ 22 ];
      allowSFTP = true;
      settings = {
@ -27,7 +26,7 @@
    };

    users.users.${config.user}.openssh.authorizedKeys.keys =
-      [ config.publicKey ];
+      lib.mkIf (config.publicKey != null) [ config.publicKey ];

    # Implement a simple fail2ban service for sshd
    services.sshguard.enable = true;
--- a/modules/nixos/services/transmission.nix
+++ b/modules/nixos/services/transmission.nix
@ -42,7 +42,7 @@

    # Create reverse proxy for web UI
    caddy.routes = lib.mkAfter [{
-      group = if (config.arrServer == config.transmissionServer) then
+      group = if (config.hostnames.download == config.transmissionServer) then
        "download"
      else
        "transmission";
--- a/modules/nixos/services/vaultwarden.nix
+++ b/modules/nixos/services/vaultwarden.nix
@ -4,21 +4,10 @@ let vaultwardenPath = "/var/lib/bitwarden_rs"; # Default service directory

 in {

-  options = {
-
-    vaultwardenServer = lib.mkOption {
-      description = "Hostname for Vaultwarden.";
-      type = lib.types.nullOr lib.types.str;
-      default = null;
-    };
-
-  };
-
-  config = lib.mkIf (config.vaultwardenServer != null) {
+  config = lib.mkIf config.services.vaultwarden.enable {
    services.vaultwarden = {
-      enable = true;
      config = {
-        DOMAIN = "https://${config.vaultwardenServer}";
+        DOMAIN = "https://${config.hostnames.secrets}";
        SIGNUPS_ALLOWED = false;
        SIGNUPS_VERIFY = true;
        INVITATIONS_ALLOWED = true;
@ -47,7 +36,7 @@ in {
    networking.firewall.allowedTCPPorts = [ 3012 ];

    caddy.routes = [{
-      match = [{ host = [ config.vaultwardenServer ]; }];
+      match = [{ host = [ config.hostnames.secrets ]; }];
      handle = [{
        handler = "reverse_proxy";
        upstreams = [{ dial = "localhost:8222"; }];
--- a/modules/nixos/services/victoriametrics.nix
+++ b/modules/nixos/services/victoriametrics.nix
@ -0,0 +1,95 @@
+{ 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" ];
+    };
+
+  };
+
+}
--- a/overlays/neovim-plugins.nix
+++ b/overlays/neovim-plugins.nix
@ -7,16 +7,17 @@ let
  # Use nixpkgs vimPlugin but with source directly from plugin author
  withSrc = pkg: src: pkg.overrideAttrs (_: { inherit src; });

-  # Package plugin - disabling until in use
-  # plugin = pname: src:
-  #   prev.vimUtils.buildVimPluginFrom2Nix {
-  #     inherit pname src;
-  #     version = "master";
-  #   };
+  # Package plugin - for plugins not found in nixpkgs at all
+  plugin = pname: src:
+    prev.vimUtils.buildVimPluginFrom2Nix {
+      inherit pname src;
+      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);
@ -35,8 +36,7 @@ in {
    (withSrc prev.vimPlugins.bufferline-nvim inputs.bufferline-nvim);
  nvim-tree-lua = (withSrc prev.vimPlugins.nvim-tree-lua inputs.nvim-tree-lua);

-  # Packaging plugins with Nix
-  # comment-nvim = plugin "comment-nvim" comment-nvim-src;
-  # plenary-nvim = plugin "plenary-nvim" plenary-nvim-src;
+  # Packaging plugins entirely with Nix
+  baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;

 }
--- a/overlays/tree-sitter.nix
+++ b/overlays/tree-sitter.nix
@ -0,0 +1,47 @@
+# Fix: bash highlighting doesn't work as of this commit:
+# https://github.com/NixOS/nixpkgs/commit/49cce41b7c5f6b88570a482355d9655ca19c1029
+
+inputs: _final: prev: {
+  tree-sitter-grammars = prev.tree-sitter-grammars // {
+    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=";
+        };
+      });
+    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=";
+      };
+    };
+  };
+
+}
--- a/private/cloudflared-tempest.age
+++ b/private/cloudflared-tempest.age
@ -0,0 +1,15 @@
+-----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-----
--- a/private/gitea-runner-token.age
+++ b/private/gitea-runner-token.age
@ -0,0 +1,12 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBoOVF1
+NmZocHpQQnRJcWpWUHh2bU93NkdnZWNzSlFiaHdTd24rcHpsczFRCmJaSzNkNGs1
+UDJCN2dYUVE3UTE1OU5RUWljQlN4dmxuUnpOMFYxQTdUaVEKLT4gc3NoLWVkMjU1
+MTkgWXlTVU1RIE5HdGd6aTlKM0lFUlYzT1VhS05nZ2ZxTndVZHBNQlJxYlovdXkx
+ei96d2cKdzlUYVFFaEIzaS9LZmY3MzM1RmNnR0xjOEpHK1kxM0FMTWRQSlVnczVF
+dwotPiBzc2gtZWQyNTUxOSBuanZYNUEgQ1lhMGQvUy9OWkRBR3BZV1pFNmNtb2pq
+Y2VEUzhRWGVWUkZJY1l4RGtWdwphdFZtM0ZLZURvYVZQYjV4bWVPdWJxa3RmWmVh
+SHl0T0pQWmxnVlFPR2drCi0tLSBnd2lwS3dqUk5Jelg0b3RxbFdEcnJ6ZkkvZTVN
+UllBeUUyOXBxVDBKMG5BCkGo9kj9sMVhbnXVM35lGScAb8r5LH9vf5jOdhLC/Wj2
+uA0ONIh7F2GELzf5Cw1KZJ8aHTURM2r41vZvfAQN1RwrmYOiUzlyMrvTDe78cY=
+-----END AGE ENCRYPTED FILE-----
--- a/private/prometheus.age
+++ b/private/prometheus.age
@ -0,0 +1,12 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE1nSGFPdyBDRWNi
+YlJubmg1Ly94cHgxbHV3dStaRkZDRXdNZzVjRCt0R2RNMFkxUEZNCnJxZnc1UHFB
+MURselZuL1U5OHFQb0tPLytWelRzYXlvNngya3RQOXREUEkKLT4gc3NoLWVkMjU1
+MTkgWXlTVU1RIDRiR2ZEMUZsYTlGbXFoR0NyZXVXMEZmS3BONDNFQUo4VU1XNkZ0
+ZWFzMHcKM1crbDVsR2VmVTFNckxaa21MTW9UVWE3Z01qMi9VT0kwMm80V0tMSWM1
+bwotPiBzc2gtZWQyNTUxOSBuanZYNUEgd0tIampOVU5ZeWtxNWZpaGdFQTBlWlha
+Z0lBQWp0dzhMRHU5UnVzWVlUSQpnUHlCZ0w5Z1hMYm1Dc1UxQ1lLRHlnaUhJQllW
+RGMvTEhhc29VL2JXZnhNCi0tLSB6TThQbmV0eFJ0d2pZd1h0c2RuTGFzUHhyYWJp
+b2RhVTNkSXczRGJpN1UwCt7I+OsqQdQbFXhYPV5/kqDAr/jVoJ9H5PSfdLkeVIrr
+AqScUaOrdctUZEBIF8/FouJkSbIiU8muBNrBKx9CylI=
+-----END AGE ENCRYPTED FILE-----
--- a/templates/basic/.envrc
+++ b/templates/basic/.envrc
@ -1 +0,0 @@
-use flake
--- a/templates/basic/flake.lock
+++ b/templates/basic/flake.lock
@ -1,27 +0,0 @@
-{
-  "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
-}
--- a/templates/haskell/.envrc
+++ b/templates/haskell/.envrc
@ -1 +0,0 @@
-use flake
--- a/templates/haskell/flake.lock
+++ b/templates/haskell/flake.lock
@ -1,419 +0,0 @@
-{
-  "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
-}
--- a/templates/poetry/.envrc
+++ b/templates/poetry/.envrc
@ -1 +0,0 @@
-use flake . --no-use-registries
--- a/templates/python/.envrc
+++ b/templates/python/.envrc
@ -1 +0,0 @@
-use flake
Author	SHA1	Message	Date
Noah Masur	cce6f6573f	upgrade firefox to 115.0.2	2023-07-19 12:27:04 -04:00
Noah Masur	52b86efbb1	kitty tweaks, fix scrollback character issues	2023-07-18 23:36:09 -04:00
Noah Masur	f41774f641	neovim keybind to open specific file in gh web	2023-07-18 13:11:42 -04:00
Noah Masur	22cba9acac	use bind for local dns	2023-07-18 03:52:37 +00:00
Noah Masur	9e8bac6834	setup bind	2023-07-17 22:37:26 -04:00
Noah Masur	b07a8f5e20	auto empty trash on login	2023-07-17 22:24:41 -04:00
Noah Masur	8eb7ef0be7	fix avahi and dhcp, mark swan as physical	2023-07-18 02:00:38 +00:00
Noah Masur	22ab2acf66	fix: swan not using avahi because not set as physical	2023-07-17 11:38:08 -04:00
Noah Masur	d85e4b1593	fix: caddy denylist and jellyfin prometheus	2023-07-16 21:04:07 +00:00
Noah Masur	6ea99eca5d	enable caddy prometheus metrics	2023-07-16 20:13:41 +00:00
Noah Masur	60e779085e	add victoriametrics to tempest	2023-07-16 10:43:55 -04:00
Noah Masur	6abcdfa3bd	switch flame to victoriametrics	2023-07-16 14:43:14 +00:00
Noah Masur	0f0a64b5c4	add victoriametrics	2023-07-16 13:50:58 +00:00
Noah Masur	edb4ec77ca	set caddy prometheus port dynamically	2023-07-16 03:34:03 +00:00
Noah Masur	3cc264a857	fix: register gitea runner	2023-07-16 03:33:35 +00:00
Noah Masur	76a7480a1d	working prometheus setup with processes	2023-07-16 01:04:52 +00:00
Noah Masur	9d4bf082c7	fix: prometheus remote write	2023-07-14 02:52:23 +00:00
Noah Masur	e86b2f184f	fix: cloudflare tunnel on tempest requires openssh, but removing public key	2023-07-12 23:33:35 -04:00
Noah Masur	d14054ab17	update to nextcloud 27	2023-07-13 03:22:45 +00:00
Noah Masur	9b3d2e39c9	change nix run shortcut to nix shell	2023-07-10 16:01:01 -06:00
Noah Masur	5a1a843ecd	enable gitea actions and runner	2023-07-10 16:00:48 -06:00
Noah Masur	2ddd980436	clean up colorschemes	2023-07-09 23:06:36 -06:00
Noah Masur	febf1071af	remove flake locks from templates	2023-07-09 22:26:14 -06:00
Noah Masur	05adc8a221	add custom treesitter grammars	2023-07-09 17:22:41 -06:00
Noah Masur	a463212023	clarify neovimBuilder	2023-07-09 14:51:41 -06:00
Noah Masur	2457ade6eb	enable installed glow markdown plugin	2023-07-09 14:51:23 -06:00
Noah Masur	88d52614a9	prevent infinite neovim lsp log files	2023-07-09 14:51:02 -06:00
Noah Masur	2c663347ee	inject bash highlighting in nix shell scripts	2023-07-09 14:50:41 -06:00
Noah Masur	02fc29c482	update to firefox 115	2023-07-07 12:45:02 -06:00
Noah Masur	21cbe29bd8	create universal options for hostnames	2023-07-07 10:16:07 -06:00
Noah Masur	c0da8391ef	replace vscode tf snippets with larger one	2023-07-06 13:01:35 -06:00
Noah Masur	d4e203a04c	add vscode tf snippets, fix tf tree-sitter	2023-07-06 12:07:29 -06:00
Noah Masur	38480e0c0c	remove extraneous nixpkgs inputs	2023-07-05 14:23:19 -06:00
Noah Masur	ee58f7a4ee	abstract grafana in prometheus config	2023-07-05 14:19:54 -06:00
Noah Masur	4c4e250fa1	add cloudflare tunnel to tempest	2023-07-05 14:18:59 -06:00
Noah Masur	ffe867e6a8	have gitea actually backup full repos	2023-07-04 18:01:11 -06:00
Noah Masur	b599162090	fix: paren required on function	2023-07-04 17:21:53 -06:00
Noah Masur	4b0d68089a	fix: grafana settings schema	2023-07-04 17:15:04 -06:00
Noah Masur	b304e529b4	fix: nextcloud infinite recursion	2023-07-04 17:12:22 -06:00
Noah Masur	2b0f03ba1f	fix: mc server infinite recursion	2023-07-04 17:10:37 -06:00
Noah Masur	2c4f215b6e	define grafana settings explicitly	2023-07-04 17:05:56 -06:00
Noah Masur	066ea8e440	remote prometheus and reconfig server modules	2023-07-04 16:20:43 -06:00