Kabbone/nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Kabbone:3bb1e6c8fe5328186dad7bf04c7cfdbfa4626d05
Branches Tags
Kabbone:main
Kabbone:dev
Kabbone:refactor
..
compare: Kabbone:38c4f44dc528fd19782a241cb1e7f7b6cec44138
Branches Tags
Kabbone:main
Kabbone:dev
Kabbone:refactor

3 Commits
3bb1e6c8fe ... 38c4f44dc5

Author SHA1 Message Date
Kabbone
38c4f44dc5
flake update 2023-12-19 16:05:53 +01:00
Kabbone
3c0089c26f
hosts: rearrange order in hosts 2023-12-19 16:05:48 +01:00
Kabbone
b7a5d90616
hosts: laptop: add missing zsh 2023-12-19 16:05:44 +01:00
4 changed files with 49 additions and 47 deletions
Show Stats Expand all files Collapse all files

42
flake.lock generated
View File

@ -90,11 +90,11 @@
]
},
"locked": {
"lastModified": 1702720862,
"narHash": "sha256-dh3dvtt+sl+uuhmJIFozFLtAkSAnLrhjWiTCZXCuAYc=",
"lastModified": 1702937117,
"narHash": "sha256-4GjkL2D01bDg00UZN/SeGrnBZrDVOFeZTbQx6U702Vc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b00a03b66868d052b2aa13c775404c00ad9d0f48",
"rev": "e8aaced73ebaf6bfa8e3c6ab0a19cb184bc4d798",
"type": "github"
},
"original": {
@ -110,11 +110,11 @@
]
},
"locked": {
"lastModified": 1702676849,
"narHash": "sha256-XqcREaTS38/QOsN8fk8PP325/UXHyF9enbP5ZPw5aiA=",
"lastModified": 1702814678,
"narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "aa99c2f4e9847cbb7e46fac0844ea1eb164b3b3a",
"rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef",
"type": "github"
},
"original": {
@ -132,11 +132,11 @@
]
},
"locked": {
"lastModified": 1702541169,
"narHash": "sha256-+ojqwo6xm7s5t9reWTVnpEUQRwZESdMslMp5bTM9t/8=",
"lastModified": 1702725654,
"narHash": "sha256-jcYYMEkHArk1K8IpL8X1+AzipmGlkRimKBpQ9kmDD4w=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "f17ce9ffa4934231df7711cbee19dd21fe1a2048",
"rev": "e7ffb0cd75f38ac65d99614acfea576e1b23c100",
"type": "github"
},
"original": {
@ -153,11 +153,11 @@
]
},
"locked": {
"lastModified": 1702607241,
"narHash": "sha256-+farSP+jVeLssxkSTS+bH60F+6CZATEA64sbmyZtq2E=",
"lastModified": 1702946274,
"narHash": "sha256-4eYMBzBOj8rin0xzSnWFTXDcy+Sbr7oQ/gS2cQU96ac=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "67d28f368ee387bc9e4cfbf89780ccc31643bbed",
"rev": "7e429619284c64c128108a7e1e8cf0a5d334118d",
"type": "github"
},
"original": {
@ -206,11 +206,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1702346276,
"narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
"lastModified": 1702780907,
"narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
"rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
"type": "github"
},
"original": {
@ -222,11 +222,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1702312524,
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
"lastModified": 1702830618,
"narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
"rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
"type": "github"
},
"original": {
@ -238,11 +238,11 @@
},
"nur": {
"locked": {
"lastModified": 1702716258,
"narHash": "sha256-GDtOh/zvK8KKWv9UQrU3qQwm57Kk/sbQjCoxJqozzP0=",
"lastModified": 1702997397,
"narHash": "sha256-th/EqbtB6jDFhe12kTsssDzF9Ev0p9Yq/oaiWXS3H9w=",
"owner": "nix-community",
"repo": "NUR",
"rev": "42b64e39b12fdb35d233af927c1e44449a78ca3c",
"rev": "a04eea76ecdc42258fc3ed8391ba838145d0b96a",
"type": "github"
},
"original": {

52
hosts/default.nix
View File

@ -11,7 +11,7 @@
# └─ ./home.nix
#
{ lib, inputs, nixpkgs, nixos-hardware, home-manager, nur, user, userdmz, userserver, location, agenix, jovian-nixos, microvm, ... }:
{ lib, inputs, nixpkgs, nixos-hardware, home-manager, home-manager-unstable, nur, user, userdmz, userserver, location, agenix, jovian-nixos, microvm, ... }:
let
system = "x86_64-linux"; # System architecture
@ -135,31 +135,6 @@ in
];
};
dmz = lib.nixosSystem { # Desktop profile
inherit system;
specialArgs = { inherit inputs user location nixos-hardware nur agenix nixpkgs; };
modules = [
agenix.nixosModules.default
nur.nixosModules.nur
microvm.nixosModules.host
./dmz
./configuration_server.nix
nixos-hardware.nixosModules.common-pc-ssd
home-manager.nixosModules.home-manager {
nixpkgs.overlays = [
nur.overlay
];
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [(import ./home_server.nix)] ++ [(import ./dmz/home.nix)];
};
}
];
};
nasbackup = lib.nixosSystem { # Desktop profile
inherit system;
#user = "dmz-user";
@ -213,6 +188,31 @@ in
];
};
dmz = lib.nixosSystem { # Desktop profile
inherit system;
specialArgs = { inherit inputs user location nixos-hardware nur agenix nixpkgs; };
modules = [
agenix.nixosModules.default
nur.nixosModules.nur
microvm.nixosModules.host
./dmz
./configuration_server.nix
nixos-hardware.nixosModules.common-pc-ssd
home-manager.nixosModules.home-manager {
nixpkgs.overlays = [
nur.overlay
];
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit user; };
home-manager.users.${user} = {
imports = [(import ./home_server.nix)] ++ [(import ./dmz/home.nix)];
};
}
];
};
q920 = lib.nixosSystem { # Laptop profile
inherit system;
specialArgs = { inherit inputs user location ; };

1
hosts/desktop/home.nix
View File

@ -35,6 +35,7 @@
pulsemixer
#yubioath-flutter
nitrokey-app
kicad
# Display
#light # xorg.xbacklight not supported. Other option is just use xrandr.

1
hosts/laptop/default.nix
View File

@ -57,6 +57,7 @@
};
programs = { # No xbacklight, this is the alterantive
zsh.enable = true;
dconf.enable = true;
light.enable = true;
ssh.startAgent = false;