don/NixOS-Configs
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Activity

Merge branch 'flake-2.0' of ssh://git.duckland.org:2202/don/NixOS-Configs into flake-2.0

Browse source
This commit is contained in:
Don Harper 2024-03-13 16:52:14 -05:00
commit fe5a6f542d
19 changed files with 121 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

157
flake.nix
View file

@ -23,117 +23,62 @@
nixpkgs, nixpkgs,
nixpkgs-2311, nixpkgs-2311,
nix, nix,
disko,
nixos-hardware, nixos-hardware,
home-manager, home-manager,
wayland-pipewire-idle-inhibit, wayland-pipewire-idle-inhibit,
... ...
}: { }:
nixosConfigurations = let let
workstation = { inputs = { inherit disko home-manager nixpkgs nixos-hardware wayland-pipewire-idle-inhibit; };
system = "x86_64-linux";
modules = [ genPkgs = system: import nixpkgs { inherit system; config.allowUnfree = true; };
./workstation
inputs.home-manager.nixosModules.home-manager # creates a nixos system config
./home nixosSystem = system: hostname: username:
./home/gui let
./wm/sway pkgs = genPkgs system;
]; in
}; nixpkgs.lib.nixosSystem {
server = { inherit system;
system = "x86_64-linux"; specialArgs = {
modules = [ inherit pkgs;
./server # lets us use these things in modules
inputs.home-manager.nixosModules.home-manager customArgs = { inherit system hostname username pkgs; };
./home };
]; modules = [
}; #disko.nixosModules.disko
./hosts/${hostname}
home-manager.nixosModules.home-manager {
networking.hostName = hostname;
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
#home-manager.users.${username} = { imports = [ ./home/${username}.nix ]; };
}
];
};
in { in {
fred = inputs.nixpkgs.lib.nixosSystem { nixosConfigurations = {
specialArgs = {inherit inputs;}; # clients
modules = server.modules ++ [ ace = nixosSystem "x86_64-linux" "ace" "don";
{ dragon = nixosSystem "x86_64-linux" "dragon" "don";
networking.hostName = "fred"; eve = nixosSystem "x86_64-linux" "eve" "don";
} loki = nixosSystem "x86_64-linux" "loki" "don";
./hosts/fred pocket2 = nixosSystem "x86_64-linux" "pocket2" "don";
]; smaug = nixosSystem "x86_64-linux" "smaug" "don";
}; #t2 = nixosSystem "x86_64-linux" "t2" "don";
www2 = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;}; # servers
modules = server.modules ++ [ display = nixosSystem "x86_64-linux" "display" "don";
{ harper2 = nixosSystem "x86_64-linux" "harper2" "don";
networking.hostName = "www2"; harper = nixosSystem "x86_64-linux" "harper" "don";
} nuwww = nixosSystem "x86_64-linux" "nuwww" "don";
./hosts/fred pihole = nixosSystem "x86_64-linux" "pihole" "don";
]; www2 = nixosSystem "x86_64-linux" "www2" "don";
};
loki = inputs.nixpkgs.lib.nixosSystem { # test system
#specialArgs = {inherit inputs;}; # use this for a blank ISO + disko to work
#extraSpecialArgs = {inherit inputs;}; nixos = nixosSystem "x86_64-linux" "nixos" "don";
modules = workstation.modules ++ [
{
networking.hostName = "loki";
}
./hosts/loki
inputs.nixos-hardware.nixosModules.dell-xps-13-9310
];
};
smaug = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = workstation.modules ++ [
{
networking.hostName = "smaug";
}
./hosts/smaug
./hosts/smaug/podman.nix
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260
];
};
pocket2 = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = workstation.modules ++ [
{
networking.hostName = "pocket2";
}
./hosts/pocket2
inputs.nixos-hardware.nixosModules.common-cpu-intel
inputs.nixos-hardware.nixosModules.common-gpu-intel
inputs.nixos-hardware.nixosModules.common-pc-laptop
inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
];
};
dragon = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = workstation.modules ++ [
{
networking.hostName = "dragon";
}
./hosts/dragon
inputs.nixos-hardware.nixosModules.common-cpu-intel
inputs.nixos-hardware.nixosModules.common-gpu-intel
inputs.nixos-hardware.nixosModules.common-pc-laptop
inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
];
};
eve = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = workstation.modules ++ [
{
networking.hostName = "eve";
}
./hosts/eve
inputs.nixos-hardware.nixosModules.google-pixelbook
];
};
vm2 = inputs.nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs;};
modules = workstation.modules ++ [
{
services.getty.autologinUser = "don";
networking.hostName = "vm2";
}
./hosts/vm1
];
}; };
}; };
};
} }

