Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles into nod

nod
cursor
2025-11-11 00:44:25 +01:00 · 2025-11-11 00:43:22 +01:00 · 2025-11-06 19:31:43 +01:00 · 2025-11-02 20:58:02 +01:00 · 2025-11-02 20:57:51 +01:00 · 2025-10-30 09:28:31 +01:00
19 changed files with 387 additions and 169 deletions
--- a/configuration.nix
+++ b/configuration.nix
@@ -32,7 +32,6 @@
    ./system-modules/sops.nix
    ./system-modules/sound.nix
    ./system-modules/sshd.nix
-    ./system-modules/base-packages.nix
    ./system-modules/input.nix
    ./system-modules/syncthing.nix
    ./system-modules/tuda.nix
@@ -61,6 +60,8 @@
    ./system-modules/calendar/dicos.nix
  ] else [
  ]);
+  environment.systemPackages = import ./system-modules/base-packages.nix pkgs;
+
  systemd.extraConfig = "DefaultLimitNOFILE=2048";
  system.stateVersion = hyper.pkgs-version;
  nix.settings.experimental-features = [ "nix-command" "flakes" ];
--- a/flake-modules/allowed.nix
+++ b/flake-modules/allowed.nix
@@ -1,6 +1,7 @@

 {
  unfree = [
+    "cursor"
    "discord"
    "spotify"
    "obsidian"
--- a/flake-modules/rice.nix
+++ b/flake-modules/rice.nix
@@ -55,9 +55,10 @@ pkgs: rec {
    };
  in ccolor // fcolor // xcolor; 
  font = {
-    code = {
+    code = rec {
      name = "JetBrainsMono Nerd Font";
      package = pkgs.nerd-fonts.jetbrains-mono;
+      regular-path = "${package}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFont-Regular.ttf";
    };
    base = {
      # name = "NewComputerModern08";
--- a/flake.lock
+++ b/flake.lock
@@ -39,11 +39,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1761256472,
-        "narHash": "sha256-iDM8s8cSkncybNs5IGo7qqeErCh+lk0mF6aiVYEtDHA=",
+        "lastModified": 1761517857,
+        "narHash": "sha256-1xYv73nGA+Lm/hKRqjiUyuBzabaRwmeDxBCIMve5CWU=",
        "owner": "9001",
        "repo": "copyparty",
-        "rev": "cdd5e78adf3d28a20a94628164188253bdfff2c1",
+        "rev": "e9ab040ce8e72e299a3d8fbd109865b1e218eb57",
        "type": "github"
      },
      "original": {
@@ -153,7 +153,7 @@
    },
    "flake-utils_2": {
      "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -234,6 +234,27 @@
        "type": "github"
      }
    },
+    "home-manager24": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs24"
+        ]
+      },
+      "locked": {
+        "lastModified": 1726989464,
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
    "hyprcursor": {
      "inputs": {
        "hyprlang": [
@@ -340,11 +361,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1761249285,
-        "narHash": "sha256-70dEwL5p3CB/00ODs2RHWUKTyafB+PF4Ld7IEMuO+no=",
+        "lastModified": 1761653710,
+        "narHash": "sha256-MhHSU9m/9HSckJ61OXcom/6F92NQf3s1QfLbRUApalc=",
        "owner": "hyprwm",
        "repo": "hyprland-plugins",
-        "rev": "81f6d1426537981fcbb921f8b5e470b1280ef8f3",
+        "rev": "e689220b1740aa99ca67fa06055792f82fa9ed85",
        "type": "github"
      },
      "original": {
@@ -475,27 +496,6 @@
        "type": "github"
      }
    },
-    "hyprspace": {
-      "inputs": {
-        "hyprland": [
-          "hyprland"
-        ],
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1759033501,
-        "narHash": "sha256-QhcOFLJYC9CiSVPkci62ghMEAJChzl+L98To1pKvnRQ=",
-        "owner": "KZDKM",
-        "repo": "Hyprspace",
-        "rev": "e54884da1d6a1af76af9d053887bf3750dd554fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "KZDKM",
-        "repo": "Hyprspace",
-        "type": "github"
-      }
-    },
    "hyprutils": {
      "inputs": {
        "nixpkgs": [
@@ -570,17 +570,68 @@
        "type": "github"
      }
    },
+    "nix-formatter-pack": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs"
+        ],
+        "nmd": "nmd",
+        "nmt": "nmt"
+      },
+      "locked": {
+        "lastModified": 1705252799,
+        "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=",
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "type": "github"
+      }
+    },
+    "nix-on-droid": {
+      "inputs": {
+        "home-manager": [
+          "home-manager24"
+        ],
+        "nix-formatter-pack": "nix-formatter-pack",
+        "nixpkgs": [
+          "nixpkgs24"
+        ],
+        "nixpkgs-docs": "nixpkgs-docs",
+        "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
+        "nmd": "nmd_2"
+      },
+      "locked": {
+        "lastModified": 1720396533,
+        "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=",
+        "owner": "nix-community",
+        "repo": "nix-on-droid",
+        "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.05",
+        "repo": "nix-on-droid",
+        "type": "github"
+      }
+    },
    "nixos-wsl": {
      "inputs": {
        "flake-compat": "flake-compat_3",
        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1760536587,
-        "narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=",
+        "lastModified": 1761563673,
+        "narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea",
+        "rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3",
        "type": "github"
      },
      "original": {
@@ -605,13 +656,45 @@
        "type": "indirect"
      }
    },
+    "nixpkgs-docs": {
+      "locked": {
+        "lastModified": 1705957679,
+        "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-for-bootstrap": {
+      "locked": {
+        "lastModified": 1720244366,
+        "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
+        "type": "github"
+      }
+    },
    "nixpkgs-latest": {
      "locked": {
-        "lastModified": 1761301280,
-        "narHash": "sha256-QMf+2TTvfgIVXpnqF7plNbNh72qqAxSgYuD4kZzPLVw=",
+        "lastModified": 1761810199,
+        "narHash": "sha256-iMLB/90mK7lncjk3GVYlAmN1K+D6/7JVhOSau3O7eK0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "96eb22de7512f7551c4b4ff0b71f27e7c306d9d0",
+        "rev": "d03f6e8ae73c291f8088abf52ae378c448a2cce3",
        "type": "github"
      },
      "original": {
@@ -639,11 +722,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1761114652,
-        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+        "lastModified": 1761672384,
+        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
+        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
        "type": "github"
      },
      "original": {
@@ -652,6 +735,22 @@
        "type": "indirect"
      }
    },
+    "nixpkgs24": {
+      "locked": {
+        "lastModified": 1735563628,
+        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixpkgs_2": {
      "locked": {
        "lastModified": 1761114652,
@@ -686,11 +785,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1759733170,
-        "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=",
+        "lastModified": 1761373498,
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "8913c168d1c56dc49a7718685968f38752171c3b",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
        "type": "github"
      },
      "original": {
@@ -702,11 +801,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1761173472,
-        "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=",
+        "lastModified": 1761468971,
+        "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb",
+        "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e",
        "type": "github"
      },
      "original": {
@@ -731,6 +830,60 @@
        "type": "github"
      }
    },
+    "nmd": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1666190571,
+        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
+        "owner": "rycee",
+        "repo": "nmd",
+        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmd",
+        "type": "gitlab"
+      }
+    },
+    "nmd_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs-docs"
+        ],
+        "scss-reset": "scss-reset"
+      },
+      "locked": {
+        "lastModified": 1705050560,
+        "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
+        "owner": "~rycee",
+        "repo": "nmd",
+        "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
+        "type": "sourcehut"
+      },
+      "original": {
+        "owner": "~rycee",
+        "repo": "nmd",
+        "type": "sourcehut"
+      }
+    },
+    "nmt": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648075362,
+        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
+        "owner": "rycee",
+        "repo": "nmt",
+        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmt",
+        "type": "gitlab"
+      }
+    },
    "pre-commit-hooks": {
      "inputs": {
        "flake-compat": "flake-compat",
@@ -785,14 +938,16 @@
      "inputs": {
        "copyparty": "copyparty",
        "home-manager": "home-manager",
+        "home-manager24": "home-manager24",
        "hyprland": "hyprland",
        "hyprland-plugins": "hyprland-plugins",
-        "hyprspace": "hyprspace",
        "lanzaboote": "lanzaboote",
+        "nix-on-droid": "nix-on-droid",
        "nixos-wsl": "nixos-wsl",
        "nixpkgs": "nixpkgs_5",
        "nixpkgs-latest": "nixpkgs-latest",
        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixpkgs24": "nixpkgs24",
        "sops-nix": "sops-nix",
        "yazi": "yazi"
      }
@@ -839,6 +994,22 @@
        "type": "github"
      }
    },
