diff --git a/machine-confs/cert-store.nix b/hosts/cert-store.nix similarity index 100% rename from machine-confs/cert-store.nix rename to hosts/cert-store.nix diff --git a/machine-confs/exoplasim.nix b/hosts/exoplasim.nix similarity index 100% rename from machine-confs/exoplasim.nix rename to hosts/exoplasim.nix diff --git a/machine-confs/forgejo.nix b/hosts/forgejo.nix similarity index 100% rename from machine-confs/forgejo.nix rename to hosts/forgejo.nix diff --git a/machine-confs/gaming.nix b/hosts/gaming.nix similarity index 87% rename from machine-confs/gaming.nix rename to hosts/gaming.nix index 2062ddc..42831cc 100644 --- a/machine-confs/gaming.nix +++ b/hosts/gaming.nix @@ -6,7 +6,7 @@ ../shared/base.nix ../shared/hardware/nvidia.nix - ../personal-machines/desktop.nix + ../personal/desktop.nix ../servers/gaming-server.nix ]; diff --git a/machine-confs/generic.nix b/hosts/generic.nix similarity index 100% rename from machine-confs/generic.nix rename to hosts/generic.nix diff --git a/machine-confs/helium.nix b/hosts/helium.nix similarity index 63% rename from machine-confs/helium.nix rename to hosts/helium.nix index f8ab959..e75323f 100644 --- a/machine-confs/helium.nix +++ b/hosts/helium.nix @@ -48,25 +48,25 @@ imports = [ ../shared/base.nix - ../personal-machines/desktop.nix - ../personal-machines/development.nix + ../personal/desktop.nix + ../personal/development.nix - ../personal-machines/hardware/amd-laptop.nix - ../personal-machines/hardware/hibernate.nix - ../personal-machines/hardware/keychron-q11.nix - ../personal-machines/hardware/onlykey.nix - ../personal-machines/hardware/trackball.nix + ../personal/hardware/amd-laptop.nix + ../personal/hardware/hibernate.nix + ../personal/hardware/keychron-q11.nix + ../personal/hardware/onlykey.nix + ../personal/hardware/trackball.nix - ../personal-machines/networking/home-wg.nix - ../personal-machines/networking/printing.nix + ../personal/networking/home-wg.nix + ../personal/networking/printing.nix - ../personal-machines/programs/bitwarden.nix - ../personal-machines/programs/communication.nix - ../personal-machines/programs/firefox.nix - ../personal-machines/programs/i3.nix - ../personal-machines/programs/moonlight.nix - ../personal-machines/programs/redshift.nix - ../personal-machines/programs/study.nix - ../personal-machines/programs/usb-automount.nix + ../personal/programs/bitwarden.nix + ../personal/programs/communication.nix + ../personal/programs/firefox.nix + ../personal/programs/i3.nix + ../personal/programs/moonlight.nix + ../personal/programs/redshift.nix + ../personal/programs/study.nix + ../personal/programs/usb-automount.nix ]; } diff --git a/machine-confs/idacloud.nix b/hosts/idacloud.nix similarity index 100% rename from machine-confs/idacloud.nix rename to hosts/idacloud.nix diff --git a/hosts/lithium.nix b/hosts/lithium.nix new file mode 100644 index 0000000..9faf260 --- /dev/null +++ b/hosts/lithium.nix @@ -0,0 +1,32 @@ +{ lib, ... }: +{ + system.stateVersion = 24.05; + networking.hostName = "lithium"; + + custom.home_wg_suffix = "3"; + system.autoUpgrade.allowReboot = lib.mkForce false; + # boot.kernelParams = [ "resume_offset=39292928" ]; + + imports = [ + ../shared/base.nix + + ../personal/desktop.nix + ../personal/development.nix + + ../personal/hardware/hibernate.nix + ../personal/hardware/intel-laptop.nix + ../personal/hardware/onlykey.nix + + ../personal/networking/home-wg.nix + ../personal/networking/printing.nix + + ../personal/programs/bitwarden.nix + ../personal/programs/communication.nix + ../personal/programs/firefox.nix + ../personal/programs/i3.nix + ../personal/programs/moonlight.nix + ../personal/programs/redshift.nix + ../personal/programs/study.nix + ../personal/programs/usb-automount.nix + ]; +} diff --git a/machine-confs/nextcloud.nix b/hosts/nextcloud.nix similarity index 100% rename from machine-confs/nextcloud.nix rename to hosts/nextcloud.nix diff --git a/machine-confs/siit-dc.nix b/hosts/siit-dc.nix similarity index 100% rename from machine-confs/siit-dc.nix rename to hosts/siit-dc.nix diff --git a/machine-confs/syncthing.nix b/hosts/syncthing.nix similarity index 100% rename from machine-confs/syncthing.nix rename to hosts/syncthing.nix diff --git a/machine-confs/vaultwarden.nix b/hosts/vaultwarden.nix similarity index 100% rename from machine-confs/vaultwarden.nix rename to hosts/vaultwarden.nix diff --git a/machine-confs/wg-rpi.nix b/hosts/wg-rpi.nix similarity index 100% rename from machine-confs/wg-rpi.nix rename to hosts/wg-rpi.nix diff --git a/custom-installer/base.nix b/installer/base.nix similarity index 95% rename from custom-installer/base.nix rename to installer/base.nix index d790af3..237b949 100644 --- a/custom-installer/base.nix +++ b/installer/base.nix @@ -46,7 +46,7 @@ let nixos-generate-config --root /mnt mv /mnt/etc/nixos/configuration.nix configuration.nix.old - curl https://forgejo.sinerva.eu/VSinerva/nixos-conf/raw/branch/main/custom-installer/template-configuration.nix -o /mnt/etc/nixos/configuration.nix + curl https://forgejo.sinerva.eu/VSinerva/nixos-conf/raw/branch/main/installer/template-configuration.nix -o /mnt/etc/nixos/configuration.nix ''; in { diff --git a/custom-installer/graphical.nix b/installer/graphical.nix similarity index 100% rename from custom-installer/graphical.nix rename to installer/graphical.nix diff --git a/custom-installer/minimal.nix b/installer/minimal.nix similarity index 100% rename from custom-installer/minimal.nix rename to installer/minimal.nix diff --git a/custom-installer/template-configuration.nix b/installer/template-configuration.nix similarity index 95% rename from custom-installer/template-configuration.nix rename to installer/template-configuration.nix index 559da8b..4ca4bf5 100644 --- a/custom-installer/template-configuration.nix +++ b/installer/template-configuration.nix @@ -12,7 +12,7 @@ in { imports = [ ./hardware-configuration.nix - "${repo}/machine-confs/${host}.nix" + "${repo}/hosts/${host}.nix" ]; # This value determines the NixOS release from which the default diff --git a/machine-confs/lithium.nix b/machine-confs/lithium.nix deleted file mode 100644 index 09d08f2..0000000 --- a/machine-confs/lithium.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, ... }: -{ - system.stateVersion = 24.05; - networking.hostName = "lithium"; - - custom.home_wg_suffix = "3"; - system.autoUpgrade.allowReboot = lib.mkForce false; - # boot.kernelParams = [ "resume_offset=39292928" ]; - - imports = [ - ../shared/base.nix - - ../personal-machines/desktop.nix - ../personal-machines/development.nix - - ../personal-machines/hardware/hibernate.nix - ../personal-machines/hardware/intel-laptop.nix - ../personal-machines/hardware/onlykey.nix - - ../personal-machines/networking/home-wg.nix - ../personal-machines/networking/printing.nix - - ../personal-machines/programs/bitwarden.nix - ../personal-machines/programs/communication.nix - ../personal-machines/programs/firefox.nix - ../personal-machines/programs/i3.nix - ../personal-machines/programs/moonlight.nix - ../personal-machines/programs/redshift.nix - ../personal-machines/programs/study.nix - ../personal-machines/programs/usb-automount.nix - ]; -} diff --git a/personal-machines/desktop.nix b/personal/desktop.nix similarity index 100% rename from personal-machines/desktop.nix rename to personal/desktop.nix diff --git a/personal-machines/development.nix b/personal/development.nix similarity index 100% rename from personal-machines/development.nix rename to personal/development.nix diff --git a/personal-machines/hardware/amd-laptop.nix b/personal/hardware/amd-laptop.nix similarity index 100% rename from personal-machines/hardware/amd-laptop.nix rename to personal/hardware/amd-laptop.nix diff --git a/personal-machines/hardware/hibernate.nix b/personal/hardware/hibernate.nix similarity index 100% rename from personal-machines/hardware/hibernate.nix rename to personal/hardware/hibernate.nix diff --git a/personal-machines/hardware/intel-laptop.nix b/personal/hardware/intel-laptop.nix similarity index 100% rename from personal-machines/hardware/intel-laptop.nix rename to personal/hardware/intel-laptop.nix diff --git a/personal-machines/hardware/keychron-q11.nix b/personal/hardware/keychron-q11.nix similarity index 100% rename from personal-machines/hardware/keychron-q11.nix rename to personal/hardware/keychron-q11.nix diff --git a/personal-machines/hardware/moonlight-trackball-accel.patch b/personal/hardware/moonlight-trackball-accel.patch similarity index 100% rename from personal-machines/hardware/moonlight-trackball-accel.patch rename to personal/hardware/moonlight-trackball-accel.patch diff --git a/personal-machines/hardware/onlykey.nix b/personal/hardware/onlykey.nix similarity index 100% rename from personal-machines/hardware/onlykey.nix rename to personal/hardware/onlykey.nix diff --git a/personal-machines/hardware/trackball.nix b/personal/hardware/trackball.nix similarity index 100% rename from personal-machines/hardware/trackball.nix rename to personal/hardware/trackball.nix diff --git a/personal-machines/networking/home-wg.nix b/personal/networking/home-wg.nix similarity index 100% rename from personal-machines/networking/home-wg.nix rename to personal/networking/home-wg.nix diff --git a/personal-machines/networking/printing.nix b/personal/networking/printing.nix similarity index 100% rename from personal-machines/networking/printing.nix rename to personal/networking/printing.nix diff --git a/personal-machines/programs/bitwarden.nix b/personal/programs/bitwarden.nix similarity index 100% rename from personal-machines/programs/bitwarden.nix rename to personal/programs/bitwarden.nix diff --git a/personal-machines/programs/communication.nix b/personal/programs/communication.nix similarity index 100% rename from personal-machines/programs/communication.nix rename to personal/programs/communication.nix diff --git a/personal-machines/programs/embedded/alacritty.nix b/personal/programs/embedded/alacritty.nix similarity index 100% rename from personal-machines/programs/embedded/alacritty.nix rename to personal/programs/embedded/alacritty.nix diff --git a/personal-machines/programs/embedded/i3-conf.nix b/personal/programs/embedded/i3-conf.nix similarity index 100% rename from personal-machines/programs/embedded/i3-conf.nix rename to personal/programs/embedded/i3-conf.nix diff --git a/personal-machines/programs/embedded/nvim.nix b/personal/programs/embedded/nvim.nix similarity index 100% rename from personal-machines/programs/embedded/nvim.nix rename to personal/programs/embedded/nvim.nix diff --git a/personal-machines/programs/embedded/xresources.nix b/personal/programs/embedded/xresources.nix similarity index 100% rename from personal-machines/programs/embedded/xresources.nix rename to personal/programs/embedded/xresources.nix diff --git a/personal-machines/programs/firefox.nix b/personal/programs/firefox.nix similarity index 100% rename from personal-machines/programs/firefox.nix rename to personal/programs/firefox.nix diff --git a/personal-machines/programs/i3.nix b/personal/programs/i3.nix similarity index 100% rename from personal-machines/programs/i3.nix rename to personal/programs/i3.nix diff --git a/personal-machines/programs/moonlight.nix b/personal/programs/moonlight.nix similarity index 100% rename from personal-machines/programs/moonlight.nix rename to personal/programs/moonlight.nix diff --git a/personal-machines/programs/redshift.nix b/personal/programs/redshift.nix similarity index 100% rename from personal-machines/programs/redshift.nix rename to personal/programs/redshift.nix diff --git a/personal-machines/programs/study.nix b/personal/programs/study.nix similarity index 100% rename from personal-machines/programs/study.nix rename to personal/programs/study.nix diff --git a/personal-machines/programs/symlinked/gtk-3-4-settings.ini b/personal/programs/symlinked/gtk-3-4-settings.ini similarity index 100% rename from personal-machines/programs/symlinked/gtk-3-4-settings.ini rename to personal/programs/symlinked/gtk-3-4-settings.ini diff --git a/personal-machines/programs/symlinked/gtk-bookmarks b/personal/programs/symlinked/gtk-bookmarks similarity index 100% rename from personal-machines/programs/symlinked/gtk-bookmarks rename to personal/programs/symlinked/gtk-bookmarks diff --git a/personal-machines/programs/symlinked/gtkrc-2.0 b/personal/programs/symlinked/gtkrc-2.0 similarity index 100% rename from personal-machines/programs/symlinked/gtkrc-2.0 rename to personal/programs/symlinked/gtkrc-2.0 diff --git a/personal-machines/programs/symlinked/libfm.conf b/personal/programs/symlinked/libfm.conf similarity index 100% rename from personal-machines/programs/symlinked/libfm.conf rename to personal/programs/symlinked/libfm.conf diff --git a/personal-machines/programs/symlinked/pcmanfm.conf b/personal/programs/symlinked/pcmanfm.conf similarity index 100% rename from personal-machines/programs/symlinked/pcmanfm.conf rename to personal/programs/symlinked/pcmanfm.conf diff --git a/personal-machines/programs/symlinked/symlinks.nix b/personal/programs/symlinked/symlinks.nix similarity index 100% rename from personal-machines/programs/symlinked/symlinks.nix rename to personal/programs/symlinked/symlinks.nix diff --git a/personal-machines/programs/usb-automount.nix b/personal/programs/usb-automount.nix similarity index 100% rename from personal-machines/programs/usb-automount.nix rename to personal/programs/usb-automount.nix