From 1a3cdb757d2366f4eac269b8d4fbceb22e55c7a5 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Sun, 5 Jul 2026 19:20:29 +1000 Subject: [PATCH] shrug --- flake.nix | 5 ++ modules/home/default.nix | 2 +- modules/hosts/default.nix | 64 +++++--------------------- modules/hosts/hades/default.nix | 14 ++---- modules/hosts3/hades/configuration.nix | 53 +++++++++++++++++++++ modules/hosts3/hades/default.nix | 21 +++++++++ modules/hosts3/hades/hardware.nix | 42 +++++++++++++++++ modules/misc/flake-parts.nix | 7 +++ modules/misc/hm-parts.nix | 6 +++ modules/misc/theme.nix | 0 modules/system/core.nix | 29 ++++++++++++ modules/system/core/default.nix | 29 ------------ modules/system/default.nix | 15 +++--- modules/system/{core => }/users.nix | 0 modules/users/serenity.nix | 5 +- 15 files changed, 189 insertions(+), 103 deletions(-) create mode 100644 modules/hosts3/hades/configuration.nix create mode 100644 modules/hosts3/hades/default.nix create mode 100644 modules/hosts3/hades/hardware.nix create mode 100644 modules/misc/flake-parts.nix create mode 100644 modules/misc/hm-parts.nix create mode 100644 modules/misc/theme.nix create mode 100644 modules/system/core.nix delete mode 100644 modules/system/core/default.nix rename modules/system/{core => }/users.nix (100%) diff --git a/flake.nix b/flake.nix index b1b55bb..78ff829 100755 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,7 @@ flake-utils = { url = "github:numtide/flake-utils"; }; import-tree = { url = "github:vic/import-tree"; }; wrapper-modules = { url = "github:BirdeeHub/nix-wrapper-modules";}; + den = { url = "github:vic/den/v0.17.0"; }; # Secrets management - https://github.com/Mic92/sops-nix #sops-nix = { url = "github:Mic92/sops-nix"; }; @@ -39,6 +40,10 @@ niri = { # - https://github.com/sodiboo/niri-flake/ url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; + #inputs.niri-unstable.follows = ""; + #inputs.niri-stable.follows = ""; + #inputs.xwayland-satellite-unstable.follows = ""; + #inputs.xwayland-satellite-stable.follows = ""; }; # Hassle free desktop shell - https://docs.noctalia.dev/getting-started/nixos/ diff --git a/modules/home/default.nix b/modules/home/default.nix index 36c81b1..69d9cfd 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -12,7 +12,7 @@ home = { username = "serenity"; homeDirectory = "/home/serenity"; - stateVersion = "23.11"; + stateVersion = "24.11"; #extraOutputsToInstall = [ ]; }; diff --git a/modules/hosts/default.nix b/modules/hosts/default.nix index 33ae410..7557755 100644 --- a/modules/hosts/default.nix +++ b/modules/hosts/default.nix @@ -1,71 +1,29 @@ -{ - self, - inputs, - ... -}: -{ +{ self, inputs, ... }: { + flake.nixosConfigurations = let # shorten paths inherit (inputs.nixpkgs.lib) nixosSystem; - homeImports = import "${self}/home/profiles"; - - mod = "${self}/system"; + mod = "${self}/modules/system"; # get the basic config to build on top of inherit (import mod) base; - # get these into the module system specialArgs = { inherit inputs self; }; - in + in + { - persephone = nixosSystem { - inherit specialArgs; - modules = base ++ [ - ./persephone - "${mod}/core/lanzaboote.nix" - - "${mod}/programs/gamemode.nix" - "${mod}/programs/hyprland" - "${mod}/programs/games.nix" - - "${mod}/network/syncthing.nix" - - "${mod}/services/kanata" - "${mod}/services/gnome-services.nix" - "${mod}/services/location.nix" - - { - home-manager = { - users.mihai.imports = homeImports."mihai@io"; - extraSpecialArgs = specialArgs; - backupFileExtension = ".hm-backup"; - }; - } - - inputs.agenix.nixosModules.default - ]; - }; - hades = nixosSystem { inherit specialArgs; modules = base ++ [ + #inputs.foo.bar ./hades - "${mod}/hardware/ddcci.nix" - - "${mod}/programs/gamemode.nix" - "${mod}/programs/hyprland" "${mod}/programs/games.nix" - "${mod}/network/syncthing.nix" - "${mod}/services/kanata" - "${mod}/services/gnome-services.nix" - "${mod}/services/location.nix" - { home-manager = { - users.mihai.imports = homeImports."mihai@io"; + users.serenity.imports = homeImports."serenity"; extraSpecialArgs = specialArgs; backupFileExtension = ".hm-backup"; }; @@ -76,19 +34,19 @@ nixos = nixosSystem { inherit specialArgs; modules = [ - ./wsl - "${mod}/core/users.nix" + "${mod}/users.nix" "${mod}/nix" - "${mod}/programs/zsh.nix" + "${mod}/programs/fish.nix" "${mod}/programs/home-manager.nix" { home-manager = { - users.mihai.imports = homeImports.server; + users.serenity.imports = homeImports.minimal; extraSpecialArgs = specialArgs; backupFileExtension = ".hm-backup"; }; } ]; }; + }; } diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index 05719d1..1c3ad93 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -1,10 +1,5 @@ -{ - pkgs, - lib, - self, - ... -}: -{ +{ pkgs, lib, self, ... }: { + imports = [ ./hardware ./network @@ -13,11 +8,10 @@ boot.kernelPackages = lib.mkForce pkgs.linuxPackages_latest; + # Set hostname networking.hostName = "hades"; - security.tpm2.enable = true; - - # for SSD/NVME + # For SSD/NVME services.fstrim.enable = true; } diff --git a/modules/hosts3/hades/configuration.nix b/modules/hosts3/hades/configuration.nix new file mode 100644 index 0000000..0438c54 --- /dev/null +++ b/modules/hosts3/hades/configuration.nix @@ -0,0 +1,53 @@ +{ self, ... }: +{ + flake.nixosModules.coreConfiguration = + { + pkgs, + ... + }: + { + imports = [ + self.nixosModules.hadesHardware + self.nixosModules.coreConfig + self.nixosModules.programs + self.nixosModules.niri + ]; + + services.printing.enable = true; + + users.users.serenity = { + shell = pkgs.fish; + ignoreShellProgramCheck = true; + isNormalUser = true; + description = ""; + extraGroups = [ + "networkmanager" + "wheel" + "i2c" + "audio" + "video" + "input" + ]; + packages = with pkgs; [ + tree + ]; + }; + programs.firefox.enable = true; + + environment.systemPackages = with pkgs; [ + vim + wget + git + curl + bat + xclip + ddcutil + unzip + ripgrep + tealdeer + chezmoi + ]; + + system.stateVersion = "24.11"; + }; +} diff --git a/modules/hosts3/hades/default.nix b/modules/hosts3/hades/default.nix new file mode 100644 index 0000000..b2d9a24 --- /dev/null +++ b/modules/hosts3/hades/default.nix @@ -0,0 +1,21 @@ +{ self, inputs, config, ... }: { + + flake.nixosConfigurations.hades = inputs.nixpkgs.lib.nixosSystem { + modules = [ + self.nixosModules.hadesHardware + self.nixosModules.coreConfiguration + + inputs.home-manager.nixosModules.home-manager + { + home-manager.backupFileExtension = "bak"; + home-manager.users.serenity = { + imports = [ + config.flake.homeModules.base + config.flake.homeModules.hadesHome + ]; + }; + } + + ]; + }; +} diff --git a/modules/hosts3/hades/hardware.nix b/modules/hosts3/hades/hardware.nix new file mode 100644 index 0000000..6f1f1ee --- /dev/null +++ b/modules/hosts3/hades/hardware.nix @@ -0,0 +1,42 @@ +{ ... }: +{ + flake.nixosModules.desktopHardware = + { + config, + lib, + modulesPath, + ... + }: + { + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; + boot.initrd.kernelModules = [ "amdgpu" ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/2f4a231c-04a1-4bb9-9370-c207573be881"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/7D2E-5F33"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + }; +} diff --git a/modules/misc/flake-parts.nix b/modules/misc/flake-parts.nix new file mode 100644 index 0000000..8afaa04 --- /dev/null +++ b/modules/misc/flake-parts.nix @@ -0,0 +1,7 @@ +{ + config = { + systems = [ + "x86_64-linux" + ]; + }; +} diff --git a/modules/misc/hm-parts.nix b/modules/misc/hm-parts.nix new file mode 100644 index 0000000..d8d17ab --- /dev/null +++ b/modules/misc/hm-parts.nix @@ -0,0 +1,6 @@ +{ inputs, ... }: +{ + imports = [ + inputs.home-manager.flakeModules.home-manager + ]; +} diff --git a/modules/misc/theme.nix b/modules/misc/theme.nix new file mode 100644 index 0000000..e69de29 diff --git a/modules/system/core.nix b/modules/system/core.nix new file mode 100644 index 0000000..c59b726 --- /dev/null +++ b/modules/system/core.nix @@ -0,0 +1,29 @@ +{ self, lib, ... }: +# default configuration shared by all hosts +{ + flake.nixosModules.coreConfig = { pkgs, ... }: { + imports = [ + self.nixosModules.audioConfig + self.nixosModules.nixConfig + ]; + + documentation.dev.enable = true; + + i18n = { + defaultLocale = "en_AU.UTF-8"; + # saves space + supportedLocales = [ + "en_AU.UTF-8/UTF-8" + "en_US.UTF-8/UTF-8" + ]; + }; + + # don't touch this + system.stateVersion = lib.mkDefault "24.11"; + + time.timeZone = lib.mkDefault "Australia/Brisbane"; + + # compresses half the ram for use as swap + zramSwap.enable = true; + }; +} diff --git a/modules/system/core/default.nix b/modules/system/core/default.nix deleted file mode 100644 index 7fcb6dc..0000000 --- a/modules/system/core/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, ... }: -# default configuration shared by all hosts -{ - imports = [ - ./security.nix - ./users.nix - ../nix - ]; - - documentation.dev.enable = true; - - i18n = { - defaultLocale = "en_US.UTF-8"; - # saves space - supportedLocales = [ - "en_US.UTF-8/UTF-8" - "ja_JP.UTF-8/UTF-8" - "ro_RO.UTF-8/UTF-8" - ]; - }; - - # don't touch this - system.stateVersion = lib.mkDefault "23.11"; - - time.timeZone = lib.mkDefault "Europe/Bucharest"; - - # compresses half the ram for use as swap - zramSwap.enable = true; -} diff --git a/modules/system/default.nix b/modules/system/default.nix index efe2f34..fda5062 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -1,16 +1,17 @@ let desktop = [ - ./core - ./core/boot.nix + ./security.nix + ./users.nix + + ./core.nix + #./core + ./nix + ./network - ./hardware/brightness.nix - ./hardware/graphics.nix - ./hardware/bluetooth.nix + ./hardware ./programs ./services - ./services/greetd.nix - ./services/pipewire.nix ]; laptop = desktop ++ [ diff --git a/modules/system/core/users.nix b/modules/system/users.nix similarity index 100% rename from modules/system/core/users.nix rename to modules/system/users.nix diff --git a/modules/users/serenity.nix b/modules/users/serenity.nix index 95e101a..fcf8ddf 100644 --- a/modules/users/serenity.nix +++ b/modules/users/serenity.nix @@ -4,11 +4,11 @@ let home = "/home/${name}"; in { - flake.modules.nixos.user = + flake.nixosModules.u-serenity = { pkgs, ... }: { imports = [ - inputs.home-manager.nixosModules.home-manager + self.homeModules.baseHome ]; home-manager = { @@ -27,7 +27,6 @@ in stateVersion = "26.05"; }; } - kitty ]; }; };