+    "scss-reset": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1631450058,
+        "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=",
+        "owner": "andreymatin",
+        "repo": "scss-reset",
+        "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91",
+        "type": "github"
+      },
+      "original": {
+        "owner": "andreymatin",
+        "repo": "scss-reset",
+        "type": "github"
+      }
+    },
    "sops-nix": {
      "inputs": {
        "nixpkgs": [
@@ -875,21 +1046,6 @@
      }
    },
    "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_3": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -952,11 +1108,11 @@
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1761106601,
-        "narHash": "sha256-N5G6xxIujyD797q27Prh8UEoQD6PWWCEd8r9zmCiv/k=",
+        "lastModified": 1761655046,
+        "narHash": "sha256-lG7eQqs8HDmmOl6vFkJ1iDlQBR+jY30uD4YtvWulCZc=",
        "owner": "sxyazi",
        "repo": "yazi",
-        "rev": "157156b5b8f36db15b2ba425c7d15589039a9e1e",
+        "rev": "564b8851961a7545a93ebf04c0f8dd5778d0eccb",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -2,23 +2,44 @@
  description = "Multisystem NixOS Flake of Lennart J. Kurzweg";

  inputs = {
-    nixpkgs =          { url = "nixpkgs/nixos-25.05";                                                                   };
-    nixpkgs-unstable = { url = "nixpkgs/nixos-unstable";                                                                };
-    nixpkgs-latest =   { url = "github:nixos/nixpkgs?ref=master";                                                       };
+    nixpkgs.url = "nixpkgs/nixos-25.05";
+    nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+    nixpkgs-latest.url = "github:nixos/nixpkgs?ref=master";
+    nixpkgs24.url = "github:NixOS/nixpkgs/nixos-24.05";

-    home-manager =     { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs";   };
+    home-manager = {
+      url = "github:nix-community/home-manager/release-25.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    home-manager24 ={
+      url = "github:nix-community/home-manager/release-24.05";
+      inputs.nixpkgs.follows = "nixpkgs24";
+    };

-    nixos-wsl =        { url = "github:nix-community/NixOS-WSL/main";                                                   };
+    nix-on-droid = {
+      url = "github:nix-community/nix-on-droid/release-24.05";
+      inputs.nixpkgs.follows = "nixpkgs24";
+      inputs.home-manager.follows = "home-manager24";
+    };

-    sops-nix =         { url = "github:Mic92/sops-nix";                           inputs.nixpkgs.follows = "nixpkgs";   };
-    lanzaboote =       { url = "github:nix-community/lanzaboote/v0.4.2";                                                };
+    nixos-wsl.url = "github:nix-community/NixOS-WSL/main";

-    hyprland =         { url = "git+https://github.com/hyprwm/Hyprland?submodules=1";                                   };
-    hyprland-plugins = { url = "github:hyprwm/hyprland-plugins";                  inputs.hyprland.follows = "hyprland"; };
-    hyprspace =        { url = "github:KZDKM/Hyprspace";                          inputs.hyprland.follows = "hyprland"; };
+    sops-nix ={
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };

-    yazi =             { url = "github:sxyazi/yazi";                                                                    };
-    copyparty =        { url = "github:9001/copyparty";                                                                 };
+    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
+
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
+    };
+
+    yazi.url = "github:sxyazi/yazi";
+
+    copyparty.url = "github:9001/copyparty";
  };

  outputs = { ... }@inputs: with inputs; let
@@ -28,20 +49,19 @@
    config = { allowUnfreePredicate = pkg: builtins.elem (simple-pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };

    hyper-base = rec {
-      inherit system;
+      system  = "x86_64-linux";
      user    = "nx2";
      domain  = "nx2.site";
      home    = "/home/${user}";
      webroot = "/var/lib/hugo/nx2site/public";
-      pkgs-version = "25.05";
    };

-    my-pkgs = host: import nixpkgs {
+    get-pkgs = { host, system?system, nixpkgs?inputs.nixpkgs, version?"25.05" }: import nixpkgs {
      inherit system config;
      overlays = [(final: prev: {
        unstable = import nixpkgs-unstable { inherit system config; };
        latest   = import nixpkgs-latest   { inherit system config; };
-        version  = "25.05";
+        inherit version;
      })] ++ (if host == "NxACE" then [
        copyparty.overlays.default
      ] else []);
@@ -53,17 +73,18 @@
  in {
    nixosConfigurations = let
      make-nixos-system = host: nvidia-settings: nixpkgs.lib.nixosSystem { 
-        pkgs = my-pkgs host;
+        pkgs = get-pkgs { inherit host; };
        modules = [ ./configuration.nix ];
        specialArgs = let
          hyper = hyper-base // { inherit host; nvidia = (nvidia-base // nvidia-settings); };
        in { inherit inputs hyper rice secrets; };
      };
      make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem { 
-        pkgs = my-pkgs host;
-        modules = [ ./nixos-wsl.nix ];
+        pkgs = get-pkgs { inherit host; };
+        modules = [ ./wsl.nix ];
        specialArgs = let
          hyper = hyper-base // { inherit host; };
+          rice = import ./flake-modules/rice.nix pkgs;
        in { inherit inputs hyper rice; };
      };
    in {
@@ -73,16 +94,37 @@
      NxDCS = make-nixos-wsl-system "NxDCS";
    };

+    nixOnDroidConfigurations = let
+      makeNODConfiguration = host: nix-on-droid.lib.nixOnDroidConfiguration rec {
+        pkgs = let
+          options = { inherit host; system = "aarch64-linux"; };
+        in (get-pkgs options) //
+          (get-pkgs (options // { version = "24.05"; nixpkgs = nixpkgs24; } )
+        );
+        modules = [ ./nod.nix ];
+        home-manager-path = home-manager24.outPath;
+        extraSpecialArgs = let
+          hyper = hyper-base // { 
+            inherit host;
+            system = "aarch64-linux";
+            user = "nix-on-droid";
+            home = "/data/data/com.termux.nix/files/home";
+          };
+          rice = import ./flake-modules/rice.nix pkgs;
+        in { inherit inputs hyper rice; };
+      };
+    in { NxS23U = makeNODConfiguration "NxS23U"; };
+
    homeConfigurations = let 
      make-home-configuration = host: user: nvidia-settings: home-manager.lib.homeManagerConfiguration {
-        pkgs = my-pkgs host;
+        pkgs = get-pkgs { inherit host; };
        modules = [ ./home.nix ];
        extraSpecialArgs = let
          hyper = hyper-base // { inherit host; nvidia = nvidia-base // nvidia-settings; };
        in { inherit inputs hyper rice secrets; };
      };
      make-shell-configuration = host: user: home-manager.lib.homeManagerConfiguration {
-        pkgs = my-pkgs host;
+        pkgs = get-pkgs { inherit host; };
        modules = [ ./shell-only.nix ];
        extraSpecialArgs = let
          hyper = hyper-base // { inherit host; };
--- a/home-modules/bash.nix
+++ b/home-modules/bash.nix
@@ -1,6 +1,10 @@
-{ ... }: 
+{ pkgs, ... }: 
 {
-  programs.bash = {
+  programs.bash = let
+    init = /* bash */ ''
+      source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh
+    '';
+  in {
    enable = true;
    shellAliases = {
      ll = "ls -l"; 
@@ -15,5 +19,10 @@
      "checkjobs"
    ];
    enableCompletion = false;
-  }; 
+    
+  } //  pkgs.lib.mkIf (pkgs.version != "24.05") {
+    shellInit = init;
+  } //  pkgs.lib.mkIf (pkgs.version != "25.05") {
+    profileExtra = init; 
+  };
 }
--- a/home-modules/fish.nix
+++ b/home-modules/fish.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }@all: with all;
 {
  home.packages = with pkgs; [
-    fish
    any-nix-shell

    (writeShellScriptBin "nxfetch" /* bash */ ''
@@ -40,6 +39,7 @@

  programs.fish = {
    enable = true;
+    package = pkgs.fish;
    shellAliases = let
      base-eza = "eza --icons --git --smart-group --group-directories-first";
    in {
@@ -115,7 +115,7 @@
      '';
      nx_backup = let
        destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/";
-      in pkgs.lib.mkIf (hyper.host != "NxACE" && hyper.host != "NxDCS") ''
+      in pkgs.lib.mkIf (hyper.host == "NxXPS" || hyper.host == "NxNORTH") ''
        set RPATH (curl -s https://${hyper.domain}/latest-backup)
        rsync -avz --info=progress2 -e "ssh -p ${builtins.toString secrets.ssh.port}" ${hyper.user}@ssh.${hyper.domain}:"$RPATH" ${destination}
      '';
--- a/home-modules/games.nix
+++ b/home-modules/games.nix
@@ -3,7 +3,7 @@ lib.mkIf (hyper.host == "NxNORTH")
 {
  home = {
    packages = (with pkgs.unstable; [
-      protonup
+      protonup-ng
      mangohud

      prismlauncher
--- a/home-modules/gpg.nix
+++ b/home-modules/gpg.nix
@@ -39,10 +39,6 @@
    enableFishIntegration = true;
    defaultCacheTtlSsh = min2sec 60;
    defaultCacheTtl = min2sec 30;
-    pinentry = {
-      package = pkgs.pinentry;
-      program = "pinentry";
-    };
    extraConfig = ''
      allow-loopback-pinentry
    '';
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -41,7 +41,7 @@ in {
      # inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
      # inputs.hyprfocus.packages.${pkgs.system}.hyprfocus
      # inputs.hycov.packages.${pkgs.system}.hycov
-      pkgs.hyprlandPlugins.hyprspace
+      # pkgs.hyprlandPlugins.hyprspace
      # inputs.hyprspace.packages.${pkgs.system}.Hyprspace
    ];

@@ -263,7 +263,6 @@ in {
        # "opacity ${transparency}, class:^(obsidian)$"
        "opacity ${transparency}, class:^(VSCodium)$"
        "opacity ${transparency}, title:^(wlogout)$"
-
        "opaque, title:^(GNU Image Manipulation Program)$"
        "opaque, fullscreen:1"
        
@@ -277,6 +276,7 @@ in {
        "dimaround, title:^(terminal-file-picker)$"
        "center, title:^(terminal-file-picker)$"
        "size 80% 80%, title:^(terminal-file-picker)$"
+        "size: 30% 30%, initialTitle:^(Select Calendar)$"
      ];


--- a/home-modules/pkgs-list/programs.nix
+++ b/home-modules/pkgs-list/programs.nix
@@ -11,8 +11,10 @@
    xfce.thunar
  ] ++ (if (hyper.host != "NxACE") then [
    signal-desktop
+    unstable.code-cursor-fhs
    obsidian
    zoom-us
    inkscape
+    audacity
  ] else []);
 }
--- a/home-modules/pkgs-list/shell.nix
+++ b/home-modules/pkgs-list/shell.nix
@@ -34,6 +34,7 @@
    systemctl-tui
    tldr
    w3m
+    which
    yt-dlp
  ];
 }
--- a/home-modules/ssh.nix
+++ b/home-modules/ssh.nix
@@ -8,7 +8,7 @@
      nxace = name: {
        host = name;
        hostname = "ssh.${hyper.domain}";
-        user = hyper.user;
+        user = "nx2";
        port = 50022;
        identityFile = "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}";
      };
--- a/home-modules/yazi.nix
+++ b/home-modules/yazi.nix
@@ -1,39 +1,17 @@
 { pkgs, ... }@all: with all; let
-  tfc = pkgs.xdg-desktop-portal-termfilechooser;
+  nox-var = (pkgs.version != "24.05");
+  tfc = pkgs.unstable.xdg-desktop-portal-termfilechooser;
 in {
  home.packages = [
    pkgs.unar
    tfc
  ];
-  
  programs.yazi = {
    enable = true;
    # package = pkgs.yazi;
    package = inputs.yazi.packages.${hyper.system}.default;
    enableFishIntegration = true;
-    shellWrapperName = "ya";
-    initLua = /* lua */ ''
-      require("zoxide"):setup {
-      	update_db = true,
-      }
-      Status:children_add(function()
-      	local h = cx.active.current.hovered
-      	if not h or ya.target_family() ~= "unix" then
-      		return ""
-      	end
-
-      	return ui.Line {
-      		ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
-      		":",
-      		ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
-      		" ",
-      	}
-      end, 500, Status.RIGHT)
-    '';
-    plugins = with pkgs; {
-      inherit glow git;
-    };
-    # initLua = /* lua */  '' '';
+    # initLua = /* lua */  '' ''; # down
    keymap = {
      mgr.keymap = [
      	{ on = "<Esc>"; run = "escape";             desc = "Exit visual mode, clear selected, or cancel search"; }
@@ -403,15 +381,39 @@ in {
        ];
      };
    };
-  };
+  } // (if nox-var then {
+    shellWrapperName = "ya";
+    initLua = /* lua */ ''
+      require("zoxide"):setup {
+      	update_db = true,
+      }
+      Status:children_add(function()
+      	local h = cx.active.current.hovered
+      	if not h or ya.target_family() ~= "unix" then
+      		return ""
+      	end
+
+      	return ui.Line {
+      		ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
+      		":",
+      		ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
+      		" ",
+      	}
+      end, 500, Status.RIGHT)
+    '';
+    plugins = with pkgs; {
+      inherit glow git;
+    };
+  } else {});
+  
  xdg = {
    configFile."xdg-desktop-portal-termfilechooser/config" = {
      force = true;
      text = ''
        [filechooser]
        cmd=${tfc}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh
-        env=TERMCMD=ghostty --title="terminal-file-picker -e"
        default_dir=$HOME
+        env=TERMCMD=ghostty --title="terminal-file-picker -e"
        open_mode=suggested
        save_mode=last
      '';
--- a/nix-on-droid.nix
+++ b/nix-on-droid.nix
@@ -1,24 +0,0 @@
-{ pkgs, ... }@all: with all;
-{
-  # Simply install just the packages
-  environment.packages = with pkgs; [
-    helix
-    git
-    lazygit
-    yazi
-  ];
-
-  # Backup etc files instead of failing to activate generation if a file already exists in /etc
-  environment.etcBackupExtension = ".bak";
-
-  # Read the changelog before changing this value
-  system.stateVersion = pkgs.version;
-
-  # Set up nix for flakes
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-  '';
-
-  # Set your time zone
-  time.timeZone = "Europe/Berlin";
-}
--- a/nod.nix
+++ b/nod.nix
@@ -0,0 +1,32 @@
+{ pkgs, ... }@all: with all; {
+  environment = {
+    packages = import ./system-modules/base-packages.nix pkgs;
+    etcBackupExtension = ".bak";
+    motd = "";
+  };
+  terminal = {
+    font = rice.font.code.regular-path;
+  };
+  android-integration = {
+    termux-setup-storage.enable = true;
+  };
+  system.stateVersion = pkgs.version;
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
+  user ={
+    shell = "${pkgs.fish}/bin/fish";
+    # userName = pkgs.lib.mkForce hyper.user; if its read-only, whats the point of this option???
+  };
+
+
+  # Set your time zone
+  time.timeZone = "Europe/Berlin";
+
+  home-manager = {
+    config = import ./shell-only.nix;
+    useGlobalPkgs = true;
+    backupFileExtension = "backup";
+    extraSpecialArgs = { inherit (all) inputs hyper rice; };
+  };
+}
--- a/shell-only.nix
+++ b/shell-only.nix
@@ -12,7 +12,7 @@
    ./home-modules/nixd.nix
    ./home-modules/nxgs.nix
    ./home-modules/pandoc.nix
-    ./home-modules/programming/c.nix
+    # ./home-modules/programming/c.nix
    ./home-modules/programming/gleam.nix
    ./home-modules/programming/go.nix
    ./home-modules/programming/java.nix
@@ -30,7 +30,7 @@
  home = {
    username = hyper.user;    
    homeDirectory = hyper.home;
-    stateVersion = hyper.pkgs-version;
+    stateVersion = pkgs.version;
  };
  xdg = {
    enable = true;
--- a/system-modules/base-packages.nix
+++ b/system-modules/base-packages.nix
@@ -1,19 +1,18 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; ([
-    git
-    git-crypt
-    lazygit # home-manager module is bugged
-    wget
-    curlHTTP3
-    zip
-    unzip
-    p7zip
-    unar
-    vim
-    htop
-    openssl
-    dmidecode
-    file
-  ]);
+pkgs: with pkgs; [
+  busybox
+  # coreutils-full
+  gitFull
+  git-crypt

-}
+  wget
+  curlHTTP3
+  zip
+  unzip
+  p7zip
+  unar
+  vim
+  htop
+  openssl
+  dmidecode
+  file
+]
--- a/nixos-wsl.nix
+++ b/nixos-wsl.nix
Author	SHA1	Message	Date
Lennart J. Kurzweg (Nx2)	e73b7333fc	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles into nod	2025-11-11 00:44:25 +01:00
Lennart J. Kurzweg (Nx2)	fcfc125373	nod	2025-11-11 00:43:22 +01:00
Lennart J. Kurzweg (Nx2)	3418cfd8f3	cursor	2025-11-06 19:31:43 +01:00
Lennart J. Kurzweg (Nx2)	2585c76039	audacity	2025-11-02 20:58:02 +01:00
Lennart J. Kurzweg (Nx2)	04f10a4afd	thunderbird paste event window dimensions	2025-11-02 20:57:51 +01:00
Lennart J. Kurzweg (Nx2)	651458875c	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles	2025-10-30 09:28:31 +01:00
Lennart J. Kurzweg (Nx2)	9d04a09de8	fix xdg-desktop-portal-termfile-chooser	2025-10-30 09:28:25 +01:00
Lennart J. Kurzweg (Nx2)	e7c1c255bc	Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles into nod	2025-10-21 23:51:00 +02:00
Lennart J. Kurzweg (Nx2)	d81aa406a4	nod	2025-09-03 19:46:44 +02:00