Merge remote-tracking branch 'origin' into nix-self-hosted

Reviewed-on: #12

defaults/k9s/catppuccin-mocha.yaml

@@ -0,0 +1,100 @@
+k9s:
+  body:
+    fgColor: '#cdd6f4'
+    bgColor: '#1e1e2e'
+    logoColor: '#cba6f7'
+  prompt:
+    fgColor: '#cdd6f4'
+    bgColor: '#181825'
+    suggestColor: '#89b4fa'
+  help:
+    fgColor: '#cdd6f4'
+    bgColor: '#1e1e2e'
+    sectionColor: '#a6e3a1'
+    keyColor: '#89b4fa'
+    numKeyColor: '#eba0ac'
+  frame:
+    title:
+      fgColor: '#94e2d5'
+      bgColor: '#1e1e2e'
+      highlightColor: '#f5c2e7'
+      counterColor: '#f9e2af'
+      filterColor: '#a6e3a1'
+    border:
+      fgColor: '#cba6f7'
+      focusColor: '#b4befe'
+    menu:
+      fgColor: '#cdd6f4'
+      keyColor: '#89b4fa'
+      numKeyColor: '#eba0ac'
+    crumbs:
+      fgColor: '#1e1e2e'
+      bgColor: '#eba0ac'
+      activeColor: '#f2cdcd'
+    status:
+      newColor: '#89b4fa'
+      modifyColor: '#b4befe'
+      addColor: '#a6e3a1'
+      pendingColor: '#fab387'
+      errorColor: '#f38ba8'
+      highlightColor: '#89dceb'
+      killColor: '#cba6f7'
+      completedColor: '#6c7086'
+  info:
+    fgColor: '#fab387'
+    sectionColor: '#cdd6f4'
+  views:
+    table:
+      fgColor: '#cdd6f4'
+      bgColor: '#1e1e2e'
+      cursorFgColor: '#313244'
+      cursorBgColor: '#45475a'
+      markColor: '#f5e0dc'
+      header:
+        fgColor: '#f9e2af'
+        bgColor: '#1e1e2e'
+        sorterColor: '#89dceb'
+    xray:
+      fgColor: '#cdd6f4'
+      bgColor: '#1e1e2e'
+      cursorColor: '#45475a'
+      cursorTextColor: '#1e1e2e'
+      graphicColor: '#f5c2e7'
+    charts:
+      bgColor: '#1e1e2e'
+      chartBgColor: '#1e1e2e'
+      dialBgColor: '#1e1e2e'
+      defaultDialColors:
+        - '#a6e3a1'
+        - '#f38ba8'
+      defaultChartColors:
+        - '#a6e3a1'
+        - '#f38ba8'
+      resourceColors:
+        cpu:
+          - '#cba6f7'
+          - '#89b4fa'
+        mem:
+          - '#f9e2af'
+          - '#fab387'
+    yaml:
+      keyColor: '#89b4fa'
+      valueColor: '#cdd6f4'
+      colonColor: '#a6adc8'
+    logs:
+      fgColor: '#cdd6f4'
+      bgColor: '#1e1e2e'
+      indicator:
+        fgColor: '#b4befe'
+        bgColor: '#1e1e2e'
+        toggleOnColor: '#a6e3a1'
+        toggleOffColor: '#a6adc8'
+  dialog:
+    fgColor: '#f9e2af'
+    bgColor: '#9399b2'
+    buttonFgColor: '#1e1e2e'
+    buttonBgColor: '#7f849c'
+    buttonFocusFgColor: '#1e1e2e'
+    buttonFocusBgColor: '#f5c2e7'
+    labelFgColor: '#f5e0dc'
+    fieldFgColor: '#cdd6f4'

defaults/nvim/lua/community.lua

