one last big shuffle

26 files changed, 22 insertions, 102 deletions

diff --git a/home/programs/security/age.nix b/home/programs/age.nix
index e41d0d8..e41d0d8 100644
--- a/home/programs/security/age.nix
+++ b/home/programs/age.nix
diff --git a/home/programs/aider.nix b/home/programs/aider.nix
new file mode 100644
index 0000000..3493f42
--- /dev/null
+++ b/home/programs/aider.nix
@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    aider-chat
+  ];
+
+  home.sessionVariables = {
+    OLLAMA_API_BASE = "http://rivendell:11434";
+    AIDER_ANALYTIC = "false";
+    AIDER_ANALYTICS_DISABLE = "true";
+    AIDER_ATTRIBUTE_AUTHO = "false";
+    AIDER_AUTO_COMMITS = "false";
+    AIDER_CHECK_UPDATE = "false";
+    AIDER_SHOW_DIFFS = "true";
+    AIDER_SUBTREE_ONLY = "true";
+  };
+
+  programs.fish.shellAliases = {
+    laider = "aider --model ollama_chat/qwen3:8b";
+  };
+}
diff --git a/home/programs/cli/bat.nix b/home/programs/bat.nix
index 3627997..3627997 100644
--- a/home/programs/cli/bat.nix
+++ b/home/programs/bat.nix
diff --git a/home/programs/dev/delta.nix b/home/programs/dev/delta.nix
deleted file mode 100644
index 726357f..0000000
--- a/home/programs/dev/delta.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  programs.delta = {
-    enable = true;
-    options.features = "decorations side-by-side line-numbers";
-  };
-}
diff --git a/home/programs/dev/direnv.nix b/home/programs/dev/direnv.nix
deleted file mode 100644
index bad971d..0000000
--- a/home/programs/dev/direnv.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ ... }:
-{
-  programs.direnv = {
-    enable = true;
-    nix-direnv.enable = true;
-    config.global = {
-      disable_stdin = true;
-      strict_env = true;
-      hide_env_diff = true;
-      warn_timeout = 0;
-    };
-  };
-}
diff --git a/home/programs/dev/k8s.nix b/home/programs/dev/k8s.nix
deleted file mode 100644
index 18d706a..0000000
--- a/home/programs/dev/k8s.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    kind # k8s in docker
-    kubebuilder # generate controller
-    kubectl
-    kubernetes-helm # deploy applications
-    kubelogin-oidc # OIDC plugin
-  ];
-
-  programs.fish = {
-    shellAbbrs = {
-      k = "kubectl";
-      klogs = "kubectl logs";
-    };
-    shellAliases = {
-      ukctx = "${pkgs.gh}/bin/gh api --hostname github.rbx.com repos/Roblox/cell-lifecycle/contents/rks/kubeconfig --jq '.content' | base64 -d > ~/.kube/rksconfig";
-    };
-  };
-}
diff --git a/home/programs/dev/k9s.nix b/home/programs/dev/k9s.nix
deleted file mode 100644
index 8ae4667..0000000
--- a/home/programs/dev/k9s.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }:
-{
-  programs.k9s = {
-    enable = true;
-    settings = {
-      k9s = {
-        refreshRate = 1;
-      };
-    };
-  };
-}
diff --git a/home/programs/dev/kubie.nix b/home/programs/dev/kubie.nix
deleted file mode 100644
index 5ac8678..0000000
--- a/home/programs/dev/kubie.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    kubie # kubeconfig browser https://github.com/sbstp/kubie
-  ];
-
-  home.file.kubie = {
-    target = ".kube/kubie.yaml";
-    text = ''
-      shell: fish
-      configs:
-        include:
-          - ~/.kube/rksconfig
-      prompt:
-        fish_use_rprompt: false
-    '';
-  };
-
-  programs.fish = {
-    shellAbbrs = {
-      kctx = "kubie ctx";
-    };
-  };
-}
diff --git a/home/programs/cli/eza.nix b/home/programs/eza.nix
index 470ed1c..470ed1c 100644
--- a/home/programs/cli/eza.nix
+++ b/home/programs/eza.nix
diff --git a/home/programs/cli/fd.nix b/home/programs/fd.nix
index 873eaed..873eaed 100644
--- a/home/programs/cli/fd.nix
+++ b/home/programs/fd.nix
diff --git a/home/programs/shell/fish.nix b/home/programs/fish.nix
index 1e1ef36..1e1ef36 100644
--- a/home/programs/shell/fish.nix
+++ b/home/programs/fish.nix
diff --git a/home/programs/dev/gh.nix b/home/programs/gh.nix
index b194b35..b194b35 100644
--- a/home/programs/dev/gh.nix
+++ b/home/programs/gh.nix
diff --git a/home/programs/dev/git.nix b/home/programs/git.nix
index 333f968..333f968 100644
--- a/home/programs/dev/git.nix
+++ b/home/programs/git.nix
diff --git a/home/programs/dev/go.nix b/home/programs/go.nix
index d6ea5f4..d6ea5f4 100644
--- a/home/programs/dev/go.nix
+++ b/home/programs/go.nix
diff --git a/home/programs/security/hashi.nix b/home/programs/hashi.nix
index 424c7b3..424c7b3 100644
--- a/home/programs/security/hashi.nix
+++ b/home/programs/hashi.nix
diff --git a/home/programs/term/kitty.nix b/home/programs/kitty.nix
index b02702d..b02702d 100644
--- a/home/programs/term/kitty.nix
+++ b/home/programs/kitty.nix
diff --git a/home/programs/media/videos.nix b/home/programs/media/videos.nix
deleted file mode 100644
index aa0f2db..0000000
--- a/home/programs/media/videos.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages =
-    with pkgs;
-    [
-      ffmpeg
-    ]
-    ++ lib.optionals pkgs.stdenv.isLinux [
-      vlc
-    ]
-    ++ lib.optionals pkgs.stdenv.isDarwin [
-      vlc-bin
-    ];
-}
diff --git a/home/programs/messengers/matrix.nix b/home/programs/messengers/matrix.nix
deleted file mode 100644
index 0bf6881..0000000
--- a/home/programs/messengers/matrix.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    element-desktop
-  ];
-}
diff --git a/home/programs/media/mpv.nix b/home/programs/mpv.nix
index d43cf9c..d43cf9c 100644
--- a/home/programs/media/mpv.nix
+++ b/home/programs/mpv.nix
diff --git a/home/programs/security/onepassword.nix b/home/programs/onepassword.nix
index f364a9e..f364a9e 100644
--- a/home/programs/security/onepassword.nix
+++ b/home/programs/onepassword.nix
diff --git a/home/programs/backups/restic.nix b/home/programs/restic.nix
index a27270f..0661251 100644
--- a/home/programs/backups/restic.nix
+++ b/home/programs/restic.nix
@@ -22,7 +22,7 @@ in
   home.packages = with pkgs; [ restic ];
 
   age.secrets.restic-password = {
-    file = ../../../secrets/restic-pw.age;
+    file = ../../secrets/restic-pw.age;
     path = "${config.home.homeDirectory}/.config/restic/password";
     mode = "400";
   };
diff --git a/home/programs/security/sapi.nix b/home/programs/sapi.nix
index 1d90698..1d90698 100644
--- a/home/programs/security/sapi.nix
+++ b/home/programs/sapi.nix
diff --git a/home/programs/security/yubikey.nix b/home/programs/security/yubikey.nix
deleted file mode 100644
index 8e5c598..0000000
--- a/home/programs/security/yubikey.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    yubikey-manager
-  ];
-}
diff --git a/home/programs/security/ssh.nix b/home/programs/ssh.nix
index 004b082..004b082 100644
--- a/home/programs/security/ssh.nix
+++ b/home/programs/ssh.nix
diff --git a/home/programs/cli/tmux.nix b/home/programs/tmux.nix
index 776c443..776c443 100644
--- a/home/programs/cli/tmux.nix
+++ b/home/programs/tmux.nix
diff --git a/home/programs/media/yt-dlp.nix b/home/programs/yt-dlp.nix
index 855c052..855c052 100644
--- a/home/programs/media/yt-dlp.nix
+++ b/home/programs/yt-dlp.nix