From eda9b3c5d0f42976c9cdab58d44a167768b16cfa Mon Sep 17 00:00:00 2001 From: serenity-F Date: Fri, 18 Sep 2026 03:25:02 +1000 Subject: [PATCH] chore: commented and formatted code --- modules/features/desktop/default.nix | 22 +++++++++----- modules/features/desktop/niri.nix | 32 +++++--------------- modules/features/desktop/noctalia.nix | 7 ++++- modules/features/programs/gaming.nix | 15 ++++++---- modules/features/terminal/default.nix | 17 ++++++----- modules/features/terminal/helix.nix | 11 +++---- modules/hosts/hades/configuration.nix | 10 ++----- modules/hosts/hades/default.nix | 10 ++++--- modules/hosts/hades/hardware.nix | 3 +- modules/system/core-packages.nix | 42 ++++++++++++++------------- modules/system/core.nix | 4 --- modules/users/serenity.nix | 17 +++++++---- 12 files changed, 95 insertions(+), 95 deletions(-) diff --git a/modules/features/desktop/default.nix b/modules/features/desktop/default.nix index 888c587..8cf6813 100644 --- a/modules/features/desktop/default.nix +++ b/modules/features/desktop/default.nix @@ -1,24 +1,30 @@ -{ self, inputs, ... }: { +{ self, inputs, ... }: +{ + + # desktop supermodule flake.nixosModules.desktop = { # modules to include imports = [ - #greeter + + # session management + #self.nixosModules.${greeter} + + # window manager self.nixosModules.niri + + # desktop shell/status bar self.nixosModules.noctalia - #stylix + + # theme management + #self.nixosModules.stylix # for home manager functionality inputs.home-manager.nixosModules.home-manager - # home manager modules for niri and noctalia - #inputs.niri.homeModules.niri - #inputs.noctalia.homeModules.default ]; - #programs.foo = bar; - }; } diff --git a/modules/features/desktop/niri.nix b/modules/features/desktop/niri.nix index 7c0ebd4..95b234b 100644 --- a/modules/features/desktop/niri.nix +++ b/modules/features/desktop/niri.nix @@ -1,37 +1,20 @@ { self, inputs, ... }: { - # module declaration + # niri window manager module declaration flake.nixosModules.niri = { pkgs, ... }: - let - - #username = config.userOptions.username; - - in - { - imports = [ - - # for home manager functionality - inputs.home-manager.nixosModules.home-manager - - # for noctalia shell atop niri - #self.nixosModules.noctalia + # for home manager functionality + imports = [ inputs.home-manager.nixosModules.home-manager ]; + # packages for desktop environment + environment.systemPackages = with pkgs; [ + #foo + #bar ]; - environment = { - - # packages for desktop environment - systemPackages = with pkgs; [ - #foo - #bar - ]; - - }; - # session management programs.uwsm = { enable = true; @@ -45,6 +28,7 @@ # niri settings home-manager.users.serenity = { + # for home manager functionality imports = [ inputs.niri.homeModules.niri ]; programs.niri = { diff --git a/modules/features/desktop/noctalia.nix b/modules/features/desktop/noctalia.nix index edd796f..0fac0ad 100644 --- a/modules/features/desktop/noctalia.nix +++ b/modules/features/desktop/noctalia.nix @@ -2,6 +2,7 @@ { + # noctalia shell module declaration flake.nixosModules.noctalia = { pkgs, ... }: @@ -13,8 +14,9 @@ # home manager options home-manager.users.serenity = { - # for noctalia home manager configuration + # for noctalia home manager functionality imports = [ inputs.noctalia.homeModules.default ]; + programs.noctalia = { # enables noctalia @@ -26,8 +28,10 @@ general = { }; + # for calendar/weather location = { }; + # NOT YET IMPLEMENTED #colorSchemes.predefinedscheme = "foobar"; # no want dock :( @@ -35,6 +39,7 @@ enabled = false; }; + # status bar settings bar = { }; }; diff --git a/modules/features/programs/gaming.nix b/modules/features/programs/gaming.nix index 3870175..310edd5 100644 --- a/modules/features/programs/gaming.nix +++ b/modules/features/programs/gaming.nix @@ -1,15 +1,20 @@ { inputs, ... }: { - # module declaration - flake.nixosModules.gaming = { pkgs, ... }: { + # gaming module declaration + flake.nixosModules.gaming = { inputs, pkgs, ... }: { # options declarations #programs.whatever = {}; - # steam - programs.steam = { }; + # steam settings + programs.steam = { - # packages to include + # enables steam + enable = true; + + }; + + # other packages to include environment.systemPackages = with pkgs; [ ]; }; diff --git a/modules/features/terminal/default.nix b/modules/features/terminal/default.nix index 1456ae0..fc1aa84 100644 --- a/modules/features/terminal/default.nix +++ b/modules/features/terminal/default.nix @@ -1,8 +1,4 @@ -{ - self, - inputs, - ... -}: +{ self, inputs, ... }: { @@ -14,16 +10,21 @@ # home manager inputs.home-manager.nixosModules.home-manager + # terminal emulator self.nixosModules.kitty + # text editor self.nixosModules.helix + # file manager - #self.modules.yazi + #self.nixosModules.yazi + # shell and prompt - #self.modules.fish + #self.nixosModules.fish + # version control - #self.modules.git + #self.nixosModules.git ]; diff --git a/modules/features/terminal/helix.nix b/modules/features/terminal/helix.nix index 4acc72e..77d66ad 100644 --- a/modules/features/terminal/helix.nix +++ b/modules/features/terminal/helix.nix @@ -1,10 +1,5 @@ -{ - self, - inputs, - pkgs, - lib, - ... -}: +{ self, inputs, ... }: + { # defines a custom helix module @@ -13,10 +8,12 @@ { + # needed for home manager functionality imports = [ inputs.home-manager.nixosModules.home-manager ]; home-manager.users.serenity = { + # redundancy, not sure this is needed? home.packages = with pkgs; [ helix ]; diff --git a/modules/hosts/hades/configuration.nix b/modules/hosts/hades/configuration.nix index 8b530e1..8935917 100644 --- a/modules/hosts/hades/configuration.nix +++ b/modules/hosts/hades/configuration.nix @@ -1,14 +1,10 @@ -{ self, ... }: +{ self, inputs, ... }: { - # defines a module + # host module declaration flake.nixosModules.hades = - { - pkgs, - lib, - ... - }: + { pkgs, lib, ... }: { diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index 94f52bb..b7b5594 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -8,17 +8,19 @@ # modules that comprise the host specific configuration modules = with self.nixosModules; [ + # shared system modules + core + # host-specific options hades hadesHardware - # users to include on host - serenity - # extra modules to include on host terminal desktop - #noctalia + + # users to include on host + serenity ]; diff --git a/modules/hosts/hades/hardware.nix b/modules/hosts/hades/hardware.nix index 8632a49..6efd955 100644 --- a/modules/hosts/hades/hardware.nix +++ b/modules/hosts/hades/hardware.nix @@ -1,7 +1,7 @@ { ... }: { - # defines a module + # hardware module declaration flake.nixosModules.hadesHardware = { config, @@ -15,6 +15,7 @@ # important i think lol imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + # bootloader boot.loader.systemd-boot.enable = true; # shrug diff --git a/modules/system/core-packages.nix b/modules/system/core-packages.nix index adb7858..c1ccdfa 100644 --- a/modules/system/core-packages.nix +++ b/modules/system/core-packages.nix @@ -3,13 +3,6 @@ # module declaration flake.nixosModules.core-packages = { pkgs, ... }: { - # environment variables - environment.variables = { - EDITOR = "helix"; - VISUAL = "helix"; - SYSTEMD_EDITOR = "helix"; - }; - # nix settings nix.settings = { @@ -26,20 +19,37 @@ # nixpkgs settings nixpkgs = { - # allows crud + # allows broken and ideologically impure packages config = { allowUnfree = true; allowBroken = true; }; - # overlays + # nixpkgs overlays overlays = [ #niri.overlays.niri ]; }; - # options declarations + # services to include in base system + services = { + + # flatpak software + flatpak = { + enable = true; + }; + + }; + + # environment variables + environment.variables = { + EDITOR = "helix"; + VISUAL = "helix"; + SYSTEMD_EDITOR = "helix"; + }; + + # core programs to include in base system programs = { # necessary terminal programs @@ -65,16 +75,7 @@ # to run an elf binary not compiled for nixos. environment.stub-ld.enable = true; - services = { - - # flatpak software - flatpak = { - enable = true; - }; - - }; - - # packages to include + # core packages to include in base system environment.systemPackages = with pkgs; [ # nix utilities @@ -128,6 +129,7 @@ libsecret git-crypt undervolt + ]; }; diff --git a/modules/system/core.nix b/modules/system/core.nix index 7238699..c95ea2a 100644 --- a/modules/system/core.nix +++ b/modules/system/core.nix @@ -5,10 +5,6 @@ flake.nixosModules.core = { lib, pkgs, ... }: - let - - in - { # other modules to load diff --git a/modules/users/serenity.nix b/modules/users/serenity.nix index 075845e..48a10bd 100644 --- a/modules/users/serenity.nix +++ b/modules/users/serenity.nix @@ -2,9 +2,6 @@ { - # necessary for home manager function - #imports = [ inputs.home-manager.nixosModules.home-manager ]; - # user module declaration flake.nixosModules.serenity = @@ -15,9 +12,10 @@ # necessary for home manager function imports = [ inputs.home-manager.nixosModules.home-manager ]; + # needed or nix yells at me programs.fish.enable = true; - # user declaration + # nixos user declaration users.users.serenity = { # remember to change this @@ -30,12 +28,13 @@ "networkmanager" ]; - # dont hardcode this + # dont hardcode this ? # catgirl shell shell = pkgs.fish; }; + # not entirely sure this is necessary tbh environment.systemPackages = with pkgs; [ home-manager ]; # home manager settings @@ -43,12 +42,18 @@ verbose = true; overwriteBackup = true; backupFileExtension = ".bak"; + + # need to disable soon ? useGlobalPkgs = true; useUserPackages = true; + + # home manager user declaration users.serenity = { home.stateVersion = "24.11"; nixpkgs.config.allowUnfree = true; - imports = [ ]; + + # user specific modules to include + #imports = [ ]; }; };