flake.lock: Update

Flake lock file updates:

• Updated input 'devour-flake':
    'github:srid/devour-flake/17b711b9deadbbc5629cb7d2b64cf86ae72af3fa?narHash=sha256-Vey9n9hIlWiSAZ6CCTpkrL6jt4r2JvT2ik9wa2bjeC0%3D' (2024-03-08)
  → 'github:srid/devour-flake/9b96d31a55be119df8496ec5b7369823deec8a1c?narHash=sha256-Cvc84VzvvdmehafnaIPfdPylNWJcDmv79QQh/MH/4Qk%3D' (2024-09-14)
• Updated input 'disko':
    'github:nix-community/disko/e55f9a8678adc02024a4877c2a403e3f6daf24fe?narHash=sha256-tqoAO8oT6zEUDXte98cvA1saU9%2B1dLJQe3pMKLXv8ps%3D' (2024-09-03)
  → 'github:nix-community/disko/4ef99d8ec41369b6fbe83479b5566c2b8856972c?narHash=sha256-u/2xSCp/7sE7XViv6QR2jMw7Rrx/PXJtmeVLYv%2BQbpo%3D' (2024-09-13)
• Updated input 'firefox-addons':
    'gitlab:rycee/nur-expressions/dcdb13af1b383cd8173c6dae0dbe2ea63a584507?dir=pkgs/firefox-addons&narHash=sha256-lZO7blI%2BA3MTKePQ5ZDOWhun5kE62f6YVe6NNSbI%2BS4%3D' (2024-09-09)
  → 'gitlab:rycee/nur-expressions/70acbc15b24d567ce024a455ad2e93aa3302c9b0?dir=pkgs/firefox-addons&narHash=sha256-m6O7L5e%2B1Zv9XpI6zKbi7k4EzJgYoygzhU0ER6ZlXwU%3D' (2024-09-14)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/567b938d64d4b4112ee253b9274472dc3a346eb6?narHash=sha256-%2Bebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y%3D' (2024-09-01)
  → 'github:hercules-ci/flake-parts/bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a?narHash=sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U%3D' (2024-09-12)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/f4c846aee8e1e29062aa8514d5e0ab270f4ec2f9?narHash=sha256-L64N1rpLlXdc94H%2BF6scnrbuEu%2ButC03cDDVvvJGOME%3D' (2024-09-08)
  → 'github:NixOS/nixpkgs/44a71ff39c182edaf25a7ace5c9454e7cba2c658?narHash=sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM%3D' (2024-09-10)
• Updated input 'omnix':
    'github:juspay/omnix/4d9949f041798adaa351afbee98fdb7e25ff2029?narHash=sha256-2J0TtzkIpjeAfIZYU1ofzcPzvcCO1DXBMP2P7OPoQYg%3D' (2024-09-09)
  → 'github:juspay/omnix/eaa9f3e3dee251846d102813144328c08c62fb3a?narHash=sha256-kYL8a5T%2BlPH9eh91JzKKwDKFEpuh1StE4r3aTvNKWeE%3D' (2024-09-14)
• Added input 'omnix/nix-systems-aarch64-darwin':
    'github:nix-systems/aarch64-darwin/75e6c6912484d28ebba5769b794ffa4aff653ba2?narHash=sha256-PHVNQ7y0EQYzujQRYoRdb96K0m1KSeAjSrbz2b75S6Q%3D' (2023-04-08)
• Added input 'omnix/nix-systems-aarch64-linux':
    'github:nix-systems/aarch64-linux/aa1ce1b64c822dff925d63d3e771113f71ada1bb?narHash=sha256-1Zp7TRYLXj4P5FLhQ8jBChrgAmQxR3iTypmWf9EFTnc%3D' (2023-04-08)
• Added input 'omnix/nix-systems-x86_64-darwin':
    'github:nix-systems/x86_64-darwin/db0463cce4cd60fb791f33a83d29a1ed53edab9b?narHash=sha256-%2BxT9B1ZbhMg/zpJqd00S06UCZb/A2URW9bqqrZ/JTOg%3D' (2023-04-08)
• Added input 'omnix/nix-systems-x86_64-linux':
    'github:nix-systems/x86_64-linux/2ecfcac5e15790ba6ce360ceccddb15ad16d08a8?narHash=sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw%3D' (2023-04-08)
• Updated input 'stylix':
    'github:danth/stylix/ef81ad9e85e60420cc83d4642619c14b57139d33?narHash=sha256-%2BjwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo%3D' (2024-09-02)
  → 'github:danth/stylix/35233f929629c8eb64e939e35260fc8347f94df9?narHash=sha256-sobkRkGBaMX9pD0bwU1iVPWi0WtQvZqlHyl1YtvNDio%3D' (2024-09-12)
• Updated input 'unstable':
    'github:NixOS/nixpkgs/574d1eac1c200690e27b8eb4e24887f8df7ac27c?narHash=sha256-v3rIhsJBOMLR8e/RNWxr828tB%2BWywYIoajrZKFM%2B0Gg%3D' (2024-09-06)
  → 'github:NixOS/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f?narHash=sha256-IiA3jfbR7K/B5%2B9byVi9BZGWTD4VSbWe8VLpp9B/iYk%3D' (2024-09-11)

.github/workflows/ci.yml

@@ -1,4 +1,5 @@
 on:
+  workflow_dispatch:
   pull_request:
   push:
     branches:
@@ -22,4 +23,4 @@ jobs:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
           pushFilter: '(nerdfonts)'
           extraPullNames: nix-community, om
