nx2/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nod

Browse Source
This commit is contained in:
Lennart J. Kurzweg (Nx2)
2025-11-11 00:43:22 +01:00
parent e7c1c255bc
commit fcfc125373
8 changed files with 62 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
flake-modules/rice.nix
View File

@@ -55,9 +55,10 @@ pkgs: rec {
}; };
in ccolor // fcolor // xcolor; in ccolor // fcolor // xcolor;
font = { font = {
code = { code = rec {
name = "JetBrainsMono Nerd Font"; name = "JetBrainsMono Nerd Font";
package = pkgs.nerd-fonts.jetbrains-mono; package = pkgs.nerd-fonts.jetbrains-mono;
regular-path = "${package}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFont-Regular.ttf";
}; };
base = { base = {
# name = "NewComputerModern08"; # name = "NewComputerModern08";

68
flake.lock generated
View File

@@ -153,7 +153,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@@ -234,7 +234,7 @@
"type": "github" "type": "github"
} }
}, },
"home-manager-nod": { "home-manager24": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs24" "nixpkgs24"
@@ -255,27 +255,6 @@
"type": "github" "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": { "hyprcursor": {
"inputs": { "inputs": {
"hyprlang": [ "hyprlang": [
@@ -517,27 +496,6 @@
"type": "github" "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": { "hyprutils": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -637,7 +595,9 @@
}, },
"nix-on-droid": { "nix-on-droid": {
"inputs": { "inputs": {
"home-manager": "home-manager_2", "home-manager": [
"home-manager24"
],
"nix-formatter-pack": "nix-formatter-pack", "nix-formatter-pack": "nix-formatter-pack",
"nixpkgs": [ "nixpkgs": [
"nixpkgs24" "nixpkgs24"
@@ -978,10 +938,9 @@
"inputs": { "inputs": {
"copyparty": "copyparty", "copyparty": "copyparty",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-nod": "home-manager-nod", "home-manager24": "home-manager24",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins", "hyprland-plugins": "hyprland-plugins",
"hyprspace": "hyprspace",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nix-on-droid": "nix-on-droid", "nix-on-droid": "nix-on-droid",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
@@ -1087,21 +1046,6 @@
} }
}, },
"systems_2": { "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": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

59
flake.nix
View File

@@ -2,27 +2,44 @@
description = "Multisystem NixOS Flake of Lennart J. Kurzweg"; description = "Multisystem NixOS Flake of Lennart J. Kurzweg";
inputs = { inputs = {
nixpkgs = { url = "nixpkgs/nixos-25.05"; }; nixpkgs.url = "nixpkgs/nixos-25.05";
nixpkgs-unstable = { url = "nixpkgs/nixos-unstable"; }; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
nixpkgs-latest = { url = "github:nixos/nixpkgs?ref=master"; }; 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"; }; nix-on-droid = {
nixpkgs24 = { url = "github:NixOS/nixpkgs/nixos-24.05"; }; url = "github:nix-community/nix-on-droid/release-24.05";
home-manager-nod = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs24"; }; 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"; }; sops-nix ={
lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.2"; }; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = { url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; }; lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; };
hyprspace = { url = "github:KZDKM/Hyprspace"; inputs.hyprland.follows = "hyprland"; };
yazi = { url = "github:sxyazi/yazi"; }; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
copyparty = { url = "github:9001/copyparty"; }; 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 outputs = { ... }@inputs: with inputs; let
@@ -64,7 +81,7 @@
}; };
make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem { make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem {
pkgs = get-pkgs { inherit host; }; pkgs = get-pkgs { inherit host; };
modules = [ ./nixos-wsl.nix ]; modules = [ ./wsl.nix ];
specialArgs = let specialArgs = let
hyper = hyper-base // { inherit host; }; hyper = hyper-base // { inherit host; };
rice = import ./flake-modules/rice.nix pkgs; rice = import ./flake-modules/rice.nix pkgs;
@@ -79,11 +96,13 @@
nixOnDroidConfigurations = let nixOnDroidConfigurations = let
makeNODConfiguration = host: nix-on-droid.lib.nixOnDroidConfiguration rec { makeNODConfiguration = host: nix-on-droid.lib.nixOnDroidConfiguration rec {
pkgs = get-pkgs { host = "NxS23U"; system = "aarch64-linux"; version = "25.05"; } // ( pkgs = let
get-pkgs { host = "NxS23U"; system = "aarch64-linux"; nixpkgs = nixpkgs24; version = "24.05"; } options = { inherit host; system = "aarch64-linux"; };
in (get-pkgs options) //
(get-pkgs (options // { version = "24.05"; nixpkgs = nixpkgs24; } )
); );
modules = [ ./nix-on-droid.nix ]; modules = [ ./nod.nix ];
home-manager-path = home-manager-nod.outPath; home-manager-path = home-manager24.outPath;
extraSpecialArgs = let extraSpecialArgs = let
hyper = hyper-base // { hyper = hyper-base // {
inherit host; inherit host;

2
home-modules/hyprland.nix
View File

@@ -41,7 +41,7 @@ in {
# inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo # inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
# inputs.hyprfocus.packages.${pkgs.system}.hyprfocus # inputs.hyprfocus.packages.${pkgs.system}.hyprfocus
# inputs.hycov.packages.${pkgs.system}.hycov # inputs.hycov.packages.${pkgs.system}.hycov
pkgs.hyprlandPlugins.hyprspace # pkgs.hyprlandPlugins.hyprspace
# inputs.hyprspace.packages.${pkgs.system}.Hyprspace # inputs.hyprspace.packages.${pkgs.system}.Hyprspace
]; ];

2
home-modules/ssh.nix
View File

@@ -8,7 +8,7 @@
nxace = name: { nxace = name: {
host = name; host = name;
hostname = "ssh.${hyper.domain}"; hostname = "ssh.${hyper.domain}";
user = hyper.user; user = "nx2";
port = 50022; port = 50022;
identityFile = "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}"; identityFile = "${hyper.home}/vault/ssh/nxace-nx2-${hyper.host}";
}; };

15
nix-on-droid.nix → nod.nix
View File

@@ -1,9 +1,11 @@
{ pkgs, ... }@all: { pkgs, ... }@all: with all; {
{
environment = { environment = {
packages = import ./system-modules/base-packages.nix pkgs; packages = import ./system-modules/base-packages.nix pkgs;
etcBackupExtension = ".bak"; etcBackupExtension = ".bak";
motd = "";
};
terminal = {
font = rice.font.code.regular-path;
}; };
android-integration = { android-integration = {
termux-setup-storage.enable = true; termux-setup-storage.enable = true;
@@ -12,12 +14,17 @@
nix.extraOptions = '' nix.extraOptions = ''
experimental-features = nix-command flakes 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 # Set your time zone
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
home-manager = { home-manager = {
config = ./shell-only.nix; config = import ./shell-only.nix;
useGlobalPkgs = true; useGlobalPkgs = true;
backupFileExtension = "backup"; backupFileExtension = "backup";
extraSpecialArgs = { inherit (all) inputs hyper rice; }; extraSpecialArgs = { inherit (all) inputs hyper rice; };

4
shell-only.nix
View File

@@ -1,4 +1,4 @@
{ ... }@all: with all; { { pkgs, ... }@all: with all; {
imports = [ imports = [
./home-modules/bash.nix ./home-modules/bash.nix
./home-modules/color-pallete.nix ./home-modules/color-pallete.nix
@@ -30,7 +30,7 @@
home = { home = {
username = hyper.user; username = hyper.user;
homeDirectory = hyper.home; homeDirectory = hyper.home;
stateVersion = hyper.pkgs-version; stateVersion = pkgs.version;
}; };
xdg = { xdg = {
enable = true; enable = true;

0
nixos-wsl.nix → wsl.nix
View File