diff --git a/flake-modules/rice.nix b/flake-modules/rice.nix index 717aa19..e204622 100644 --- 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"; diff --git a/flake.lock b/flake.lock index 77ca2a3..9bbfcef 100644 --- a/flake.lock +++ b/flake.lock @@ -153,7 +153,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -234,7 +234,7 @@ "type": "github" } }, - "home-manager-nod": { + "home-manager24": { "inputs": { "nixpkgs": [ "nixpkgs24" @@ -255,27 +255,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nix-on-droid", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709445365, - "narHash": "sha256-DVv6nd9FQBbMWbOmhq0KVqmlc3y3FMSYl49UXmMcO+0=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "4de84265d7ec7634a69ba75028696d74de9a44a7", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -517,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": [ @@ -637,7 +595,9 @@ }, "nix-on-droid": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": [ + "home-manager24" + ], "nix-formatter-pack": "nix-formatter-pack", "nixpkgs": [ "nixpkgs24" @@ -978,10 +938,9 @@ "inputs": { "copyparty": "copyparty", "home-manager": "home-manager", - "home-manager-nod": "home-manager-nod", + "home-manager24": "home-manager24", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "hyprspace": "hyprspace", "lanzaboote": "lanzaboote", "nix-on-droid": "nix-on-droid", "nixos-wsl": "nixos-wsl", @@ -1087,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=", diff --git a/flake.nix b/flake.nix index dd1b337..19231b5 100644 --- a/flake.nix +++ b/flake.nix @@ -2,27 +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"; + }; - nix-on-droid = { url = "github:nix-community/nix-on-droid/release-24.05"; inputs.nixpkgs.follows = "nixpkgs24"; }; - nixpkgs24 = { url = "github:NixOS/nixpkgs/nixos-24.05"; }; - home-manager-nod = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs24"; }; + nix-on-droid = { + url = "github:nix-community/nix-on-droid/release-24.05"; + inputs.nixpkgs.follows = "nixpkgs24"; + inputs.home-manager.follows = "home-manager24"; + }; - nixos-wsl = { url = "github:nix-community/NixOS-WSL/main"; }; + nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; - sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.2"; }; + sops-nix ={ + url = "github:Mic92/sops-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - 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"; }; + lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2"; - yazi = { url = "github:sxyazi/yazi"; }; - copyparty = { url = "github:9001/copyparty"; }; + 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 @@ -64,7 +81,7 @@ }; make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem { pkgs = get-pkgs { inherit host; }; - modules = [ ./nixos-wsl.nix ]; + modules = [ ./wsl.nix ]; specialArgs = let hyper = hyper-base // { inherit host; }; rice = import ./flake-modules/rice.nix pkgs; @@ -79,11 +96,13 @@ nixOnDroidConfigurations = let makeNODConfiguration = host: nix-on-droid.lib.nixOnDroidConfiguration rec { - pkgs = get-pkgs { host = "NxS23U"; system = "aarch64-linux"; version = "25.05"; } // ( - get-pkgs { host = "NxS23U"; system = "aarch64-linux"; nixpkgs = nixpkgs24; version = "24.05"; } + pkgs = let + options = { inherit host; system = "aarch64-linux"; }; + in (get-pkgs options) // + (get-pkgs (options // { version = "24.05"; nixpkgs = nixpkgs24; } ) ); - modules = [ ./nix-on-droid.nix ]; - home-manager-path = home-manager-nod.outPath; + modules = [ ./nod.nix ]; + home-manager-path = home-manager24.outPath; extraSpecialArgs = let hyper = hyper-base // { inherit host; diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 5cb951d..73ea5d2 100644 --- 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 ]; diff --git a/home-modules/ssh.nix b/home-modules/ssh.nix index 5a67b59..7b06d4a 100644 --- 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}"; }; diff --git a/nix-on-droid.nix b/nod.nix similarity index 63% rename from nix-on-droid.nix rename to nod.nix index c3b8e10..3aef4ec 100644 --- a/nix-on-droid.nix +++ b/nod.nix @@ -1,9 +1,11 @@ -{ pkgs, ... }@all: -{ - +{ 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; @@ -12,12 +14,17 @@ 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 = ./shell-only.nix; + config = import ./shell-only.nix; useGlobalPkgs = true; backupFileExtension = "backup"; extraSpecialArgs = { inherit (all) inputs hyper rice; }; diff --git a/shell-only.nix b/shell-only.nix index 478735c..8341478 100644 --- a/shell-only.nix +++ b/shell-only.nix @@ -1,4 +1,4 @@ -{ ... }@all: with all; { +{ pkgs, ... }@all: with all; { imports = [ ./home-modules/bash.nix ./home-modules/color-pallete.nix @@ -30,7 +30,7 @@ home = { username = hyper.user; homeDirectory = hyper.home; - stateVersion = hyper.pkgs-version; + stateVersion = pkgs.version; }; xdg = { enable = true; diff --git a/nixos-wsl.nix b/wsl.nix similarity index 100% rename from nixos-wsl.nix rename to wsl.nix