@@ -12,6 +12,9 @@ return {
   -- { import = "astrocommunity.pack.go "}, -- golang support
   { import = "astrocommunity.pack.fish" }, -- fish support
   -- { import = "astrocommunity.pack.cs" }, -- csharp/dotnet support
+  { import = "astrocommunity.completion.copilot-lua" }, -- copilot
+  { import = "astrocommunity.completion.copilot-lua-cmp" }, -- copilot
+  { import = "astrocommunity.recipes.heirline-mode-text-statusline" }, -- statusline customization
 
   -- import/override with your plugins folder
 }

defaults/nvim/lua/plugins/mappings.lua

@@ -0,0 +1,56 @@
+local function toggle_tui(cmd, direction, size)
+  local terminal
+  local dir = direction or "float"
+  local term_size = size
+
+  return function()
+    if not terminal then
+      local Terminal = require("toggleterm.terminal").Terminal
+      terminal = Terminal:new {
+        cmd = cmd,
+        hidden = true,
+        close_on_exit = true,
+        direction = dir,
+        on_open = function() vim.cmd "startinsert!" end,
+      }
+    end
+
+    terminal:toggle(term_size, dir)
+  end
+end
+
+local toggle_k9s = toggle_tui "k9s"
+local toggle_ghdash = toggle_tui "gh-dash"
+local toggle_ai_opencode = toggle_tui("opencode", "vertical", 80)
+local toggle_ai_copilot = toggle_tui("copilot", "vertical", 80)
+
+return {
+  {
+    "AstroNvim/astrocore",
+    ---@type AstroCoreOpts
+    opts = {
+      mappings = {
+        n = {
+          ["<Leader>k"] = { desc = "Kubernetes" },
+          ["<Leader>ki"] = {
+            toggle_k9s,
+            desc = "K9s",
+          },
+          ["<Leader>gD"] = {
+            toggle_ghdash,
+            desc = "GitHub dashboard",
+          },
+          ["<Leader>a"] = { desc = "AI" },
+          ["<Leader>ao"] = {
+            toggle_ai_opencode,
+            desc = "opencode",
+          },
+          ["<Leader>ag"] = {
+            toggle_ai_copilot,
+            desc = "GH Copilot",
+          },
+        },
+      },
+    },
+  },
+}

defaults/sway/config

@@ -198,8 +198,8 @@ bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
 bindsym XF86AudioPlay exec playerctl play-pause
 bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
-bindsym XF86MonBrightnessUp exec light -A 5
+bindsym XF86MonBrightnessUp exec brightnessctl set +5%
-bindsym XF86MonBrightnessDown exec light -U 5
+bindsym XF86MonBrightnessDown exec brightnessctl set 5%-
 
 ### Lock the screen
 bindsym $mod+Ctrl+q 'swaylock -f -i /home/wyatt/.wallpaper/.wallpaper_lock.png'

flake.lock

@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1774186997,
+        "lastModified": 1780372639,
-        "narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=",
+        "narHash": "sha256-VFzXYHlIGwO4h4ovtnpZj9sX/Qu6+dlI00sXjHdwi2w=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd",
+        "rev": "1ee1e8864a1fcfcc21a5fb5af4bd328b3c829f42",
         "type": "github"
       },
       "original": {
@@ -29,16 +29,37 @@
         ]
       },
       "locked": {
-        "lastModified": 1772129556,
+        "lastModified": 1781190061,
-        "narHash": "sha256-Utk0zd8STPsUJPyjabhzPc5BpPodLTXrwkpXBHYnpeg=",
+        "narHash": "sha256-QRMpLbsmlciMGv4yx75FUoIl54K02JbIX1tgdPHPw1s=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "ebec37af18215214173c98cf6356d0aca24a2585",
+        "rev": "f2b3fdb347f91dfd344ad196666a0b0fe8aad05c",
         "type": "github"
       },
       "original": {
         "owner": "lnl7",
-        "ref": "nix-darwin-25.11",
+        "ref": "nix-darwin-26.05",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "darwin_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1779036909,
+        "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "rev": "56c666e108467d87d13508936aade6d567f2a501",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LnL7",
         "repo": "nix-darwin",
         "type": "github"
       }
@@ -59,32 +80,121 @@
         "type": "github"
       }
     },
