This commit is contained in:
iFargle 2024-01-31 12:51:19 +09:00
parent 6d52a86a47
commit bcced89cba
10 changed files with 8 additions and 23 deletions

View file

@ -53,8 +53,8 @@
osaka-linode-01 = libx.mkHost { hostname = "osaka-linode-01"; }; osaka-linode-01 = libx.mkHost { hostname = "osaka-linode-01"; };
framework-server = libx.mkHost { hostname = "framework-server"; }; framework-server = libx.mkHost { hostname = "framework-server"; };
nuc-server = libx.mkHost { hostname = "nuc-server"; }; nuc-server = libx.mkHost { hostname = "nuc-server"; };
nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; repo = "nixpkgs-unstable"; desktop = "hyprland"; gpu = "nvidia"; theme = "tokyo-night"; }; nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; unfree = true; repo = "nixpkgs-unstable"; desktop = "hyprland"; gpu = "nvidia"; theme = "tokyo-night"; };
nixos-framework = libx.mkHost { hostname = "nixos-framework"; repo = "nixpkgs-unstable"; desktop = "hyprland"; gpu = "amd"; theme = "tokyo-night"; }; nixos-framework = libx.mkHost { hostname = "nixos-framework"; unfree = true; repo = "nixpkgs-unstable"; desktop = "hyprland"; gpu = "amd"; theme = "tokyo-night"; };
backups-rpi4 = libx.mkHost { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; }; backups-rpi4 = libx.mkHost { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; };
piaware-rpi4 = libx.mkHost { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; }; piaware-rpi4 = libx.mkHost { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; };
quitman-rpi4 = libx.mkHost { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; }; quitman-rpi4 = libx.mkHost { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; };

View file

@ -41,10 +41,13 @@
system ? "x86_64-linux", system ? "x86_64-linux",
theme ? "default", theme ? "default",
type ? "default", type ? "default",
repo ? "nixpkgs" repo ? "nixpkgs",
unfree ? false
}: inputs.nixpkgs.lib.nixosSystem { }: inputs.nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu system theme; }; specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu system theme; };
pkgs = import inputs.${repo} { inherit system; }; pkgs = import inputs.${repo} {
inherit system;
config.allowUnfree = unfree; };
modules = [ modules = [
# Types are 'default', 'small', and 'minimal' # Types are 'default', 'small', and 'minimal'

View file

@ -24,9 +24,6 @@
users.users.root.openssh.authorizedKeys.keys = [ ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKp2wgqFcr0LGaUXbom88/zK2631pysePUWIaCMljT0K root@backups-rpi4'' ]; users.users.root.openssh.authorizedKeys.keys = [ ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKp2wgqFcr0LGaUXbom88/zK2631pysePUWIaCMljT0K root@backups-rpi4'' ];
services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password"; services.openssh.settings.PermitRootLogin = lib.mkForce "prohibit-password";
# steam, etc
nixpkgs.config.allowUnfree = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" "sd_mod" "uas" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" "sd_mod" "uas" ];
boot.initrd.kernelModules = [ "r8152" ]; boot.initrd.kernelModules = [ "r8152" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];

View file

@ -7,8 +7,6 @@
../../common/services/podman.nix ../../common/services/podman.nix
../../common/services/tailscale-autoconnect.nix ../../common/services/tailscale-autoconnect.nix
]; ];
# steam, nvidia-x11, etc
nixpkgs.config.allowUnfree = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];

View file

@ -13,8 +13,6 @@
../../common/services/tlp.nix ../../common/services/tlp.nix
]; ];
# steam , etc
nixpkgs.config.allowUnfree = true;
powerManagement.enable = true; powerManagement.enable = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" ];

View file

@ -1,5 +1,4 @@
{ config, lib, pkgs, modulesPath, desktop, username, ... }: { { config, lib, pkgs, modulesPath, desktop, username, ... }: {
nixpkgs.config.allowUnfree = false;
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

View file

@ -1,5 +1,4 @@
{ config, lib, pkgs, modulesPath, desktop, username, ... }: { { config, lib, pkgs, modulesPath, desktop, username, ... }: {
nixpkgs.config.allowUnfree = true;
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

View file

@ -7,11 +7,6 @@
time.timeZone = "Asia/Tokyo"; time.timeZone = "Asia/Tokyo";
nixpkgs = {
config.allowUnfree = false;
hostPlatform = lib.mkDefault "x86_64-linux";
};
networking = { networking = {
hostName = "nixos-linode-img"; hostName = "nixos-linode-img";
useDHCP = lib.mkForce false; useDHCP = lib.mkForce false;

View file

@ -14,9 +14,6 @@
inputs.deploy-rs.packages.${system}.deploy-rs inputs.deploy-rs.packages.${system}.deploy-rs
]; ];
# steam , etc
nixpkgs.config.allowUnfree = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" "sd_mod" "uas" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" "sd_mod" "uas" ];
boot.initrd.kernelModules = [ "r8152" ]; boot.initrd.kernelModules = [ "r8152" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];

View file

@ -32,7 +32,6 @@
# Distributed Builds # Distributed Builds
nix.distributedBuilds = true; nix.distributedBuilds = true;
nixpkgs.config.allowUnfree = false;
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";