-      - run: nix run github:juspay/omnix -- ci run "."
+      - run: nix run github:juspay/omnix --accept-flake-config -- ci run "."

.github/workflows/clear-cache.yml

@@ -0,0 +1,30 @@
+name: Clear cache
+
+on:
+  workflow_dispatch:
+
+permissions:
+  actions: write
+
+jobs:
+  clear-cache:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clear cache
+        uses: actions/github-script@v6
+        with:
+          script: |
+            console.log("About to clear")
+            const caches = await github.rest.actions.getActionsCacheList({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            })
+            for (const cache of caches.data.actions_caches) {
+              console.log(cache)
+              github.rest.actions.deleteActionsCacheById({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                cache_id: cache.id,
+              })
+            }
+            console.log("Clear completed")

.github/workflows/update-flake.yml

@@ -2,7 +2,7 @@ name: Update flake inputs
 on:
   schedule:
     # Every day, 5am
-    - cron: "0 5 * * *"
+    - cron: "0 5 * * 6"
   workflow_dispatch:
 
 jobs:

flake.nix

@@ -8,9 +8,10 @@
     ...
   } @ inputs: let
     mods = import ./modules;
+    cLib = import ./lib {inherit (nixpkgs) lib;};
     mkLinuxSystem = mod:
       nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs;};
+        specialArgs = {inherit inputs cLib;};
         modules =
           [
             inputs.home-manager.nixosModules.home-manager
@@ -20,8 +21,8 @@
               nixpkgs.config.allowUnfree = true;
               nixpkgs.overlays = [self.overlays.default];
             }
-            mod
           ]
+          ++ mod
           ++ mods.sharedModules;
       };
   in
@@ -38,8 +39,8 @@
         inherit (mods) homeManagerModules nixosModules;
         # TODO: use ./hosts/
         nixosConfigurations = {
-          artemis = mkLinuxSystem ./hosts/artemis;
+          artemis = mkLinuxSystem [./hosts/artemis inputs.lanzaboote.nixosModules.lanzaboote];
-          hermes = mkLinuxSystem ./hosts/hermes;
+          hermes = mkLinuxSystem [./hosts/hermes];
         };
         diskoConfigurations = {}; # maybe?
         om.health.default = {nix-version.min-required = "2.18.5";};
@@ -159,5 +160,32 @@
 
     treefmt-nix.url = "github:numtide/treefmt-nix";
     treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
+
+    lanzaboote = {
+      url = "github:nix-community/lanzaboote/v0.4.1";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # my custom programs
+    nish = {
+      url = "github:callumio/nish";
+      inputs = {
+        nixpkgs.follows = "unstable";
+        flake-parts.follows = "flake-parts";
+        systems.follows = "systems";
+        treefmt-nix.follows = "treefmt-nix";
+        pre-commit-hooks.follows = "pre-commit-hooks";
+      };
+    };
+
+    nsbm = {
+      url = "github:callumio/nsbm";
+      inputs = {
+        nixpkgs.follows = "unstable";
+        treefmt-nix.follows = "treefmt-nix";
+        flake-parts.follows = "flake-parts";
+        systems.follows = "systems";
+      };
+    };
   };
 }

home/c/default.nix

@@ -19,6 +19,7 @@
   };
 
   home.packages = with pkgs; [
+    # TODO: sort this out
     gnome.adwaita-icon-theme
     networkmanagerapplet
     libsecret

home/c/programs/fish/default.nix

@@ -1,4 +1,14 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  cLib,
+  ...
+}: let
+  mkFishPlug = pkg: {
+    name = pkg.pname;
+    inherit (pkg) src;
+  };
+  tmux = cLib.getProgFor pkgs "tmux";
+in {
   programs.fish = {
     enable = true;
 
@@ -7,47 +17,27 @@
       trap __trap_exit_tmux EXIT
     '';
 
+    # TODO: dont use this directly
     shellAliases = {v = "nvim";};
 
     functions = {
       __trap_exit_tmux = {
         body = ''
-          test (tmux list-windows | wc -l) = 1 || exit
+          test (${tmux} list-windows | wc -l) = 1 || exit
-          test (tmux list-panes | wc -l) = 1 || exit
+          test (${tmux} list-panes | wc -l) = 1 || exit
-          tmux switch-client -t main
+          ${tmux} switch-client -t main
         '';
       };
     };
 
     plugins = with pkgs.fishPlugins; [
-      {
+      (mkFishPlug z)
-        name = "z";
+      (mkFishPlug hydro)
-        inherit (z) src;
+      (mkFishPlug sponge)
-      }
+      (mkFishPlug grc)
-      {
+      (mkFishPlug done)
-        name = "hydro";
+      (mkFishPlug fzf-fish)
-        inherit (hydro) src;
+      (mkFishPlug git-abbr)
-      }
-      {
-        name = "sponge";
-        inherit (sponge) src;
-      }
-      {
-        name = "grc";
-        inherit (grc) src;
-      }
-      {
-        name = "done";
-        inherit (done) src;
-      }
-      {
-        name = "fzf-fish";
-        inherit (fzf-fish) src;
-      }
-      {
-        name = "forgit";
-        inherit (forgit) src;
-      }
     ];
   };
 }

home/c/programs/git/default.nix

@@ -4,7 +4,7 @@
 
     userName = "Callum Leslie";
     userEmail = "git@cleslie.uk";
-    signing.key = "D382C4AFEECEAA90";
+    signing.key = "03B01F427831BCFD!";
     signing.signByDefault = true;
 
     ignores = [".direnv/"];