-    "flake-schemas": {
+    "flake-compat_2": {
+      "flake": false,
       "locked": {
-        "lastModified": 1761577921,
+        "lastModified": 1767039857,
-        "narHash": "sha256-eK3/xbUOrxp9fFlei09XNjqcdiHXxndzrTXp7jFpOk8=",
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "rev": "47849c7625e223d36766968cc6dc23ba0e135922",
+        "owner": "NixOS",
-        "revCount": 107,
+        "repo": "flake-compat",
-        "type": "tarball",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.2.0/019a4a84-544d-7c59-b26d-e334e320c932/source.tar.gz"
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
+        "owner": "NixOS",
-        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
+        "repo": "flake-compat",
+        "type": "github"
       }
     },
-    "flake-schemas_2": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1761577921,
+        "lastModified": 1731533236,
-        "narHash": "sha256-eK3/xbUOrxp9fFlei09XNjqcdiHXxndzrTXp7jFpOk8=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "rev": "47849c7625e223d36766968cc6dc23ba0e135922",
+        "owner": "numtide",
-        "revCount": 107,
+        "repo": "flake-utils",
-        "type": "tarball",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.2.0/019a4a84-544d-7c59-b26d-e334e320c932/source.tar.gz"
+        "type": "github"
       },
       "original": {
-        "type": "tarball",
+        "owner": "numtide",
-        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "go-overlay",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778507602,
+        "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "go-overlay",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "go-overlay": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "git-hooks": "git-hooks",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1781239934,
+        "narHash": "sha256-bK84gDc7MgPdoQfr4k1oSIsdA9pSXVjEc3QPpVFGRPs=",
+        "owner": "purpleclay",
+        "repo": "go-overlay",
+        "rev": "efc8ba6788ff0736cc2098d7c588d58819a927e7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "purpleclay",
+        "repo": "go-overlay",
+        "type": "github"
       }
     },
     "home-manager": {
@@ -94,16 +204,34 @@
         ]
       },
       "locked": {
-        "lastModified": 1774274588,
+        "lastModified": 1781184346,
-        "narHash": "sha256-dnHvv5EMUgTzGZmA+3diYjQU2O6BEpGLEOgJ1Qe9LaY=",
+        "narHash": "sha256-cZRlW47U6A2nWvAmnZeeO6Xvq23gxYbVLel4KxqOrcQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cf9686ba26f5ef788226843bc31fda4cf72e373b",
+        "rev": "ea6d221d7aa85652d014b6f719dddf036037515b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-26.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1779507042,
+        "narHash": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -126,37 +254,69 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744536153,
+        "lastModified": 1778869304,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
+        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
+        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1774244481,
+        "lastModified": 1780902259,
-        "narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
+        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4590696c8693fea477850fe379a01544293ca4e2",
+        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-25.11",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1778443072,
+        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1780902259,
+        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1744536153,
         "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -172,56 +332,52 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nur": {
+      "inputs": {
+        "darwin": "darwin_2",
+        "flake-utils": "flake-utils_2",
+        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs_4"
+      },
       "locked": {
-        "lastModified": 1766201043,
+        "lastModified": 1781241353,
-        "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
+        "narHash": "sha256-lY3e7d5bA48qnTWGBSH6SK5jfINRlCQEv+zx1eGl1zU=",
-        "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
+        "ref": "refs/heads/master",
-        "revCount": 904049,
+        "rev": "90afe7c81a068fb1f160d68acd0ad06fa1bf7553",
-        "type": "tarball",
+        "revCount": 30,
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.904049%2Brev-b3aad468604d3e488d627c0b43984eb60e75e782/019b3f6c-8b33-7edb-b858-9979590f270b/source.tar.gz"
+        "type": "git",
+        "url": "https://scm.wyattjmiller.com/wymiller/nur.git"
       },
       "original": {
-        "type": "tarball",
+        "type": "git",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
+        "url": "https://scm.wyattjmiller.com/wymiller/nur.git"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1769089682,
-        "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
-        "rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
-        "revCount": 906333,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2511.906333%2Brev-078d69f03934859a181e81ba987c2bb033eebfc5/019bebf2-031c-7119-8fdc-ce9d29d005fa/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
       }
     },
     "root": {
       "inputs": {
         "aagl": "aagl",
         "darwin": "darwin",
+        "go-overlay": "go-overlay",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs_2",
-        "rust-overlay": "rust-overlay_2",
+        "nur": "nur",
-        "swaytreesave": "swaytreesave",
+        "rust-overlay": "rust-overlay_2"
-        "vintage-story": "vintage-story"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "aagl",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1770952264,
+        "lastModified": 1780197589,
-        "narHash": "sha256-CjymNrJZWBtpavyuTkfPVPaZkwzIzGaf0E/3WgcwM14=",
+        "narHash": "sha256-FVCr2Ij/jKf59a4LW481eeOF6rJRreOBrVgW/aUBTrw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ec6a3d5cdf14bb5a1dd03652bd3f6351004d2188",
+        "rev": "21632e942d89bf1cce4e5a63d7e58a215a0cbfcc",
         "type": "github"
       },
       "original": {
@@ -232,58 +388,50 @@
     },
     "rust-overlay_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1774321696,
-        "narHash": "sha256-g18xMjMNla/nsF5XyQCNyWmtb2UlZpkY0XE8KinIXAA=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "49a67e6894d4cb782842ee6faa466aa90c92812d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "swaytreesave": {
-      "inputs": {
-        "flake-schemas": "flake-schemas",
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1767148467,
-        "narHash": "sha256-W0O7SWq8ucokt4ctEAEvRvNoSM/oF7fBfb2kTN+lwTs=",
-        "ref": "refs/heads/master",
-        "rev": "0f4bb9bb450b28aa4f29d5eb2062deac6c26687a",
-        "revCount": 4,
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git"
-      }
-    },
-    "vintage-story": {
-      "inputs": {
-        "flake-schemas": "flake-schemas_2",
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1769397199,
+        "lastModified": 1781234414,
-        "narHash": "sha256-MSajncUGZtlpl88rqFdj42eGGyWnk2jw84VbK3AgUBA=",
+        "narHash": "sha256-HdA+P4fKRGOomkewnI/Tww5Wz4xK1O7+hDO90YAsPB4=",
-        "ref": "refs/heads/master",
+        "owner": "oxalica",
-        "rev": "4d2313c50933645040a0d12556016fc2916bfa65",
+        "repo": "rust-overlay",
-        "revCount": 1,
+        "rev": "1d18bfe3de6244c641ca4e8011186d0981b81d76",
-        "type": "git",
+        "type": "github"
-        "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git"
       },
       "original": {
-        "type": "git",
+        "owner": "oxalica",
-        "url": "https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git"
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -1,25 +1,23 @@
 {
   description = "Wyatt's nix configuration suite";
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.11";
+      url = "github:nix-community/home-manager/release-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     darwin = {
-      url = "github:lnl7/nix-darwin/nix-darwin-25.11";
+      url = "github:lnl7/nix-darwin/nix-darwin-26.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     rust-overlay.url = "github:oxalica/rust-overlay";
+    go-overlay.url = "github:purpleclay/go-overlay";
     aagl = {
       url = "github:ezKEa/aagl-gtk-on-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
+    nur.url = "git+https://scm.wyattjmiller.com/wymiller/nur.git";
-    # My personal flakes
-    swaytreesave.url = "git+https://scm.wyattjmiller.com/wymiller/swaytreesave-nix.git";
-    vintage-story.url = "git+https://scm.wyattjmiller.com/wymiller/vintage-story-nix.git";
   };
 
   outputs = inputs @ {
@@ -29,20 +27,21 @@
     darwin,
     home-manager,
     rust-overlay,
+    go-overlay,
     aagl,
-    swaytreesave,
+    nur,
-    vintage-story,
     ...
   }: let
     userName = "wyatt";
     userEmail = "wyatt@wyattjmiller.com";
     extraSpecialArgs = {
-      inherit userName userEmail swaytreesave;
+      inherit userName userEmail nur;
     };
 
     myOverlays = { ... }: {
       nixpkgs.overlays = [
         rust-overlay.overlays.default
+        go-overlay.overlays.default
         aagl.overlays.default
         self.common.overlays
       ];
@@ -83,7 +82,7 @@
     nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail aagl vintage-story;
+        inherit userName userEmail aagl nur;
         hostname = "cloud";
         role = "workstation";
       };
@@ -166,7 +165,7 @@
     nixosConfigurations."thancred" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = {
-        inherit userName userEmail vintage-story;
+        inherit userName userEmail nur;
         hostname = "thancred";
         role = "server";
       };
@@ -230,6 +229,7 @@
         {
           nixpkgs.overlays = [
             rust-overlay.overlays.default
+            go-overlay.overlays.default
             self.common.overlays
           ];
         }

home/default.nix

@@ -1,7 +1,6 @@
 { lib
 , pkgs
 , userName
-, swaytreesave
 , isNixOS ? true
 , ...
 }: let

home/git.nix

@@ -13,11 +13,15 @@
     userEmail = userEmail;
 
     extraConfig = {
+      commit.gpgsign = true;
+      gpg.format = "ssh";
+      gpg.ssh.allowedSignersFile = "~/.config/git/allowed_signers";
       init.defaultBranch = "master";
-      push.autoSetupRemote = true;
-      pull.rebase = false;
       merge.tool = "nvimdiff";
       mergetool.keepBackup = false;
+      push.autoSetupRemote = true;
+      pull.rebase = false;
+      user.signingkey = "~/.ssh/id_ed25519_sk.pub";
     };
 
     ignores = [

home/k9s.nix

@@ -7,7 +7,7 @@
       liveViewAutoRefresh = false;
       apiServerTimeout = "30s";
       maxConnRetry = 5;
-      readOnly = true;
+      # readOnly = true;
       noExitOnCtrlC = false;
       portForwardAddress = "localhost";
       skipLatestRevCheck = false;

home/lazygit.nix

@@ -4,6 +4,7 @@
     package = pkgs.lazygitLatest;
 
     settings = {
+      gui.skipDiscardChangeWarning = true;
       gui.theme = {
         activeBorderColor = ["#a6e3a1" "bold"];
         inactiveBorderColor = ["#a6adc8"];

home/packages/linux.nix

@@ -11,5 +11,6 @@ lib.mkIf pkgs.stdenv.isLinux {
     gpu-screen-recorder
     gpu-screen-recorder-gtk
     inetutils
+    easyeffects
   ];
 }

home/packages/workstation.nix

@@ -18,7 +18,6 @@
     fh
     kubectl # kube config is deliberately not included
     kubectx
-    obsidian
     vscode
     yt-dlp
     weechat
@@ -29,5 +28,10 @@
     deadnix
     alejandra
     statix
+    gh
+    ghDashLatest
+    diffNavLatest
+  ] ++ lib.optionals isNixOS [
+    obsidian
   ];
 }

home/shell.nix

@@ -31,7 +31,6 @@
         body = ''
           set memes \
             "Crazy? I was crazy once. They locked me in a room. A rubber room. A rubber room with rats. And rats make me crazy." \
-            "Daddy, chill!" \
             "What the hell is even that?!" \
             "Road work ahead? Yeah, I sure hope it does!" \
             "Look at all those chickens!" \
@@ -40,7 +39,6 @@
             "I didn't get no sleep cause of y'all, y'all not gone get any sleep cause of me!" \
             "This is the dollar store, how good can it be?" \
             "That was legitness" \
-            "Deez nuts" \
             "I wanna be a cowboy baby" \
             "Can I get a waffle? Can I please get a waffle?" \
             "I'm lesbian. I thought you were American." \

home/sway.nix

@@ -1,7 +1,7 @@
 {
   lib,
   pkgs,
-  swaytreesave,
+  nur,
   ...
 }: let
   dirs = {
@@ -17,7 +17,7 @@
   };
 in {
   imports = [
-    swaytreesave.homeManagerModules.default
+    nur.homeManagerModules.swaytreesave
   ];
 
   programs.swaytreesave.enable = if pkgs.stdenv.isLinux then true else false;
@@ -155,5 +155,4 @@ in {
     enable = pkgs.stdenv.isLinux;
     systemd.enable = true;
   };
-
 }

modules/apps/gaming.nix

@@ -3,7 +3,7 @@
   lib,
   pkgs,
   aagl,
-  vintage-story,
+  nur,
   ...
 }: let
   cfg = config.gaming;
@@ -218,7 +218,7 @@ in {
       )) ++
       (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++
       (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++
-      (lib.optionals cfg.vintage-story.enable [vintage-story.packages.${pkgs.system}.default]) ++
+      (lib.optionals cfg.vintage-story.enable [nur.packages.${pkgs.system}.vintage-story]) ++
       (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkbasalt-cli]) ++
       (lib.optionals cfg.mangohud.enable [pkgs.mangohud]) ++
       (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]);

modules/common/overlays.nix

@@ -1,19 +1,23 @@
 final: prev: let
-  # Use latest rust from overlay which should work on non-NixOS
   rust_latest = prev.rust-bin.stable.latest.default;
+  golang_latest = prev.go-bin.latestStable;
+  buildGoModuleLatest = prev.buildGoModule.override {
+    go = golang_latest;
+  };
   myRustPlatform = prev.makeRustPlatform {
     cargo = rust_latest;
     rustc = rust_latest;
   };
 in {
   lazygitLatest = prev.lazygit.overrideAttrs (_: rec {
-    version = "0.55.1";
+    version = "0.61.0";
     src = prev.fetchFromGitHub {
       owner = "jesseduffield";
       repo = "lazygit";
       rev = "v${version}";
-      hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk=";
+      hash = "sha256-G7JulCK9WUVWbp1V7lYuM3fehCdn1cNAJHYjr3aKDvQ=";
     };
+
     vendorHash = null;
     subPackages = [ "." ];
     ldflags = [
@@ -25,21 +29,31 @@ in {
   atuinLatest = (prev.atuin.override {
     rustPlatform = myRustPlatform;
   }).overrideAttrs (oldAttrs: rec {
-    version = "18.10.0";
+    version = "18.13.6";
 
     src = prev.fetchFromGitHub {
       owner = "atuinsh";
       repo = "atuin";
       rev = "v${version}";
-      hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M=";
+      hash = "sha256-yAw+ty6FUnFbiRTdAe2QQHzj6uU24fZ/bEIXcHl/thg=";
     };
 
     cargoDeps = myRustPlatform.fetchCargoVendor {
       # name = "atuin-${version}-vendor.tar.gz";
       inherit src;
-      hash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M=";
+      hash = "sha256-jirVe0+N5+UHZWioj8AipUhawMBameqEJJpa8HPTnfw=";
     };
 
+    cargoBuildFeatures = [
+      "ai"
+      "client"
+      "clipboard"
+      "daemon"
+      "hex"
+      "sync"
+    ];
+    cargoCheckFeatures = cargoBuildFeatures;
+
     preCheck = (oldAttrs.preCheck or "") + ''
       export HOME="$TMPDIR"
       export XDG_CONFIG_HOME="$TMPDIR/.config"
@@ -62,4 +76,53 @@ in {
   #     "-X github.com/derailed/k9s/version.BuildSource=nix"
   #   ];
   # });
+
+  ghDashLatest = (prev.gh-dash.override {
+    buildGoModule = buildGoModuleLatest;
+  }).overrideAttrs (oldAttrs: rec {
+    version = "4.23.2";
+    src = prev.fetchFromGitHub {
+      owner = "dlvhdr";
+      repo = "gh-dash";
+      rev = "v${version}";
+      hash = "sha256-C06LPVoE23ITJpMG0x75Djgeup+eb5uYwA8wL7xxvWU=";
+    };
+
+    vendorHash = "sha256-4AbeoH0l7eIS7d0yyJxM7+woC7Q/FCh0BOJj3d1zyX4=";
+    doCheck = false;
+    checkFlags = [
+      "-skip=TestFullOutput"
+    ];
+
+    ldflags = [
+      "-s"
+      "-w"
+      "-X github.com/dlvhdr/gh-dash/v4/cmd.Version=${version}"
+    ];
+
+    passthru = (oldAttrs.passthru or {}) // {
+      tests = {
+        version = oldAttrs.testers.testVersion { package = final.ghDashLatest; };
+      };
+    };
+  });
+
+  diffNavLatest = (prev.diffnav.override {
+    buildGoModule = buildGoModuleLatest;
+  }).overrideAttrs (_: rec {
+    version = "0.10.0";
+    src = prev.fetchFromGitHub {
+      owner = "dlvhdr";
+      repo = "diffnav";
+      rev = "v${version}";
+      hash = "sha256-6VtAQzZNLQrf8QYVXxLUgb3F6xguFDbwaE9kahPhbSE=";
+    };
+
+    vendorHash = "sha256-gmmckzR0D1oFuTG5TAb6gLMoNbcZl9EsjbFjhPfJqnQ=";
+
+    ldflags = [
+      "-s"
+      "-w"
+    ];
+  });
 }

modules/machine/cloud/configuration.nix

@@ -25,6 +25,7 @@ in {
     ../../graphics
     ../../pwrMgmt
     ../../networking/core.nix
+    ../../security/yubico.nix
     ../../sound/pipewire.nix
     ../../sound/shairport.nix
     ../../sound/focusrite.nix
@@ -33,7 +34,22 @@ in {
   ];
 
   # Enable flakes for NixOS
-  nix.settings.experimental-features = ["nix-command" "flakes"];
+  nix.settings = {
+    experimental-features = ["nix-command" "flakes"];
+    substituters = [
+      "https://attic.home.wyattjmiller.com/wyatt"
+    ];
+
+    trusted-substituters = [
+      "https://attic.home.wyattjmiller.com/wyatt"
+    ];
+
+    trusted-public-keys = [
+      "wyatt:KBM2U2fVUomYUdMsxeNp0MDrUrCU5BECZHLF72o8TOI="
+    ];
+  };
+
+
 
   # Custom kernel/boot stuff
   boot = {
@@ -56,7 +72,7 @@ in {
     grim
     slurp
     playerctl
-    light
+    # light - UNMAINTAINED, brightnessctl is the replacement
     brightnessctl
     wttrbar
     cliphist

modules/machine/thancred/configuration.nix

@@ -1,7 +1,7 @@
 {
   pkgs,
   userName,
-  vintage-story,
+  nur,
   ...
 }: {
   imports = [
@@ -60,7 +60,7 @@
   };
 
   environment.systemPackages = [
-    vintage-story.packages.${pkgs.system}.default
+    nur.packages.${pkgs.system}.vintage-story
   ];
 
   systemd.services.vintagestory-server = {
@@ -71,7 +71,7 @@
       Type = "simple";
       User = userName;
       WorkingDirectory = "/home/${userName}";
-      ExecStart = "${vintage-story.packages.${pkgs.system}.default}/bin/vintagestory-server";
+      ExecStart = "${nur.packages.${pkgs.system}.vintage-story}/bin/vintagestory-server";
       Restart = "on-failure";
       RestartSec = "5s";
     };

modules/security/yubico.nix

@@ -0,0 +1,8 @@
+{
+  ...
+}: let in {
+  security.pam.services = {
+    login.u2fAuth = true;
+    sudo.u2fAuth = true;
+  };
+}

modules/sound/pipewire.nix

@@ -6,6 +6,7 @@
   };
 
   environment.systemPackages = with pkgs; [
-    helvum
+    # helvum - UNMAINTAINED
+    crosspipe
   ];
 }