2
home/gui/citrix.nix
View file

@ -1,8 +1,6 @@
{ config, pkgs, inputs, ... }: { config, pkgs, inputs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
#inputs.nixpkgs-2311.opencv
#opencv
citrix_workspace citrix_workspace
]; ];
home.file."ICAClient" = { home.file."ICAClient" = {

5
hosts/ace/default.nix
View file

@ -4,5 +4,10 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../workstation
../../home
../../home/gui
../../wm
]; ];
networking.hostName = "ace";
} }

3
hosts/display/default.nix
View file

@ -4,5 +4,8 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../server
../../home
]; ];
networking.hostName = "display";
} }

11
hosts/dragon/default.nix
View file

@ -1,8 +1,17 @@
{ config, pkgs, ... }: { inputs, config, pkgs, ... }:
{ {
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
#inputs.nixos-hardware.nixosModules.common-cpu-intel
#inputs.nixos-hardware.nixosModules.common-gpu-intel
#inputs.nixos-hardware.nixosModules.common-pc-laptop
#inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
../../workstation
../../home
../../home/gui
../../wm
]; ];
networking.hostName = "dragon";
} }

5
hosts/eve/default.nix
View file

@ -4,5 +4,10 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../workstation
../../home
../../home/gui
../../wm
]; ];
networking.hostName = "eve";
} }

1
hosts/fred/default.nix
View file

@ -6,4 +6,5 @@
./hardware-configuration.nix ./hardware-configuration.nix
./podman.nix ./podman.nix
]; ];
networking.hostName = "fred";
} }

3
hosts/harper/default.nix
View file

@ -4,5 +4,8 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../server
../../home
]; ];
networking.hostName = "harper";
} }

3
hosts/harper2/default.nix
View file

@ -4,5 +4,8 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../server
../../home
]; ];
networking.hostName = "harper2";
} }

5
hosts/loki/default.nix
View file

@ -4,5 +4,10 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../workstation
../../home
../../home/gui
../../wm
]; ];
networking.hostName = "loki";
} }

3
hosts/nuwww/default.nix
View file

@ -4,5 +4,8 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../server
../../home
]; ];
networking.hostName = "nuwww";
} }

3
hosts/pihole/default.nix
View file

@ -4,5 +4,8 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../server
../../home
]; ];
networking.hostName = "pihole";
} }

11
hosts/pocket2/default.nix
View file

@ -1,8 +1,17 @@
{ config, pkgs, ... }: { inputs, config, pkgs, ... }:
{ {
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
#inputs.nixos-hardware.nixosModules.common-cpu-intel
#inputs.nixos-hardware.nixosModules.common-gpu-intel
#inputs.nixos-hardware.nixosModules.common-pc-laptop
#inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
../../workstation
../../home
../../home/gui
../../wm
]; ];
networking.hostName = "pocket2";
} }

5
hosts/smaug/default.nix
View file

@ -4,5 +4,10 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../workstation
../../home
../../home/gui
../../wm
]; ];
networking.hostName = "smaug";
} }

5
hosts/t2/default.nix
View file

@ -4,5 +4,10 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../workstation
../../home
../../home/gui
../../wm
]; ];
networking.hostName = "t2";
} }

1
hosts/vm1/default.nix
View file

@ -5,4 +5,5 @@
[ [
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
networking.hostName = "vm1";
} }

3
hosts/www2/default.nix
View file

@ -4,5 +4,8 @@
imports = imports =
[ [
./hardware-configuration.nix ./hardware-configuration.nix
../../server
../../home
]; ];
networking.hostName = "www2";
} }

2
server/default.nix
View file

@ -154,7 +154,7 @@ in
gnupg = { gnupg = {
agent = { agent = {
enable = true; enable = true;
pinentryFlavor = "curses"; #pinentryFlavor = "curses";
enableSSHSupport = true; enableSSHSupport = true;
}; };
}; };

4
wm/default.nix Normal file
View file

@ -0,0 +1,4 @@
{ pkgs, ... }:
{
imports = [ ./sway ];
}