From bfec5470bdc968151d9de64f574a35572cc7bd46 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Tue, 29 Sep 2026 00:29:43 +1000 Subject: [PATCH] tweak: shuffled options around --- modules/features/desktop/default.nix | 78 ++++--------------------- modules/hosts/hades/default.nix | 14 ++--- modules/hosts/live-usb/default.nix | 16 ++---- modules/system/core.nix | 85 ++++++++++++++++++++-------- 4 files changed, 82 insertions(+), 111 deletions(-) diff --git a/modules/features/desktop/default.nix b/modules/features/desktop/default.nix index fdcf5e2..d609f1a 100644 --- a/modules/features/desktop/default.nix +++ b/modules/features/desktop/default.nix @@ -23,88 +23,30 @@ ]; - # Boot/GRUB options - boot = { - #bootspec.enable = true; - consoleLogLevel = 3; - initrd = { - verbose = false; - systemd = { - enable = true; - }; - }; - kernelParams = [ - # grub kernel parameters, set to prevent excessive output on boot - "vga=current" # use current video adapater - "splash" # unsure ? - "quiet" # quiet log level - "loglevel=3" # minimal output on boot - "udev.log_priority=3" # more minimising of output on boot - "rd.systemd.show_status=false" # unsure ? - "rd.udev.log_level=0" # more minimising of output on boot - "boot.shell_on_fail" # reboots to basic uefi shell on boot failure - "i915.fastboot=1" # unsure ? - "plymouth.debug" # I NEED ANSWERS - "plymouth.use-simpledrm" # tweak to allow plymouth animations to run smoother - "plymouth.ignore-serial-consoles" # unsure ? - ]; - loader = { - timeout = lib.mkDefault 5; # 5 second timeout to default selection - }; - plymouth = { - # enables plymouth boot animations - enable = true; - extraConfig = "ShowDelay=0"; - themePackages = with pkgs; [ - (adi1090x-plymouth-themes.override { - selected_themes = [ "circle" ]; - }) - ]; - }; - }; - - # login manager - services.displayManager.regreet = { + # polkit + security.polkit = { enable = true; }; - # polkit - security.polkit = { + # session management + environment.variables = { + XDG_SESSION_TYPE = "wayland"; + }; + services.displayManager.regreet = { enable = true; }; # disk management services.udisks2.enable = true; programs.gnome-disks.enable = true; - - environment.systemPackages = with pkgs; [ - - # disk management pkgs - gparted - udiskie - - ]; - - environment.variables = { - XDG_SESSION_TYPE = "wayland"; - }; - + environment.systemPackages = with pkgs; [ gparted ]; home-manager.users.serenity = { # password prompts services.gnome-keyring.enable = true; - # disk automount - services.udiskie = { - enable = true; - tray = "always"; - notify = true; - automount = true; - }; - + # more desktop applications home.packages = with pkgs; [ - - # more desktop applications gnome-calculator # simple calculator gnome-secrets # password manager file-roller # archive manager @@ -112,10 +54,10 @@ nautilus # file manager swayimg # image viewer zathura # pdf viewer - ]; }; + }; } diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index 2725fc1..4d1fe5f 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -49,23 +49,23 @@ { - # other modules to import - imports = [ ]; - # set hostname networking.hostName = "hades"; # bootloader settings - boot.loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; + boot = { + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + timeout = lib.mkDefault 5; + }; + initrd.systemd.enable = true; }; # supported filesystems at boot boot.supportedFilesystems = [ "vfat" "ext4" - #"ntfs" ]; # enable printing support diff --git a/modules/hosts/live-usb/default.nix b/modules/hosts/live-usb/default.nix index 18733be..95ad705 100644 --- a/modules/hosts/live-usb/default.nix +++ b/modules/hosts/live-usb/default.nix @@ -31,17 +31,10 @@ # host module declaration flake.nixosModules.usb-configuration = - { - pkgs, - lib, - ... - }: + { pkgs, lib, ... }: { - # other modules to import - imports = [ ]; - # set hostname networking.hostName = "serenityos"; @@ -49,7 +42,9 @@ boot.loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; + timeout = lib.mkDefault 5; }; + boot.initrd.systemd.enable = true; # supported filesystems at boot boot.supportedFilesystems = [ @@ -58,9 +53,8 @@ "ntfs" ]; - # specifies x64 uArch - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - }; + }; + } diff --git a/modules/system/core.nix b/modules/system/core.nix index ee82338..8908f85 100644 --- a/modules/system/core.nix +++ b/modules/system/core.nix @@ -10,22 +10,67 @@ { # other modules to load - imports = [ ]; + imports = [ inputs.home-manager.nixosModules.home-manager ]; + + # don't touch this + system.stateVersion = lib.mkDefault "24.11"; + documentation.dev.enable = true; + + # plymouth settings + boot = { + plymouth = { + enable = true; + extraConfig = "ShowDelay=0"; + themePackages = with pkgs; [ + (adi1090x-plymouth-themes.override { + selected_themes = [ "circle" ]; + }) + ]; + }; + # kernel and boot settings for plymouth + initrd.verbose = false; + consoleLogLevel = 3; + kernelParams = [ + # grub kernel parameters, set to prevent excessive output on boot + "vga=current" # use current video adapater + "splash" # unsure ? + "quiet" # quiet log level + "loglevel=3" # minimal output on boot + "udev.log_priority=3" # more minimising of output on boot + "rd.systemd.show_status=false" # unsure ? + "rd.udev.log_level=0" # more minimising of output on boot + "boot.shell_on_fail" # reboots to basic uefi shell on boot failure + "i915.fastboot=1" # unsure ? + "plymouth.debug" # I NEED ANSWERS + "plymouth.use-simpledrm" # tweak to allow plymouth animations to run smoother + "plymouth.ignore-serial-consoles" # unsure ? + ]; + }; # extra features nix.settings.experimental-features = [ - # flake based config requires flakes "flakes" - #fancier nix usage "nix-command" - ]; # compresses half the ram for use as swap zramSwap.enable = true; + # configures disk automount service + home-manager.users.serenity = { + services.udiskie = { + enable = true; + tray = "always"; + notify = true; + automount = true; + }; + }; + + # meanjin time + time.timeZone = lib.mkDefault "Australia/Brisbane"; + # locale settings i18n = { defaultLocale = "en_AU.UTF-8"; @@ -35,13 +80,6 @@ ]; }; - # meanjin time - time.timeZone = lib.mkDefault "Australia/Brisbane"; - - # don't touch this - system.stateVersion = lib.mkDefault "24.11"; - documentation.dev.enable = true; - # nixpkgs settings nixpkgs = { # allows broken and ideologically impure packages @@ -53,26 +91,23 @@ overlays = [ ]; }; - programs = { - # necessary terminal programs - gnupg.agent = { - enable = true; - enableSSHSupport = true; - #pinentryPackage = [ ]; - }; - # binary support - nix-ld.enable = true; - appimage = { - enable = true; - binfmt = true; - }; + # for encryption + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + #pinentryPackage = [ ]; }; + # binary support # installs a stub elf loader to print an error # message in the event that a user attempts # to run an elf binary not compiled for nixos. environment.stub-ld.enable = true; - + programs.nix-ld.enable = true; + programs.appimage = { + enable = true; + binfmt = true; + }; # core packages to include in base system environment.systemPackages = with pkgs; [