flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "impermanence": {
       "locked": {
-        "lastModified": 1729068498,
+        "lastModified": 1727649413,
-        "narHash": "sha256-C2sGRJl1EmBq0nO98TNd4cbUy20ABSgnHWXLIJQWRFA=",
+        "narHash": "sha256-FA53of86DjFdeQzRDVtvgWF9o52rWK70VHGx0Y8fElQ=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "e337457502571b23e449bf42153d7faa10c0a562",
+        "rev": "d0b38e550039a72aff896ee65b0918e975e6d48e",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729665710,
+        "lastModified": 1728492678,
-        "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
         "type": "github"
       },
       "original": {

hosts/levi/configuration.nix

@@ -11,14 +11,6 @@ in
     { type = "ed25519"; path = "${persist}/ssh_host_ed25519_key"; }
   ];
 
-  # services.ollama = {
-  #   enable = true;
-  #   acceleration = "cuda";
-  # };
-  # programs.bash.interactiveShellInit = ''
-  #   alias ai='ollama run llama3.1:8b'
-  # '';
-
   sconfig = {
     gnome = true;
     desktop.enable = true;

modules/cli/default.nix

@@ -1,6 +1,7 @@
 { lib, pkgs, ... }:
 {
   imports = [
+    ./kubernetes.nix
     ./powerline.nix
   ];
 

modules/cli/kubernetes.nix

@@ -1,6 +1,18 @@
 { pkgs, ... }:
 {
+  programs.bash.interactiveShellInit = ''
+    source <(kubectl completion bash)
+    complete -F __start_kubectl k
+  '';
   environment.systemPackages = with pkgs; [
+    kubectl
+    kubernetes-helm
+    stern
+
+    (google-cloud-sdk.withExtraComponents
+      [ google-cloud-sdk.components.gke-gcloud-auth-plugin ])
+
     # dedicated script, because bash aliases dont work with `watch`
+    (writeShellScriptBin "k" "exec kubectl \"$@\"")
   ];
 }

modules/desktop/default.nix

@@ -39,7 +39,6 @@ with lib;
     };
 
     sconfig = {
-      devtools.enable = true;
       security-tools = true;
     };
 
@@ -59,7 +58,7 @@ with lib;
       ffmpeg
       gimp
       glxinfo
-      dconf-editor
+      gnome3.dconf-editor
       helvum
       kdenlive
       obs-studio

modules/devtools.nix

@@ -1,43 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  cfg = config.sconfig.devtools;
-in
-{
-  options.sconfig.devtools.enable = lib.mkEnableOption "Development Tools";
-
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs;
-      [
-        black
-        cargo
-        efm-langserver
-        errcheck
-        go
-        gopls
-        kubectl
-        kubernetes-helm
-        lua-language-server
-        nil
-        nodePackages.prettier
-        nodePackages.typescript-language-server
-        pyright
-        rust-analyzer
-        rustc
-        rustc.llvmPackages.lld
-        rustfmt
-        stern
-        vscode-langservers-extracted
-        yaml-language-server
-
-        # dedicated script, because bash aliases dont work with `watch`
-        (writeShellScriptBin "k" "exec kubectl \"$@\"")
-
-        (google-cloud-sdk.withExtraComponents
-          [ google-cloud-sdk.components.gke-gcloud-auth-plugin ])
-      ];
-    programs.bash.interactiveShellInit = ''
-      source <(kubectl completion bash)
-      complete -F __start_kubectl k
-    '';
-  };
-}

modules/gnome.nix

@@ -20,7 +20,7 @@ in
     systemd.services.packagekit.enable = false;
 
     environment.systemPackages = with pkgs; [
-      gnome-tweaks
+      gnome3.gnome-tweaks
 
       # https://github.com/ubuntu/gnome-shell-extension-appindicator/issues/441
       # gnomeExtensions.appindicator

modules/sean.nix

@@ -2,7 +2,8 @@
 {
   environment.variables.EDITOR = "hx";
   environment.systemPackages = [
-    pkgs.bck-nvim
+    pkgs.bck-nvim-base
+    pkgs.bck-nvim-tools
   ];
 
   users.users.sean = {

modules/security-tools.nix

@@ -25,7 +25,7 @@ in
       thc-hydra
       webshells
       weevely
-      wfuzz
+      # wfuzz # TODO: temporarily broken package
 
       (runCommand "gdb" { } "install -D ${gef}/bin/gef $out/bin/gdb")
     ];

pkgs/bck-nvim-tools.nix

@@ -0,0 +1,49 @@
+{ symlinkJoin
+, runCommand
+
+, black
+, cargo
+, efm-langserver
+, errcheck
+, go
+, gopls
+, lua-language-server
+, nil
+, nodePackages
+, pyright
+, rust-analyzer
+, rustc
+, rustfmt
+, vscode-langservers-extracted
+, yaml-language-server
+}:
+
+let
+  symlinkBin = path: runCommand "symlinkBin" { } ''
+    mkdir -p $out/bin
+    ln -s "${path}" $out/bin/
+  '';
+
+in
+symlinkJoin {
+  name = "bck-nvim-tools";
+  paths = [
+    black
+    cargo
+    efm-langserver
+    errcheck
+    go
+    gopls
+    lua-language-server
+    nil
+    pyright
+    rust-analyzer
+    rustc
+    rustfmt
+    vscode-langservers-extracted
+    yaml-language-server
+
+    (symlinkBin "${nodePackages.prettier}/bin/prettier")
+    (symlinkBin "${nodePackages.typescript-language-server}/bin/typescript-language-server")
+  ];
+}

pkgs/bck-nvim.nix

@@ -0,0 +1,7 @@
+{ callPackage }:
+
+callPackage ./bck-nvim-base {
+  extraBinPaths = [
+    (callPackage ./bck-nvim-tools.nix { })
+  ];
+}