refactor!: rewrite following dendritic patterns

flake.lock

@@ -35,11 +35,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781930126,
+        "lastModified": 1782533477,
-        "narHash": "sha256-AopjjM6497f3Usb6IAZgensjtzGlYGGpJLw7DRtP67I=",
+        "narHash": "sha256-2enYwf3n9GUkne9v4J3Ud6LpoG4Uarl3BaSQgRAAH7o=",
         "owner": "caelestia-dots",
         "repo": "cli",
-        "rev": "b00dabaa9351d1383dfba162f5b3575b49a126e1",
+        "rev": "e9e115568f818ee1df2d7a9e21925141b053ec6e",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1782013769,
+        "lastModified": 1782636677,
-        "narHash": "sha256-3j6GU+y8RSyRAibriCePKqqU4UPf6qjabUD9cfjehcM=",
+        "narHash": "sha256-u01nEjf7afRMCtRjp0LV45DmhC4/n/uPY3S/HAh/V2w=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "74e4970ab530b3d1a5cddb8424fcf0ee96443bd9",
+        "rev": "145a6795ee41e023e863681cec6c5db3b334ffc0",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781648708,
+        "lastModified": 1782492933,
-        "narHash": "sha256-i9ggnF31Uq3tpdp6ZMe7YAOxjTfkB7S4WjSBfXV0uMk=",
+        "narHash": "sha256-v/BH1zfHaCFqP+4Ev9PWiGy15YrpmI9wzjxRtiFhgvA=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "d33d11321f823f58a9109298ef886044f63b02ce",
+        "rev": "4c8203016f089b38281ed922a78255146f099e7b",
         "type": "github"
       },
       "original": {
@@ -207,11 +207,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781989573,
+        "lastModified": 1782702263,
-        "narHash": "sha256-npfH7Zv7t1akX/ArqCNro4zU4ViPlghLaPnbEfHbCxk=",
+        "narHash": "sha256-8/MG4Su7PhnynrmsVO61IeAfrK7GuUEu+E+gwbhy1QQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "78e7d8b13ecd7f5256a5c11ce216876164099d9f",
+        "rev": "789a35fbdeb3c46b260096daa0b321c11be527ea",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782030356,
+        "lastModified": 1782636943,
-        "narHash": "sha256-h4WpMr455AfRub0FXBaon6Vcpe0waUyJ4GivIW6oyd4=",
+        "narHash": "sha256-ripjZa7BBLwL1uS5VJF3s/VpZpWt5ZIQEvkJ/FJNpQw=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "3017088b49efd404f78e3b104f553b97e4af786b",
+        "rev": "058b1f9381fa79fcda49982370a750ff92dbba43",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1781577229,
+        "lastModified": 1782467914,
-        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
+        "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
+        "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
         "type": "github"
       },
       "original": {
@@ -299,11 +299,11 @@
     },
     "nixpkgsStable": {
       "locked": {
-        "lastModified": 1781509190,
+        "lastModified": 1782498288,
-        "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=",
+        "narHash": "sha256-8/X3yyTXiE82b38n32ItbOqfWOVBl+gKa8fILyZfR4Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4",
+        "rev": "3cac626ec5e3703e835f227687e88aa9e2f25701",
         "type": "github"
       },
       "original": {
@@ -466,11 +466,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781943681,
+        "lastModified": 1782165805,
-        "narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=",
+        "narHash": "sha256-478kKQBvK6SYTOdN2h9jhKJv94nbXRbFMfuL1WshErg=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "420f8d2e9882911f65cfac15cc706f639ba96cca",
+        "rev": "56b24064fdcaedca53553b1a6d607fd23b613a24",
         "type": "github"
       },
       "original": {
@@ -487,11 +487,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1782031037,
+        "lastModified": 1782633406,
-        "narHash": "sha256-a7oWSyS7SN81UOqVt481yIEMDsMpaJ7GNdV6Eaz5Yqg=",
+        "narHash": "sha256-JOSMk12GgnTLVlUSCuKkqyUF6cw82wl7t7e1WuFfg5s=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "9cb27462cfd20edac174353f1e95bc03aa888863",
+        "rev": "5ff9a6ca9dcbad7cccea2c97d30237468b16feda",
         "type": "github"
       },
       "original": {
@@ -507,11 +507,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781754174,
+        "lastModified": 1782700116,
-        "narHash": "sha256-Q5hp6+DYj23gMAvhLXBYNan9EwY9C+oxyU+M1TJDwgo=",
+        "narHash": "sha256-E63+nvH3jkAt/hBxhMa5aykstXdqRvBSeqNRDpQNv78=",
         "owner": "nix-community",
         "repo": "srvos",
-        "rev": "18ae1c654f60fb8dafb40c48fe25eb09f1aaddb2",
+        "rev": "d45cf79058f2d42c0b0dd7912bedb5d14faa00ed",
         "type": "github"
       },
       "original": {
@@ -587,11 +587,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781847955,
+        "lastModified": 1782624757,
-        "narHash": "sha256-1OSYOGuJp/NoODmSHjsz+6TB/kSilJ+BsFihjY7TTnc=",
+        "narHash": "sha256-pqFaCAV+g8H+p0kE4vYn9ZgcEFvt644zGy7SyCdf9c8=",
         "owner": "youwen5",
         "repo": "zen-browser-flake",
-        "rev": "4bca251cd556677f7b765ff324d1638ae215be13",
+        "rev": "907465791e7064d86d37964dd95e23280dfb68da",
         "type": "github"
       },
       "original": {

modules/default.nix

@@ -0,0 +1,50 @@
+{
+  inputs,
+  lib,
+  config,
+  ...
+}: {
+  imports = [./helpers.nix];
+
+  config = {
+    flake = {
+      nixosConfigurations = lib.mkMerge [
+        (config.flake.lib.mkNixos "x86_64-linux" "alys")
+        (config.flake.lib.mkNixos "x86_64-linux" "elcafe")
+        (config.flake.lib.mkNixos "x86_64-linux" "gampo")
+        (config.flake.lib.mkNixos "x86_64-linux" "marpa")
+        (config.flake.lib.mkNixos "x86_64-linux" "NaroMk3")
+        (config.flake.lib.mkNixos "x86_64-linux" "tilo")
+        (config.flake.lib.mkPinetab "x86_64-linux" [
+          inputs.self.modules.nixos.pinetab2-gnome
+        ])
+      ];
+
+      homeConfigurations = lib.mkMerge [
+        (config.flake.lib.mkHome "aarch64-linux" "phundrak" "pinetab2")
+        (config.flake.lib.mkHome "x86_64-linux" "creug" "elcafe")
+        (config.flake.lib.mkHome "x86_64-linux" "phundrak" "NaroMk3")
+        (config.flake.lib.mkHome "x86_64-linux" "phundrak" "alys")
+        (config.flake.lib.mkHome "x86_64-linux" "phundrak" "elcafe")
+        (config.flake.lib.mkHome "x86_64-linux" "phundrak" "gampo")
+        (config.flake.lib.mkHome "x86_64-linux" "phundrak" "marpa")
+        (config.flake.lib.mkHome "x86_64-linux" "phundrak" "tilo")
+      ];
+    };
+    perSystem = {
+      config',
+      pkgs,
+      ...
+    }: {
+      formatter = pkgs.alejandra;
+      devShells.default = pkgs.mkShell {
+        buildInputs = with pkgs; [
+          nh
+          jujutsu
+          git
+          inputs.jj-cz.packages.${config'.system}.default
+        ];
+      };
+    };
+  };
+}

modules/desktop/firefox/flake-parts.nix

@@ -0,0 +1,3 @@
+{
+  imports = [./home-manager.nix];
+}

modules/desktop/firefox/home-manager.nix

@@ -0,0 +1,81 @@
+{
+  inputs,
+  lib,
+  ...
+}: let
+  settingsToLines = with lib;
+    settings:
+      concatStringsSep "\n" (
+        mapAttrsToList (name: value: "set ${name} ${toString value}") settings
+      );
+in {
+  flake-file.inputs.zen-browser = {
+    url = "github:youwen5/zen-browser-flake";
+    inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  flake.modules.homeManager.firefox = {
+    config,
+    pkgs,
+    ...
+  }:
+    with lib; let
+      cfg = config.flake.options.firefox;
+      inherit (pkgs.stdenv.hostPlatform) system;
+      zen = inputs.zen-browser.packages.${system}.default;
+    in {
+      options.flake.options.firefox = {
+        enable = mkEnableOption "enable Firefox";
+        useZen = mkEnableOption "use Zen instead of Firefox";
+        tridactyl = {
+          enable = mkEnableOption "enable Tridactyl";
+          preConfig = mkOption {
+            description = "Lines to add to the beginning of tridactylrc";
+            type = types.lines;
+            default = "";
+          };
+          config = mkOption {
+            type = with types;
+              attrsOf (oneOf [int str bool]);
+            description = "Tridactyl settings (converted to 'set key value' lines)";
+            default = {};
+            example = {
+              smoothscroll = true;
+              history = 1000;
+            };
+          };
+          extraConfig = mkOption {
+            description = "Extra lines to add to tridactylrc (for bindings, autocmds, etc)";
+            type = types.lines;
+            default = "";
+          };
+        };
+      };
+
+      config = mkIf cfg.enable {
+        home.sessionVariables.MOZ_ENABLE_WAYLAND = "1";
+        programs.firefox = {
+          inherit (cfg) enable;
+          package =
+            if cfg.useZen
+            then zen
+            else pkgs.firefox;
+          nativeMessagingHosts = lists.optional cfg.tridactyl.enable pkgs.tridactyl-native;
+          configPath = ".mozilla/firefox";
+        };
+        xdg.configFile."tridactyl/tridactylrc" = mkIf cfg.tridactyl.enable {
+          text = concatStringsSep "\n" (filter (s: s != "") [
+            cfg.tridactyl.preConfig
+            (settingsToLines (cfg.tridactyl.config
+              // {
+                browser =
+                  if cfg.useZen
+                  then "zen"
+                  else "firefox";
+              }))
+            cfg.tridactyl.extraConfig
+          ]);
+        };
+      };
+    };
+}

modules/hardware/amdgpu/flake-parts.nix

@@ -0,0 +1,3 @@
+{
+  flake.modules.nixos.amdgpu = ./nixos.nix;
+}

modules/hardware/amdgpu/nixos.nix

@@ -0,0 +1,30 @@
+{pkgs, ...}: {
+  hardware = {
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+      extraPackages = with pkgs; [
+        mesa rocmPackages.clr rocmPackages.clr.icd rocmPackages.rocblas
+        rocmPackages.hipblas rocmPackages.rpp nvtopPackages.amd
+      ];
+    };
+    amdgpu = { initrd.enable = true; opencl.enable = true; };
+  };
+  environment.systemPackages = with pkgs; [ clinfo amdgpu_top nvtopPackages.amd ];
+  systemd = {
+    packages = with pkgs; [ lact ];
+    services.lactd.wantedBy = [ "multi-user.target" ];
+    tmpfiles.rules = let
+      rocmEnv = pkgs.symlinkJoin {
+        name = "rocm-combined";
+        paths = with pkgs.rocmPackages; [ clr clr.icd rocblas hipblas rpp ];
+      };
+    in [ "L+    /opt/rocm   -    -    -     -    ${rocmEnv}" ];
+  };
+  environment.variables = {
+    ROCM_PATH = "/opt/rocm";
+    HIP_VISIBLE_DEVICES = "1";
+    ROCM_VISIBLE_DEVICES = "1";
+    HSA_OVERRIDE_GFX_VERSION = "10.3.0";
+  };
+}

modules/hardware/pinetab2/flake-parts.nix

@@ -0,0 +1,27 @@
+{inputs, ...}:
+{
+  flake-file.inputs = {
+    rockchip = {
+      url = "github:raboof/nixos-rockchip/pinetab-linux-7.0";
+      inputs.utils.follows = "flake-utils";
+      inputs.nixpkgsStable.follows = "nixpkgsStable";
+      inputs.nixpkgsUnstable.follows = "nixpkgs";
+    };
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  config.flake.factory.pinetab2 = buildPlatform: variantModules: {
+    nixos.pinetab2 = {
+      imports = [
+        inputs.rockchip.nixosModules.sdImageRockchip
+        inputs.rockchip.nixosModules.dtOverlayPCIeFix
+        inputs.rockchip.nixosModules.noZFS
+        inputs.self.modules.nixos.pinetab2-base
+      ] ++ variantModules;
+      rockchip.uBoot = inputs.rockchip.packages.${buildPlatform}.uBootPineTab2;
+      boot.kernelPackages =
+        inputs.rockchip.legacyPackages.${buildPlatform}.kernel_linux_7_0_pinetab_unstable;
+      hardware.firmware = [ inputs.rockchip.packages.aarch64-linux.bes2600 ];
+    };
+  };
+}

modules/helpers.nix

@@ -0,0 +1,48 @@
+{
+  inputs,
+  lib,
+  ...
+}: {
+  config.flake.lib = {
+    mkNixos = system: name: {
+      ${name} = inputs.nixpkgs.lib.nixosSystem {
+        modules = [
+          inputs.self.modules.nixos.${name}
+          {nixpkgs.hostPlatform = lib.mkDefault system;}
+        ];
+      };
+    };
+
+    mkHome = system: username: hostname: {
+      "${username}@${hostname}" = inputs.home-manager.lib.homeManagerConfiguration {
+        pkgs = inputs.nixpkgs.legacyPackages.${system};
+        extraSpecialArgs = {inherit inputs;};
+        modules = [inputs.self.modules.homeManager.${username}.${hostname}];
+      };
+    };
+
+    mkPinetab = buildPlatform: variantModules: {
+      pinetab2 = inputs.nixpkgs.lib.nixosSystem {
+        system = "aarch64-linux";
+        modules =
+          [
+            inputs.rockchip.nixosModules.sdImageRockchip
+            inputs.rockchip.nixosModules.dtOverlayPCIeFix
+            inputs.rockchip.nixosModules.noZFS
+            inputs.self.modules.nixos.pinetab2-base
+          ]
+          ++ variantModules
+          ++ [
+            {
+              rockchip.uBoot = inputs.rockchip.packages.${buildPlatform}.uBootPineTab2;
+              boot.kernelPackages =
+                inputs.rockchip.legacyPackages.${buildPlatform}.kernel_linux_7_0_pinetab_unstable;
+              hardware.firmware = [inputs.rockchip.packages.aarch64-linux.bes2600];
+              nixpkgs.config.allowUnfreePredicate = pkg:
+                builtins.elem (inputs.nixpkgs.lib.getName pkg) ["bes2600-firmware"];
+            }
+          ];
+      };
+    };
+  };
+}

modules/inputs.nix

@@ -0,0 +1,20 @@
+{
+  flake-file = {
+    inputs = {
+      nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+      nixpkgsStable.url = "nixpkgs/nixos-25.11";
+      flake-parts.url = "github:hercules-ci/flake-parts";
+      flake-file.url = "github:vic/flake-file";
+      import-tree.url = "github:vic/import-tree";
+      home-manager = {
+        url = "github:nix-community/home-manager";
+        inputs.nixpkgs.follows = "nixpkgs";
+      };
+      jj-cz = {
+        url = "git+https://labs.phundrak.com/phundrak/jj-cz?ref=main";
+        inputs.nixpkgs.follows = "nixpkgs";
+      };
+    };
+    outputs = "flake-parts";
+  };
+}

modules/nix/nix-config.nix

@@ -0,0 +1,18 @@
+{
+  flake.nixConfig = {
+    extra-trusted-public-keys = [
+      "marpa-local:XoO+dFN4PeauF52pYuy3Vh4Sdtl2qIdxu5aUasWKv6Q="
+      "phundrak.cachix.org-1:osJAkYO0ioTOPqaQCIXMfIRz1/+YYlVFkup3R2KSexk="
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+    ];
+    extra-substituters = [
+      "http://marpa:5000?priority=5"
+      "https://phundrak.cachix.org?priority=10"
+      "https://nix-community.cachix.org?priority=20"
+      "https://cache.nixos.org?priority=40"
+    ];
+    extra-experimental-features = [ "nix-command" "flakes" ];
+    http-connections = 128;
+  };
+}

modules/nix/tools/hetzner.nix

@@ -0,0 +1,14 @@
+{inputs, ...}:
+{
+  flake-file.inputs.srvos = {
+    url = "github:nix-community/srvos";
+    inputs.nixpkgs.follows = "nixpkgs";
+  };
+  flake.modules.nixos.hetzner-server = {
+    imports = [
+      inputs.srvos.nixosModules.server
+      inputs.srvos.nixosModules.hardware-hetzner-cloud
+      inputs.srvos.nixosModules.mixins-terminfo
+    ];
+  };
+}

modules/nix/tools/sops.nix

@@ -0,0 +1,16 @@
+{inputs, ...}:
+{
+  flake-file.inputs.sops-nix = {
+    url = "github:Mic92/sops-nix";
+    inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  flake.modules = {
+    nixos.sops = {
+      imports = [inputs.sops-nix.nixosModules.sops];
+    };
+    homeManager.sops = {
+      imports = [inputs.sops-nix.homeManagerModules.sops];
+    };
+  };
+}

modules/users/phundrak/flake-parts.nix

@@ -0,0 +1,13 @@
+{inputs, ...}: {
+  flake.modules = {
+    nixos.phundrak = {
+      imports = [./nixos.nix];
+      home-manager.users.phundrak = {
+        imports = [inputs.self.modules.homeManager.phundrak];
+      };
+    };
+    homeManager.phundrak = {
+      imports = [./homeManager.nix];
+    };
+  };
+}

modules/users/phundrak/nixos.nix

@@ -0,0 +1,32 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.flake.options.phundrak;
+in {
+  options.flake.options.phundrak = {
+    sudo = mkEnableOption "Make phundrak a superuser";
+    trusted = mkOption {
+      description = "Mark phundrak as trusted by Nix";
+      type = types.bool;
+      default = cfg.sudo;
+    };
+  };
+  config = {
+    users.users.phundrak = {
+      isNormalUser = true;
+      description = "Greg";
+      extraGroups =
+        ["networkmanager" "dialout" "games" "audio" "input"]
+        ++ optional cfg.sudo "wheel";
+      shell = pkgs.zsh;
+      openssh.authorizedKeys.keyFiles = filesystem.listFilesRecursive ./keys;
+    };
+    nix.settings = mkIf cfg.trusted {
+      trusted-users = ["phundrak"];
+    };
+  };
+}

users/modules/desktop/caelestia.nix

@@ -44,7 +44,7 @@ in {
       };
       launcher = {
         enabled = true;
-        showOnHover = true;
+        showOnHover = false;
         useFuzzy = {
           apps = true;
           schemes = true;

users/modules/dev/ai/default.nix

@@ -16,6 +16,11 @@ in {
 
   options.home.dev.ai = {
     enable = mkEnableOption "Enables AI features";
+    lmStudio = mkOption {
+      default = cfg.enable;
+      example = true;
+      description = "Enables LM Studio. Enabled by default when AI is enabled.";
+    };
     mcpServers = mkOption {
       inherit (jsonFormat) type;
       default = {};
@@ -31,7 +36,7 @@ in {
         ollama.enable = mkDefault cfg.enable;
         opencode.enable = mkDefault cfg.enable;
       };
-      packages = [pkgs.lmstudio];
+      packages = lists.optional cfg.lmStudio pkgs.lmstudio;
     };
     programs.mcp = mkIf (cfg.mcpServers != {}) {
       enable = true;

users/phundrak/host/gampo.nix

@@ -2,6 +2,7 @@
   imports = [../home.nix];
   home = {
     cli.nh.flake = "${config.home.homeDirectory}/.dotfiles";
+    dev.ai.lmStudio = false;
     desktop.hyprland.host = "gampo";
     phundrak.sshKey.content = builtins.readFile ../keys/id_gampo.pub;
   };