From ce19b701046c064a1eb39098d8537b2c4964a86e Mon Sep 17 00:00:00 2001 From: Rosa Date: Tue, 17 Mar 2026 16:21:33 -0400 Subject: start rewrite --- hosts/limbo/default.nix | 26 -------------- hosts/limbo/disks.nix | 56 ----------------------------- hosts/limbo/hardware-configuration.nix | 28 --------------- hosts/lust/default.nix | 47 ------------------------ hosts/lust/hardware-configuration.nix | 59 ------------------------------- hosts/meowbook/default.nix | 20 +++++++++++ hosts/meowbook/disks.nix | 56 +++++++++++++++++++++++++++++ hosts/meowbook/hardware-configuration.nix | 28 +++++++++++++++ 8 files changed, 104 insertions(+), 216 deletions(-) delete mode 100644 hosts/limbo/default.nix delete mode 100644 hosts/limbo/disks.nix delete mode 100644 hosts/limbo/hardware-configuration.nix delete mode 100644 hosts/lust/default.nix delete mode 100644 hosts/lust/hardware-configuration.nix create mode 100644 hosts/meowbook/default.nix create mode 100644 hosts/meowbook/disks.nix create mode 100644 hosts/meowbook/hardware-configuration.nix (limited to 'hosts') diff --git a/hosts/limbo/default.nix b/hosts/limbo/default.nix deleted file mode 100644 index 051a65e..0000000 --- a/hosts/limbo/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../../common/pipewire.nix - ../../common/region/na-east.nix - ./disks.nix - ]; - - home-manager.users.rosa = { - imports = [ - ../../modules/user - ]; - - desktop.windowManager = "sway"; - programs.hyfetch.enable = true; - }; - - networking.networkmanager = { - enable = true; - wifi.macAddress = "random"; - }; - - programs.sway.enable = true; - services.automatic-timezoned.enable = true; - system.stateVersion = "26.05"; -} diff --git a/hosts/limbo/disks.nix b/hosts/limbo/disks.nix deleted file mode 100644 index 50fb894..0000000 --- a/hosts/limbo/disks.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ config, ... }: -{ - disko.devices.disk.main = { - content = { - partitions = { - ESP = { - content = { - format = "vfat"; - mountOptions = [ "umask=0077" ]; - mountpoint = "/boot"; - type = "filesystem"; - }; - - size = "512M"; - type = "EF00"; - }; - - luks = { - content = { - content = { - extraArgs = [ "-f" ]; - subvolumes = { - "/home" = { - mountOptions = [ "noatime" ]; - mountpoint = "/home"; - }; - - "/nix" = { - mountOptions = [ "noatime" ]; - mountpoint = "/nix"; - }; - - "/root" = { - mountOptions = [ "noatime" ]; - mountpoint = "/"; - }; - }; - - type = "btrfs"; - }; - - name = "root"; - type = "luks"; - }; - - size = "100%"; - }; - }; - - type = "gpt"; - }; - - device = "/dev/nvme0n1"; - type = "disk"; - }; -} diff --git a/hosts/limbo/hardware-configuration.nix b/hosts/limbo/hardware-configuration.nix deleted file mode 100644 index 46beb7f..0000000 --- a/hosts/limbo/hardware-configuration.nix +++ /dev/null @@ -1,28 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: - -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ - "xhci_pci" - "thunderbolt" - "nvme" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/lust/default.nix b/hosts/lust/default.nix deleted file mode 100644 index 70e68af..0000000 --- a/hosts/lust/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -{ - imports = [ - ../../common/pipewire.nix - ../../common/region/na-east.nix - ../../common/steam.nix - ]; - - home-manager.users.rosa = { - imports = [ ../../modules/user ]; - desktop = { - accent = "pink"; - windowManager = "sway"; - }; - - home = { - packages = with pkgs; [ audacity ]; - stateVersion = lib.mkForce "23.05"; # homedir been around for a while - }; - - programs = { - foot.settings.main = { - dpi-aware = lib.mkForce false; # mismatched monitors - font = lib.mkForce "FiraCode Nerd Font Mono:size=11"; # why do things never work - }; - - fuzzel.settings.main = { - dpi-aware = lib.mkForce false; - font = lib.mkForce "Fira Code:size=11"; # aaaaa - }; - - hyfetch.enable = true; - iamb.enable = true; - vesktop.enable = true; - }; - - }; - - networking.networkmanager.enable = true; - programs.sway.enable = true; - system.stateVersion = "23.05"; -} diff --git a/hosts/lust/hardware-configuration.nix b/hosts/lust/hardware-configuration.nix deleted file mode 100644 index b7830ed..0000000 --- a/hosts/lust/hardware-configuration.nix +++ /dev/null @@ -1,59 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: - -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ - "nvme" - "xhci_pci" - "ahci" - "usbhid" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/4602324b-c9d4-43f5-afb7-145d0f3bddcb"; - fsType = "btrfs"; - options = [ "subvol=@rootfs" ]; - }; - - fileSystems."/etc" = { - device = "/dev/disk/by-uuid/4602324b-c9d4-43f5-afb7-145d0f3bddcb"; - fsType = "btrfs"; - options = [ "subvol=@etc" ]; - }; - - fileSystems."/home" = { - device = "/dev/disk/by-uuid/4602324b-c9d4-43f5-afb7-145d0f3bddcb"; - fsType = "btrfs"; - options = [ "subvol=@homes" ]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/A8C6-E3EB"; - fsType = "vfat"; - options = [ - "fmask=0022" - "dmask=0022" - ]; - }; - - swapDevices = [ ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/meowbook/default.nix b/hosts/meowbook/default.nix new file mode 100644 index 0000000..084074e --- /dev/null +++ b/hosts/meowbook/default.nix @@ -0,0 +1,20 @@ +{ config, ... }: +{ + imports = [ + ../../common/region/na-east.nix + ./disks.nix + ]; + + networking.networkmanager = { + enable = true; + wifi.macAddress = "random"; + }; + + programs.sway.enable = true; + security.doas.enable = true; + services.automatic-timezoned.enable = true; + system = { + enableDesktopDefaults = true; + stateVersion = "26.05"; + }; +} diff --git a/hosts/meowbook/disks.nix b/hosts/meowbook/disks.nix new file mode 100644 index 0000000..50fb894 --- /dev/null +++ b/hosts/meowbook/disks.nix @@ -0,0 +1,56 @@ +{ config, ... }: +{ + disko.devices.disk.main = { + content = { + partitions = { + ESP = { + content = { + format = "vfat"; + mountOptions = [ "umask=0077" ]; + mountpoint = "/boot"; + type = "filesystem"; + }; + + size = "512M"; + type = "EF00"; + }; + + luks = { + content = { + content = { + extraArgs = [ "-f" ]; + subvolumes = { + "/home" = { + mountOptions = [ "noatime" ]; + mountpoint = "/home"; + }; + + "/nix" = { + mountOptions = [ "noatime" ]; + mountpoint = "/nix"; + }; + + "/root" = { + mountOptions = [ "noatime" ]; + mountpoint = "/"; + }; + }; + + type = "btrfs"; + }; + + name = "root"; + type = "luks"; + }; + + size = "100%"; + }; + }; + + type = "gpt"; + }; + + device = "/dev/nvme0n1"; + type = "disk"; + }; +} diff --git a/hosts/meowbook/hardware-configuration.nix b/hosts/meowbook/hardware-configuration.nix new file mode 100644 index 0000000..46beb7f --- /dev/null +++ b/hosts/meowbook/hardware-configuration.nix @@ -0,0 +1,28 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ + config, + lib, + pkgs, + modulesPath, + ... +}: + +{ + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "nvme" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} -- cgit v1.3.1