@@ -15,7 +15,7 @@
         contents = {
           user = {
             email = "psycl6@nottingham.ac.uk";
-            signingKey = "5A944DF89B6F65AC";
+            signingKey = "14861F1282EFB5C8!";
           };
           credential = {helper = "store";};
         };
@@ -34,6 +34,6 @@
       ghq = {root = "~/repos";};
     };
 
-    diff-so-fancy.enable = true;
+    delta.enable = true;
   };
 }

home/c/programs/hypr/default.nix

@@ -1,8 +1,32 @@
-{...}: {
+{
+  pkgs,
+  cLib,
+  ...
+}: let
+  getProgFor' = cLib.getProgFor' pkgs;
+  getProgFor = cLib.getProgFor pkgs;
+  web = getProgFor "firefox";
+  mail = getProgFor "betterbird";
+  chat = getProgFor "discord";
+  media = getProgFor "spotify";
+  terminal = getProgFor "alacritty";
+  runner = getProgFor' "rofi-wayland" "rofi";
+  rofi-rbw = getProgFor' "rofi-rbw-wayland" "rofi-rbw";
+  tmux = getProgFor "tmux";
+  slurp = getProgFor "slurp";
+  grim = getProgFor "grim";
+  wl-copy = getProgFor' "wl-clipboard" "wl-copy";
+  mullvad = getProgFor' "mullvad-vpn" "mullvad-gui";
+  playerctl = getProgFor "playerctl";
+  brightnessctl = getProgFor "brightnessctl";
+  wpctl = getProgFor' "wireplumber" "wpctl";
+  hyprlock = getProgFor "hyprlock";
+  hyprctl = getProgFor' "hyprland" "hyprctl";
+in {
   services = {
     blueman-applet.enable = true;
     network-manager-applet.enable = true;
-    kanshi.systemdTarget = "hyprland-session.target";
+    kanshi.systemdTarget = "graphical-session.target";
     udiskie = {
       enable = true;
       tray = "auto";
@@ -65,7 +89,7 @@
     enable = true;
     systemd.enable = true;
     xwayland.enable = true;
-    # TODO: move to nix config over text
+
     settings = {
       "monitor" = ",prefered,auto,1";
 
@@ -137,13 +161,13 @@
           "$mainMod SHIFT, q, exit"
           "$mainMod, F, fullscreen"
           "$mainMod SHIFT, f, togglefloating"
-          "$mainMod, d, exec, rofi -show drun"
+          "$mainMod, d, exec, ${runner} -show drun"
-          "$mainMod, w, exec, rofi -show window"
+          "$mainMod, w, exec, ${runner} -show window"
-          "$mainMod, p, exec, rofi-rbw --no-folder"
+          "$mainMod, p, exec, ${rofi-rbw} --no-folder"
           "$mainMod, s, togglesplit"
-          "$mainMod SHIFT, r, exec, hyprctl reload"
+          "$mainMod SHIFT, r, exec, ${hyprctl} reload"
-          "$mainMod, return, exec, alacritty -e tmux new -A -s main"
+          "$mainMod, return, exec, ${terminal} -e ${tmux} new -A -s main"
-          "$mainMod SHIFT, return, exec, [float; pin] alacritty -e tmux new -A -s main"
+          "$mainMod SHIFT, return, exec, [float; pin] ${terminal} -e ${tmux} new -A -s main"
 
           "$mainMod, b, workspace, name:web"
           "$mainMod, n, workspace, name:chat"
@@ -172,9 +196,9 @@
           "$mainMod SHIFT, l, movewindow, r"
           "$mainMod SHIFT, k, movewindow, u"
           "$mainMod SHIFT, j, movewindow, d"
-          ''SHIFT, Print, exec, grim -g "$(slurp)" - | wl-copy''
+          ''SHIFT, Print, exec, ${grim} -g "$(${slurp})" - | ${wl-copy}''
-          ", Print, exec, grim - | wl-copy"
+          ", Print, exec, ${grim} - | ${wl-copy}"
-          "$mainMod, 0, exec, hyprlock"
+          "$mainMod, 0, exec, ${hyprlock}"
         ]
         ++ (builtins.concatLists (builtins.genList (x: let
             ws = x + 1;
@@ -187,10 +211,10 @@
           9));
 
       workspace = [
-        "name:web, on-created-empty: firefox"
+        "name:web, on-created-empty: ${web}"
-        "name:chat, on-created-empty: discord"
+        "name:chat, on-created-empty: ${chat}"
-        "name:media, on-created-empty: spotify"
+        "name:media, on-created-empty: ${media}"
-        "name:mail, on-created-empty: betterbird"
+        "name:mail, on-created-empty: ${mail}"
       ];
 
       bindm = [
@@ -199,25 +223,19 @@
       ];
 
       bindle = [
-        ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
+        ", XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%+"
-        ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+        ", XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%-"
-        ", XF86AudioMute , exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+        ", XF86AudioMute , exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"
-        ", XF86AudioMicMute , exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
+        ", XF86AudioMicMute , exec, ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
-        ", XF86AudioPlay , exec, playerctl play-pause"
+        ", XF86AudioPlay , exec, ${playerctl} play-pause"
-        ", XF86AudioPause , exec, playerctl play-pause"
+        ", XF86AudioPause , exec, ${playerctl} play-pause"
-        ", XF86AudioNext , exec, playerctl next"
+        ", XF86AudioNext , exec, ${playerctl} next"
-        ", XF86AudioPrev , exec, playerctl previous"
+        ", XF86AudioPrev , exec, ${playerctl} previous"
-        ", XF86MonBrightnessUp, exec, brightnessctl -c backlight set +5%"
+        ", XF86MonBrightnessUp, exec, ${brightnessctl} -c backlight set +5%"
-        ", XF86MonBrightnessDown, exec, brightnessctl -c backlight set 5%-"
+        ", XF86MonBrightnessDown, exec, ${brightnessctl} -c backlight set 5%-"
       ];
 
-      exec = [
+      exec-once = [(toString mullvad)];
-        #"pkill wpaperd & sleep 0.5 && wpaperd"
-        #"pkill waybar & sleep 0.5 && waybar"
-        #"pkill mako & sleep 0.5 && mako"
-      ];
-
-      exec-once = ["mullvad-gui"];
     };
   };
 }

home/c/programs/nvim/.luarc.json

@@ -1,6 +0,0 @@
-{
-    "diagnostics.globals": [
-        "vim",
-				"lsp_on_attach"
-    ]
-}

home/c/programs/nvim/default.nix

@@ -1,313 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  programs.neovim = let
-    leaders = ''
-      vim.g.mapleader = ' '
-      vim.g.maplocalleader = ' '
-    '';
-    toLua = str: ''
-      lua << EOF
-      ${leaders}
-      ${str}
-      EOF
-    '';
-    toLuaFile = file: ''
-      lua << EOF
-      ${leaders}
-      ${builtins.readFile file}
-      EOF
-    '';
-    toLuaFileLSP = file: ''
-      lua << EOF
-      ${leaders}
-      ${builtins.readFile ./plugin/lsp/lsp-keys.lua}
-      ${builtins.readFile file}
-      EOF
-    '';
-
-    fromGit = ref: rev: repo:
-      pkgs.vimUtils.buildVimPlugin {
-        pname = "${lib.strings.sanitizeDerivationName repo}";
-        version = ref;
-        src = builtins.fetchGit {
-          url = "https://github.com/${repo}.git";
-          inherit ref;
-          inherit rev;
-        };
-      };
-
-    # always installs latest version
-    pluginGit = fromGit "HEAD";
-  in {
-    enable = true;
-
-    # package = pkgs.neovim-nightly;
-
-    extraPackages = with pkgs; [
-      # Rust
-      rust-analyzer
-      cargo
-      rustc
-      rustfmt
-
-      # YAML
-      yaml-language-server
-
-      # JSON
-      nodePackages.vscode-json-languageserver
-
-      # Go
-      gopls
-
-      # Typescript
-      nodePackages.typescript
-      nodePackages.typescript-language-server
-
-      # Javascript
-      eslint_d
-
-      # Python
-      nodePackages.pyright
-      black
-
-      # Util
-      ripgrep
-      fzf
-
-      # C-Family
-      clang-tools
-
-      # Shell
-      shellcheck
-      shfmt
-
-      # Lua
-      lua-language-server
-      selene
-      stylua
-
-      # Nix
-      rnix-lsp
-      nixfmt
-      statix
-
-      # LLM
-      ollama
-
-      # Haskell
-      haskellPackages.haskell-debug-adapter
-      haskellPackages.haskell-language-server
-      haskellPackages.fourmolu
-      ghc
-
-      # Docker
-      dockerfile-language-server-nodejs
-      docker-compose-language-service
-    ];
-
-    defaultEditor = true;
-
-    viAlias = true;
-    vimAlias = true;
-    vimdiffAlias = true;
-
-    extraLuaConfig = ''
-      ${builtins.readFile ./options.lua}
-    '';
-
-    plugins = with pkgs.vimPlugins; [
-      {
-        plugin = nvim-lspconfig;
-        config = toLuaFileLSP ./plugin/lsp/lsp.lua;
-      }
-
-      {
-        plugin = crates-nvim;
-        config = toLua "require('crates').setup()";
-      }
-
-      {
-        plugin = rustaceanvim;
-        config = toLuaFileLSP ./plugin/lsp/rust.lua;
-      }
-
-      {
-        plugin = haskell-tools-nvim;
-        config = toLuaFileLSP ./plugin/lsp/haskell.lua;
-      }
-
-      {
-        plugin = SchemaStore-nvim;
-        config = toLuaFileLSP ./plugin/lsp/schemastore.lua;
-      }
-
-      {
-        plugin = todo-comments-nvim;
-        config =
-          toLua
-          "require('todo-comments').setup(); vim.api.nvim_set_keymap('n', '<leader>vtd', ':TodoTelescope<CR>', { noremap = true });";
-      }
-
-      {
-        plugin = comment-nvim;
-        config = toLua "require('Comment').setup()";
-      }
-
-      {
-        plugin = onedark-nvim;
-        config = "colorscheme onedark";
-      }
-
-      neodev-nvim
-
-      {
-        plugin = nvim-cmp;
-        config = toLuaFile ./plugin/cmp.lua;
-      }
-
-      {
-        plugin = telescope-nvim;
-        config = toLuaFile ./plugin/telescope.lua;
-      }
-
-      {
-        plugin =
-          pluginGit "951b163e55ce7639eb320c450bde9283c4fe968b"
-          "laytan/cloak.nvim";
-        config = toLuaFile ./plugin/cloak.lua;
-      }
-
-      {
-        plugin =
-          pluginGit "41ad952c8269fa7aa3a4b8a5abb44541cb628313"
-          "David-Kunz/gen.nvim";
-        config = toLuaFile ./plugin/gen.lua;
-      }
-
-      {
-        plugin = nvim-dap;
-        config = toLuaFile ./plugin/debugger.lua;
-      }
-
-      {
-        plugin =
-          pluginGit "fd35a46f4b7c1b244249266bdcb2da3814f01724"
-          "xiyaowong/transparent.nvim";
-        config = toLua "require('transparent').setup{}";
-      }
-
-      nvim-dap-ui
-      telescope-dap-nvim
-      nvim-dap-virtual-text
-
-      telescope-fzf-native-nvim
-
-      cmp_luasnip
-      cmp-nvim-lsp
-
-      luasnip
-      friendly-snippets
-
-      {
-        plugin = hardtime-nvim;
-        config = toLua "require('hardtime').setup()";
-      }
-
-      {
-        plugin = nvim-surround;
-        config = toLua "require('nvim-surround').setup{}";
-      }
-
-      {
-        plugin = harpoon;
-        config = toLuaFile ./plugin/harpoon.lua;
-      }
-
-      {
-        plugin = lualine-nvim;
-        config =
-          toLua
-          "require('lualine').setup{options = {icons_enabled = true, theme = 'onedark', component_separators = '|', section_separators = ''}, sections = { lualine_a = { { 'buffers', } } }}";
-      }
-
-      {
-        plugin = nvim-autopairs;
-        config = toLua "require('nvim-autopairs').setup {}";
-      }
-
-      {
-        plugin = leap-nvim;
-        config = toLua "require('leap.user').add_default_mappings()";
-      }
-
-      {
-        plugin = none-ls-nvim;
-        config = toLuaFile ./plugin/lsp/none-ls.lua;
-      }
-
-      {
-        plugin = oil-nvim;
-        config = toLuaFile ./plugin/oil.lua;
-      }
-
-      {
-        plugin = zen-mode-nvim;
-        config = toLuaFile ./plugin/zen.lua;
-      }
-      twilight-nvim
-
-      nvim-web-devicons
-
-      {
-        plugin = undotree;
-        config =
-          toLua "vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)";
-      }
-
-      {
-        plugin = gitsigns-nvim;
-        config = toLuaFile ./plugin/gitsigns.lua;
-      }
-
-      {
-        plugin = nvim-treesitter.withPlugins (p: [
-          p.tree-sitter-nix
-          p.tree-sitter-vim
-          p.tree-sitter-bash
-          p.tree-sitter-lua
-          p.tree-sitter-python
-          p.tree-sitter-rust
-          p.tree-sitter-json
-          p.tree-sitter-c
-          p.tree-sitter-comment
-          p.tree-sitter-javascript
-          p.tree-sitter-fish
-          p.tree-sitter-dockerfile
-          p.tree-sitter-cpp
-          p.tree-sitter-git_config
-          p.tree-sitter-git_rebase
-          p.tree-sitter-gitattributes
-          p.tree-sitter-gitcommit
-          p.tree-sitter-gitignore
-          p.tree-sitter-markdown
-          p.tree-sitter-markdown_inline
-          p.tree-sitter-make
-          p.tree-sitter-norg
-          p.tree-sitter-ssh_config
-          p.tree-sitter-typescript
-          p.tree-sitter-tsx
-          p.tree-sitter-haskell
-          p.tree-sitter-yaml
-          p.tree-sitter-zig
-        ]);
-        config = toLuaFile ./plugin/treesitter.lua;
-      }
-
-      vim-nix
-    ];
-  };
-}

home/c/programs/tmux/bar.patch

@@ -0,0 +1,24 @@
+diff --git a/tmux-onedark-theme.tmux b/tmux-onedark-theme.tmux
+index e440cc7..33ba373 100755
+--- a/tmux-onedark-theme.tmux
++++ b/tmux-onedark-theme.tmux
+@@ -75,14 +75,14 @@ set "status-fg" "$onedark_white"
+ set "@prefix_highlight_fg" "$onedark_black"
+ set "@prefix_highlight_bg" "$onedark_green"
+ set "@prefix_highlight_copy_mode_attr" "fg=$onedark_black,bg=$onedark_green"
+-set "@prefix_highlight_output_prefix" "  "
++set "@prefix_highlight_output_prefix" "  "
+ 
+ status_widgets=$(get "@onedark_widgets")
+ time_format=$(get "@onedark_time_format" "%R")
+ date_format=$(get "@onedark_date_format" "%d/%m/%Y")
+ 
+-set "status-right" "#[fg=$onedark_white,bg=$onedark_black,nounderscore,noitalics]${time_format}  ${date_format} #[fg=$onedark_visual_grey,bg=$onedark_black]#[fg=$onedark_visual_grey,bg=$onedark_visual_grey]#[fg=$onedark_white, bg=$onedark_visual_grey]${status_widgets} #[fg=$onedark_green,bg=$onedark_visual_grey,nobold,nounderscore,noitalics]#[fg=$onedark_black,bg=$onedark_green,bold] #h #[fg=$onedark_yellow, bg=$onedark_green]#[fg=$onedark_red,bg=$onedark_yellow]"
+-set "status-left" "#[fg=$onedark_black,bg=$onedark_green,bold] #S #{prefix_highlight}#[fg=$onedark_green,bg=$onedark_black,nobold,nounderscore,noitalics]"
++set "status-right" "#[fg=$onedark_white,bg=$onedark_black,nounderscore,noitalics]${time_format}  ${date_format} #[fg=$onedark_visual_grey,bg=$onedark_black]#[fg=$onedark_visual_grey,bg=$onedark_visual_grey]#[fg=$onedark_white, bg=$onedark_visual_grey]${status_widgets} #[fg=$onedark_green,bg=$onedark_visual_grey,nobold,nounderscore,noitalics]#[fg=$onedark_black,bg=$onedark_green,bold] #h #[fg=$onedark_yellow, bg=$onedark_green]#[fg=$onedark_red,bg=$onedark_yellow]"
++set "status-left" "#[fg=$onedark_black,bg=$onedark_green,bold] #S #{prefix_highlight}#[fg=$onedark_green,bg=$onedark_black,nobold,nounderscore,noitalics]"
+ 
+-set "window-status-format" "#[fg=$onedark_black,bg=$onedark_black,nobold,nounderscore,noitalics]#[fg=$onedark_white,bg=$onedark_black] #I  #W #[fg=$onedark_black,bg=$onedark_black,nobold,nounderscore,noitalics]"
+-set "window-status-current-format" "#[fg=$onedark_black,bg=$onedark_visual_grey,nobold,nounderscore,noitalics]#[fg=$onedark_white,bg=$onedark_visual_grey,nobold] #I  #W #[fg=$onedark_visual_grey,bg=$onedark_black,nobold,nounderscore,noitalics]"
++set "window-status-format" "#[fg=$onedark_black,bg=$onedark_black,nobold,nounderscore,noitalics]#[fg=$onedark_white,bg=$onedark_black] #I  #W #[fg=$onedark_black,bg=$onedark_black,nobold,nounderscore,noitalics]"
++set "window-status-current-format" "#[fg=$onedark_black,bg=$onedark_visual_grey,nobold,nounderscore,noitalics]#[fg=$onedark_white,bg=$onedark_visual_grey,nobold] #I  #W #[fg=$onedark_visual_grey,bg=$onedark_black,nobold,nounderscore,noitalics]"

home/c/programs/tmux/default.nix

@@ -1,4 +1,13 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  cLib,
+  ...
+}: let
+  getProgFor = cLib.getProgFor pkgs;
+  getProgFor' = cLib.getProgFor' pkgs;
+  tmux = getProgFor "tmux";
+  tmux-sessionizer = getProgFor' "tmux-sessionizer-cl" "tmux-sessionizer";
+in {
   programs.tmux = {
     enable = true;
     shortcut = "x";
@@ -11,15 +20,15 @@
       sensible
       yank
       {
-        plugin = onedark-theme;
+        plugin = onedark-theme.overrideAttrs (_: {
+          patches = [./bar.patch];
+        });
         extraConfig = "\n";
       }
       {
         plugin = resurrect;
         extraConfig = ''
-          set -g @resurrect-strategy-vim 'session'
+          set -g @resurrect-capture-pane-contents 'off'
-          set -g @resurrect-strategy-nvim 'session'
-          set -g @resurrect-capture-pane-contents 'on'
         '';
       }
       {
@@ -42,9 +51,9 @@
       bind \\ split-window -v -c "#{pane_current_path}"
       bind c new-window -c "#{pane_current_path}"
 
-      bind-key -r s run-shell "tmux display-popup -E 'tmux-sessionizer -s'"
+      bind-key -r s run-shell "${tmux} display-popup -E '${tmux-sessionizer} -s'"
-      bind-key -r f run-shell "tmux display-popup -E 'tmux-sessionizer -p'"
+      bind-key -r f run-shell "${tmux} display-popup -E '${tmux-sessionizer} -p'"
-      bind-key -r m run-shell "tmux switch-client -t main"
+      bind-key -r m run-shell "${tmux} switch-client -t main"
       bind S choose-tree
 
       bind -r k select-pane -U
@@ -53,8 +62,4 @@
       bind -r l select-pane -R
     '';
   };
-
-  home.packages = [
-    pkgs.tmux-sessionizer-cl
-  ];
 }

home/c/programs/waybar/default.nix

@@ -1,4 +1,10 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  cLib,
+  ...
+}: let
+  soundControl = cLib.getProgFor pkgs "pwvucontrol";
+in {
   programs.waybar = {
     enable = true;
     package = pkgs.waybar.override {
@@ -35,7 +41,7 @@
           tooltip = false;
         };
         wireplumber = {
-          on-click = "${pkgs.pwvucontrol}/bin/pwvucontrol";
+          on-click = toString soundControl;
           format = "{icon}  {volume}%";
           format-muted = "";
           format-icons = ["" "" ""];

home/c/services/default.nix

@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
   imports = [./mako ./kanshi];
   services = {
     network-manager-applet.enable = true;
@@ -6,6 +6,7 @@
     gpg-agent = {
       enable = true;
       enableSshSupport = true;
+      pinentryPackage = pkgs.pinentry-gnome3;
     };
   };
 }

hosts/artemis/configuration.nix

@@ -31,11 +31,15 @@
     vim
     gnome.adwaita-icon-theme
     wget
+    pinentry
     fzf
     nil
     killall
     gcc
     pkg-config
+    sbctl
+    nish
+    nsbm
   ];
 
   environment = {
@@ -43,10 +47,7 @@
     sessionVariables = {NIXOS_OZONE_WL = "1";};
 
     shells = with pkgs; [fish];
-
-    # etc."greetd/environments".text = ''
-    #   hyprland
-    # '';
   };
+
   fonts.packages = with pkgs; [nerdfonts meslo-lgs-nf];
 }

