mod: stop lazygit from autofetching

currently copilot and opencode for starters, might be more

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",
+          },
+        },
+      },
+    },
+  },
+}

flake.lock

@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1774186997,
-        "narHash": "sha256-hyNVlhAqmwcBPl7XRkxbGcMt1BfCOdvuEfBDUf0k8Oo=",
+        "lastModified": 1777475243,
+        "narHash": "sha256-EiCeDGJewyWq2Mtdt5m8qyo/W5PXVUCacLuZJ/diBQ8=",
         "owner": "ezKEa",
         "repo": "aagl-gtk-on-nix",
-        "rev": "546e95f7ec74892a31f883a10b1723c35f2c2edd",
+        "rev": "12e7b06163456e4c3685ee83b8fdc277fe03bdc8",
         "type": "github"
       },
       "original": {
@@ -170,14 +170,14 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "git-hooks": "git-hooks",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1775676807,
-        "narHash": "sha256-l7B5l6cGBZoW4bs+4Zq/FMgxaZWWJqdUDkCVuH98hMY=",
+        "lastModified": 1777487930,
+        "narHash": "sha256-vdB1KmqUuUmzr0H1JI491jvuninmuSkeaARwBsTHM58=",
         "owner": "purpleclay",
         "repo": "go-overlay",
-        "rev": "c5bd812957211f42c207da6b1415f49de30e183f",
+        "rev": "aa92d14492077f331898bd8ed671765ef5a5884e",
         "type": "github"
       },
       "original": {
@@ -193,11 +193,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774274588,
-        "narHash": "sha256-dnHvv5EMUgTzGZmA+3diYjQU2O6BEpGLEOgJ1Qe9LaY=",
+        "lastModified": 1775425411,
+        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cf9686ba26f5ef788226843bc31fda4cf72e373b",
+        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
         "type": "github"
       },
       "original": {
@@ -224,22 +224,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1744536153,
-        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1765779637,
         "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
@@ -255,13 +239,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1774244481,
-        "narHash": "sha256-4XfMXU0DjN83o6HWZoKG9PegCvKvIhNUnRUI19vzTcQ=",
+        "lastModified": 1777077449,
+        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4590696c8693fea477850fe379a01544293ca4e2",
+        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
         "type": "github"
       },
       "original": {
@@ -271,7 +255,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1744536153,
         "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -287,7 +271,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1766201043,
         "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
@@ -301,7 +285,7 @@
         "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1769089682,
         "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
@@ -322,7 +306,7 @@
         "go-overlay": "go-overlay",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "rust-overlay": "rust-overlay_2",
         "swaytreesave": "swaytreesave",
         "vintage-story": "vintage-story"
@@ -330,7 +314,10 @@
     },
     "rust-overlay": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "aagl",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1770952264,
@@ -348,14 +335,14 @@
     },
     "rust-overlay_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1774321696,
-        "narHash": "sha256-g18xMjMNla/nsF5XyQCNyWmtb2UlZpkY0XE8KinIXAA=",
+        "lastModified": 1777432579,
+        "narHash": "sha256-Ce11TStDsqCge2vAAfLKe2+4lDI5cSX5ZYZOuKJBKKQ=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "49a67e6894d4cb782842ee6faa466aa90c92812d",
+        "rev": "3ecb5e6ab380ced3272ef7fcfe398bffbcc0f152",
         "type": "github"
       },
       "original": {
@@ -367,7 +354,7 @@
     "swaytreesave": {
       "inputs": {
         "flake-schemas": "flake-schemas",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1767148467,
@@ -401,7 +388,7 @@
     "vintage-story": {
       "inputs": {
         "flake-schemas": "flake-schemas_2",
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1769397199,

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,8 @@
     package = pkgs.lazygitLatest;
 
     settings = {
+      git.autoFetch = false;
+      gui.skipDiscardChangeWarning = true;
       gui.theme = {
         activeBorderColor = ["#a6e3a1" "bold"];
         inactiveBorderColor = ["#a6adc8"];

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." \

modules/common/overlays.nix

@@ -10,13 +10,14 @@ final: prev: let
   };
 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 = [
@@ -28,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"

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

modules/security/yubico.nix

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