From 7e4a6ac8fe92a8615292b062808a538c61ea29fe Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Sun, 31 Aug 2025 19:33:29 +0530 Subject: [PATCH] hosts: housekeeping Signed-off-by: Amneesh Singh --- hosts/{ => common}/programs/adb/default.nix | 0 hosts/{ => common}/programs/dconf/default.nix | 0 hosts/{ => common}/programs/doas/default.nix | 0 hosts/{ => common}/programs/git/default.nix | 0 hosts/{ => common}/programs/gnupg/default.nix | 0 .../{ => common}/programs/neovim/default.nix | 0 hosts/{ => common}/programs/nix/default.nix | 0 hosts/{ => common}/programs/zsh/default.nix | 0 hosts/{ => common}/security/default.nix | 0 .../services/pipewire/default.nix | 0 .../{ => common}/services/xserver/default.nix | 0 hosts/{ => common}/vault-agent.nix | 0 hosts/{ => common}/x86builder.nix | 0 hosts/default.nix | 60 ++++++++++--------- hosts/okina/boot.nix | 1 + 15 files changed, 32 insertions(+), 29 deletions(-) rename hosts/{ => common}/programs/adb/default.nix (100%) rename hosts/{ => common}/programs/dconf/default.nix (100%) rename hosts/{ => common}/programs/doas/default.nix (100%) rename hosts/{ => common}/programs/git/default.nix (100%) rename hosts/{ => common}/programs/gnupg/default.nix (100%) rename hosts/{ => common}/programs/neovim/default.nix (100%) rename hosts/{ => common}/programs/nix/default.nix (100%) rename hosts/{ => common}/programs/zsh/default.nix (100%) rename hosts/{ => common}/security/default.nix (100%) rename hosts/{ => common}/services/pipewire/default.nix (100%) rename hosts/{ => common}/services/xserver/default.nix (100%) rename hosts/{ => common}/vault-agent.nix (100%) rename hosts/{ => common}/x86builder.nix (100%) diff --git a/hosts/programs/adb/default.nix b/hosts/common/programs/adb/default.nix similarity index 100% rename from hosts/programs/adb/default.nix rename to hosts/common/programs/adb/default.nix diff --git a/hosts/programs/dconf/default.nix b/hosts/common/programs/dconf/default.nix similarity index 100% rename from hosts/programs/dconf/default.nix rename to hosts/common/programs/dconf/default.nix diff --git a/hosts/programs/doas/default.nix b/hosts/common/programs/doas/default.nix similarity index 100% rename from hosts/programs/doas/default.nix rename to hosts/common/programs/doas/default.nix diff --git a/hosts/programs/git/default.nix b/hosts/common/programs/git/default.nix similarity index 100% rename from hosts/programs/git/default.nix rename to hosts/common/programs/git/default.nix diff --git a/hosts/programs/gnupg/default.nix b/hosts/common/programs/gnupg/default.nix similarity index 100% rename from hosts/programs/gnupg/default.nix rename to hosts/common/programs/gnupg/default.nix diff --git a/hosts/programs/neovim/default.nix b/hosts/common/programs/neovim/default.nix similarity index 100% rename from hosts/programs/neovim/default.nix rename to hosts/common/programs/neovim/default.nix diff --git a/hosts/programs/nix/default.nix b/hosts/common/programs/nix/default.nix similarity index 100% rename from hosts/programs/nix/default.nix rename to hosts/common/programs/nix/default.nix diff --git a/hosts/programs/zsh/default.nix b/hosts/common/programs/zsh/default.nix similarity index 100% rename from hosts/programs/zsh/default.nix rename to hosts/common/programs/zsh/default.nix diff --git a/hosts/security/default.nix b/hosts/common/security/default.nix similarity index 100% rename from hosts/security/default.nix rename to hosts/common/security/default.nix diff --git a/hosts/services/pipewire/default.nix b/hosts/common/services/pipewire/default.nix similarity index 100% rename from hosts/services/pipewire/default.nix rename to hosts/common/services/pipewire/default.nix diff --git a/hosts/services/xserver/default.nix b/hosts/common/services/xserver/default.nix similarity index 100% rename from hosts/services/xserver/default.nix rename to hosts/common/services/xserver/default.nix diff --git a/hosts/vault-agent.nix b/hosts/common/vault-agent.nix similarity index 100% rename from hosts/vault-agent.nix rename to hosts/common/vault-agent.nix diff --git a/hosts/x86builder.nix b/hosts/common/x86builder.nix similarity index 100% rename from hosts/x86builder.nix rename to hosts/common/x86builder.nix diff --git a/hosts/default.nix b/hosts/default.nix index 824d859..bb97ffd 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -6,19 +6,19 @@ let { _module.args = globalArgs; } - ./programs/neovim - ./programs/nix - ./programs/zsh - ./programs/gnupg - ./programs/git - ./programs/doas - ./security + ./common/programs/neovim + ./common/programs/nix + ./common/programs/zsh + ./common/programs/gnupg + ./common/programs/git + ./common/programs/doas + ./common/security ]; desktopModules = [ - ./programs/adb - ./programs/dconf - ./services/xserver - ./services/pipewire + ./common/programs/adb + ./common/programs/dconf + ./common/services/xserver + ./common/services/pipewire ]; in { @@ -26,23 +26,21 @@ in # Desktop okina = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = - [ - ./okina - ] - ++ desktopModules - ++ commonModules; + modules = [ + ./okina + ] + ++ desktopModules + ++ commonModules; }; #Home laptop satori = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = - [ - ./satori - ] - ++ desktopModules - ++ commonModules; + modules = [ + ./satori + ] + ++ desktopModules + ++ commonModules; }; #Home server (RPi4) @@ -50,7 +48,8 @@ in system = "aarch64-linux"; modules = [ ./marisa - ] ++ commonModules; + ] + ++ commonModules; }; #Oracle Cloud VM @@ -58,9 +57,10 @@ in system = "x86_64-linux"; modules = [ ./remilia - ./x86builder.nix + ./common/x86builder.nix inputs.mailserver.nixosModules.mailserver - ] ++ commonModules; + ] + ++ commonModules; }; #Oracle Cloud VM @@ -68,8 +68,9 @@ in system = "x86_64-linux"; modules = [ ./hina - ./x86builder.nix - ] ++ commonModules; + ./common/x86builder.nix + ] + ++ commonModules; }; #Oracle Cloud VM @@ -78,7 +79,8 @@ in modules = [ ./suwako inputs.mailserver.nixosModules.mailserver - ] ++ commonModules; + ] + ++ commonModules; }; }; } diff --git a/hosts/okina/boot.nix b/hosts/okina/boot.nix index 50d0a50..820d181 100644 --- a/hosts/okina/boot.nix +++ b/hosts/okina/boot.nix @@ -19,6 +19,7 @@ ]; kernelModules = [ ]; }; + kernelParams = [ "i915.force_probe=56a1" ]; # kernelModules = [ "kvm-intel" "i2c-dev" "ddcci_backlight" ];