hosts/artemis/hardware-configuration.nix

@@ -13,6 +13,12 @@
     kernelModules = ["kvm-intel"];
     extraModulePackages = [];
     #kernelPackages = pkgs.linuxPackages_latest;
+
+    loader.systemd-boot.enable = lib.mkForce false;
+    lanzaboote = {
+      enable = true;
+      pkiBundle = "/etc/secureboot";
+    };
   };
   hardware = {
     bluetooth = {

hosts/artemis/home.nix

@@ -1,4 +1,8 @@
-{inputs, ...}: {
+{
+  inputs,
+  cLib,
+  ...
+}: {
   programs.hyprlock.enable = true;
   security.pam.services.hyprlock = {};
   home-manager = {
@@ -11,6 +15,6 @@
       inputs.self.homeManagerModules.trayscale
     ];
     users.c = import ../../home/c;
-    extraSpecialArgs = {inherit inputs;};
+    extraSpecialArgs = {inherit inputs cLib;};
   };
 }

hosts/hermes/containers.nix

@@ -7,7 +7,7 @@
       flaresolverr = {
         #image = "ghcr.io/flaresolverr/flaresolverr:latest";
         #image = "ghcr.io/flaresolverr/flaresolverr:pr-1282";
-        image = "docker.io/alexfozor/flaresolverr:pr-1300";
+        image = "docker.io/alexfozor/flaresolverr:pr-1300-experimental";
         autoStart = true;
         ports = ["127.0.0.1:8191:8191"];
         environment = {

hosts/hermes/ddns.nix

@@ -0,0 +1,13 @@
+{config, ...}: {
+  services.cloudflare-dyndns = {
+    enable = true;
+    ipv4 = true;
+    ipv6 = false;
+    proxied = false;
+    deleteMissing = false;
+    domains = [];
+    apiTokenFile = config.age.secrets.cloudflare-api.path;
+  };
+  # services.cloudflare-dyndns.domains = [];
+  age.secrets."cloudflare-api".file = ../../secrets/cloudflare-api.age;
+}

hosts/hermes/default.nix

@@ -2,11 +2,14 @@
   imports = [
     ./hardware-configuration.nix
     ./configuration.nix
+    ./ddns.nix
+    ./quassel.nix
     ./fail2ban.nix
     ./containers.nix
     ./networking.nix
     ./ssh.nix
     ./media.nix
     ./headscale.nix
+    ./forgejo.nix
   ];
 }

hosts/hermes/forgejo.nix

@@ -0,0 +1,40 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  domain = "git.cleslie.uk";
+in {
+  services = {
+    cloudflare-dyndns.domains = [domain];
+    forgejo = {
+      enable = true;
+      database.type = "postgres";
+      settings = {
+        server = {
+          #DOMAIN = domain;
+          ROOT_URL = "https://${domain}";
+          HTTP_PORT = 3000;
+          SSH_PORT = builtins.head config.services.openssh.ports;
+        };
+        service.DISABLE_REGISTRATION = true;
+      };
+    };
+
+    caddy.virtualHosts.${domain}.extraConfig = ''
+      reverse_proxy localhost:${toString config.services.forgejo.settings.server.HTTP_PORT}
+    '';
+  };
+
+  systemd.services.forgejo.preStart = ''
+    admin="${lib.getExe config.services.forgejo.package} admin user"
+    $admin create --admin --email "git@cleslie.uk" --username cleslie --password "$(tr -d '\n' < ${config.age.secrets.forgejo-password.path})" || true
+    # $admin change-password --username cleslie --password "$(tr -d '\n' < ${config.age.secrets.forgejo-password.path})" || true
+  '';
+
+  age.secrets."forgejo-password" = {
+    file = ../../secrets/forgejo-password.age;
+    mode = "400";
+    owner = "forgejo";
+  };
+}

hosts/hermes/headscale.nix

@@ -13,6 +13,7 @@ in {
         ip_prefixes = "100.64.0.0/10";
       };
     };
+    cloudflare-dyndns.domains = [domain];
     caddy.virtualHosts.${domain}.extraConfig = ''
       reverse_proxy localhost:${toString config.services.headscale.port}
     '';

hosts/hermes/media.nix

@@ -85,6 +85,8 @@ in {
       };
     };
 
+    cloudflare-dyndns.domains = ["media.cleslie.uk" "watch.cleslie.uk" "request.cleslie.uk"];
+
     jellyfin = {
       enable = true;
       package = pkgs.jellyfin;

hosts/hermes/quassel.nix

@@ -0,0 +1,6 @@
+{...}: {
+  services.quassel = {
+    enable = true;
+    interfaces = ["0.0.0.0"];
+  };
+}

justfile

@@ -5,10 +5,14 @@ alias r := rebuild
 alias v := vim
 alias u := update
 alias c := cache
+alias d := deploy
 
 rebuild:
 	sudo nixos-rebuild switch --flake .#
 
+deploy MACHINE:
+	nix run .#deploy-{{MACHINE}}
+
 vim:
   nix flake lock --update-input nixvim
 

lib/default.nix

@@ -0,0 +1,6 @@
+{lib, ...}: let
+  getProgFor' = pkgs: prog: progn: lib.getExe' pkgs.${prog} progn;
+  getProgFor = pkgs: prog: getProgFor' pkgs prog prog;
+in {
+  inherit getProgFor getProgFor';
+}

modules/trayscale.nix

@@ -28,7 +28,7 @@ in {
       Unit = {
         Description = "An unofficial GUI wrapper around the Tailscale CLI client";
         Requires = ["tray.target"];
-        After = ["graphical-session-pre.target" "tray.target"];
+        After = ["graphical-session-pre.target" "tray.target" "tailscaled.service"];
         PartOf = ["graphical-session.target"];
       };
       Install = {WantedBy = ["graphical-session.target"];};

packages/default.nix

@@ -9,6 +9,8 @@
   agenix = inputs'.agenix.packages.default;
   vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
   devour-flake = pkgs.callPackage inputs.devour-flake {};
+  nish = inputs'.nish.packages.default;
+  nsbm = inputs'.nsbm.packages.default;
   jellyfin-ffmpeg = pkgs.jellyfin-ffmpeg.override {
     ffmpeg_6-full = pkgs.ffmpeg_6-full.override {
       withMfx = false;

secrets/cloudflare-api.age

@@ -0,0 +1,8 @@
+age-encryption.org/v1
+-> ssh-ed25519 /RyXeg p2ROUhWiDQDOjALQnhhf566js8ivYTsgwNfCaaoe6yQ
+UnCc2/4lb+PxnrKdAPVqwAyXavFGr8M3NV3+fSSdAU0
+-> ssh-ed25519 aSaoJQ hHqpvUCaH5RLAQwTdH1llfF/0aTraXtl25qFDaFhUwk
++4VMHc3PGR9HBlVTw4anbYORQPgFl24WGF5pwmt7w20
+--- qa7ctM764SNg3u/ITk+6DRXbLqF1Lom1xgKysY9DrkE
+ô›Zš¾;Qš
+7î‡kÔ4%ú½#<08>ŸÞåpqÃÅâvìyú]
ièeǺð]
É©i¾Ó!4Ø=ÇsŒä‰<C3A4>JfÉpúH«sæò29½¥œs¯åF}µ‘˪—#ói8ù

secrets/forgejo-password.age

@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 /RyXeg IjBz5+4Rk9Rg+jBgKWo/B5IoZmq/wTCWcqZRB/5lhAU
+E2bov9sYropmovrjqTItnLLzgEECt6+9iD2zjHLvXbU
+-> ssh-ed25519 aSaoJQ Rjq+7b3BFCrUFuVQhvrpxm8i4D7jpkkLleu36r4cinM
+HpdvPeOUqUOxdcsnBd5QWiU00Di7xcKHLstI8Z9p6EM
+--- 3Ku+G1FBZdVdS31q7fKd68Ai+FkD1rJg0eSKpYLd+2c
+_ÎPEÚ ú#]¬ȼ<17>ìlX‚“"ý¬ba·4¢Õ–•Aƒl­G8Œsot ~ióþé#/ib¡Î1eôµ7Þ›³ÿù

secrets/mesh-conf-cleslie.age

@@ -1,9 +1,9 @@
 age-encryption.org/v1
--> ssh-ed25519 /RyXeg RCXNBh7g6+X5buZJdDCd52elfUAnzgOUfINsdGCAcUg
+-> ssh-ed25519 /RyXeg 9XOLVh3LUWmQD98tT0JVXV87VObvZLYdEpFZfbdF0xg
-0MOZk6dC51NyFWBu/4+6XY9bMgQ9JoCv6ekH9eaghI0
+ekxCG1bf0dBtxYn4MRNj5BrwfOEJQpH7NOLRGFTFfuo
--> ssh-ed25519 ejjLpg ILRsr6hHJZrX4ssD1hj8FEH8VhqIouHpdLX0phc8qiM
+-> ssh-ed25519 ejjLpg GmmHEVNJCsf4ABHzKSSkHmjqg4hblBvB/ob/223u1yY
-0G6VMYbLtq+HcYurP8AIT5qCrLbQJQEpyyqNmRrjJ7I
+Dh+VB4Z4eYyZBq7+ygyFCh9UuUrczcgAfGs4ZwG87bo
--> ssh-ed25519 aSaoJQ OVpC763FiqHOaD+uThjZcXgi215AE07aXitPi6Ar3wE
+-> ssh-ed25519 aSaoJQ OIxgxGcuSoXb7S6Ae8+zf3DIKQzsGq0/W7i9I9MRfy4
-UGQ4Nnnxi2Z57XPJ+9DCUV+/U7aC+Wuprv4JcEHkFqE
+jhujSlaLTbtlUwIMeT8sVXPlh6gizyQ7GvI7Smk51mA
---- ulRUBJuSDAodVNUVviwGJAYe7l/FOzVNNiQaVzGUWnI
+--- GRaOmf1hUdTF6KiamM+U9yW/QerPtQSmLEnPVdlk5Zw
-òÊÈë&‡¬(fsR…v•Kp¬**/-~jž&I-Ô³²/ÄpdEÑÂ$u*öànëÓPnïëïA0Ž–_ìE–ëû‰ÒÏôÿ6·´
+ÄsOà…-r*S0'ïÄ™s*¢öq`x¢O¸p8¾_ÏÑ—6"¡l7Çø^î‹Ø«ð@"êuî^øïjÜ9„´d÷½ÑËŠ2Óïè²€/ª»

secrets/secrets.nix

@@ -9,4 +9,6 @@ in {
   "wg-conf.age".publicKeys = keys.c ++ allSystems;
   "mesh-conf-infra.age".publicKeys = keys.c ++ allSystems;
   "mesh-conf-cleslie.age".publicKeys = keys.c ++ allSystems;
+  "forgejo-password.age".publicKeys = keys.c ++ [systems.hermes];
+  "cloudflare-api.age".publicKeys = keys.c ++ [systems.hermes];
 }