From 5e395ca047e9028413d64b26b849a176e84d8772 Mon Sep 17 00:00:00 2001 From: serenity-F Date: Mon, 31 Aug 2026 16:26:45 +1000 Subject: [PATCH] further tidying --- assets/boilerplate/boilerplate.nix | 40 +++++++++++ .../boilerplate/myFirstModule.nix | 0 .../boilerplate/myMachine.nix | 0 .../boilerplate/myPackage.nix | 0 {resources => assets}/media/avatar.png | 0 {resources => assets}/repository/credits.md | 0 .../repository/flake-structure.md | 0 .../repository/screenshot-desktop1.png | 0 .../repository/screenshot-desktop2.png | 0 .../repository/screenshot-fetch.png | 0 .../repository/screenshot-helix.png | 0 .../default.nix => features/core-home.nix} | 0 modules/features/desktop/niri.nix | 49 +++++++++++++ .../{home => features}/desktop/noctalia.nix | 0 modules/features/programs/gaming.nix | 17 +++++ .../{home => features}/terminal/default.nix | 0 modules/{home => features}/terminal/fish.nix | 0 modules/{home => features}/terminal/git.nix | 0 modules/{home => features}/terminal/helix.nix | 0 modules/{home => features}/terminal/kitty.nix | 0 modules/{home => features}/terminal/yazi.nix | 0 modules/home/desktop/README.md | 5 -- modules/home/desktop/niri.nix | 68 ------------------- modules/home/programs/optional-program.nix | 16 ----- modules/home/terminal/README.md | 5 -- modules/hosts/hades/default.nix | 5 +- modules/pkgs/custom-package.nix | 16 ----- modules/system/programs/gaming.nix | 16 ----- resources/boilerplate/boilerplate.nix | 28 -------- 29 files changed, 110 insertions(+), 155 deletions(-) create mode 100644 assets/boilerplate/boilerplate.nix rename {resources => assets}/boilerplate/myFirstModule.nix (100%) rename {resources => assets}/boilerplate/myMachine.nix (100%) rename {resources => assets}/boilerplate/myPackage.nix (100%) rename {resources => assets}/media/avatar.png (100%) rename {resources => assets}/repository/credits.md (100%) rename {resources => assets}/repository/flake-structure.md (100%) rename {resources => assets}/repository/screenshot-desktop1.png (100%) rename {resources => assets}/repository/screenshot-desktop2.png (100%) rename {resources => assets}/repository/screenshot-fetch.png (100%) rename {resources => assets}/repository/screenshot-helix.png (100%) rename modules/{home/default.nix => features/core-home.nix} (100%) create mode 100644 modules/features/desktop/niri.nix rename modules/{home => features}/desktop/noctalia.nix (100%) create mode 100644 modules/features/programs/gaming.nix rename modules/{home => features}/terminal/default.nix (100%) rename modules/{home => features}/terminal/fish.nix (100%) rename modules/{home => features}/terminal/git.nix (100%) rename modules/{home => features}/terminal/helix.nix (100%) rename modules/{home => features}/terminal/kitty.nix (100%) rename modules/{home => features}/terminal/yazi.nix (100%) delete mode 100644 modules/home/desktop/README.md delete mode 100644 modules/home/desktop/niri.nix delete mode 100644 modules/home/programs/optional-program.nix delete mode 100644 modules/home/terminal/README.md delete mode 100644 modules/pkgs/custom-package.nix delete mode 100644 modules/system/programs/gaming.nix delete mode 100644 resources/boilerplate/boilerplate.nix diff --git a/assets/boilerplate/boilerplate.nix b/assets/boilerplate/boilerplate.nix new file mode 100644 index 0000000..343ddca --- /dev/null +++ b/assets/boilerplate/boilerplate.nix @@ -0,0 +1,40 @@ +{ self, inputs, ... }: + +# let bindings +let + + #foo = bar + # + +in + +{ + + # nixos module declaration + flake.modules.nixos.modulename = { ... }: { + + # list of modules to import + modules = [ + self.modules.nixos.othermodule + ]; + imports = [ + ./otherfile.nix + ]; + + # options + programs = { }; + + }; + + # home manager module declaration + flake.modules.homeManager.modulename = { ... }: { + + # module imports + imports = [ ]; + + # options + programs = { }; + + }; + +} diff --git a/resources/boilerplate/myFirstModule.nix b/assets/boilerplate/myFirstModule.nix similarity index 100% rename from resources/boilerplate/myFirstModule.nix rename to assets/boilerplate/myFirstModule.nix diff --git a/resources/boilerplate/myMachine.nix b/assets/boilerplate/myMachine.nix similarity index 100% rename from resources/boilerplate/myMachine.nix rename to assets/boilerplate/myMachine.nix diff --git a/resources/boilerplate/myPackage.nix b/assets/boilerplate/myPackage.nix similarity index 100% rename from resources/boilerplate/myPackage.nix rename to assets/boilerplate/myPackage.nix diff --git a/resources/media/avatar.png b/assets/media/avatar.png similarity index 100% rename from resources/media/avatar.png rename to assets/media/avatar.png diff --git a/resources/repository/credits.md b/assets/repository/credits.md similarity index 100% rename from resources/repository/credits.md rename to assets/repository/credits.md diff --git a/resources/repository/flake-structure.md b/assets/repository/flake-structure.md similarity index 100% rename from resources/repository/flake-structure.md rename to assets/repository/flake-structure.md diff --git a/resources/repository/screenshot-desktop1.png b/assets/repository/screenshot-desktop1.png similarity index 100% rename from resources/repository/screenshot-desktop1.png rename to assets/repository/screenshot-desktop1.png diff --git a/resources/repository/screenshot-desktop2.png b/assets/repository/screenshot-desktop2.png similarity index 100% rename from resources/repository/screenshot-desktop2.png rename to assets/repository/screenshot-desktop2.png diff --git a/resources/repository/screenshot-fetch.png b/assets/repository/screenshot-fetch.png similarity index 100% rename from resources/repository/screenshot-fetch.png rename to assets/repository/screenshot-fetch.png diff --git a/resources/repository/screenshot-helix.png b/assets/repository/screenshot-helix.png similarity index 100% rename from resources/repository/screenshot-helix.png rename to assets/repository/screenshot-helix.png diff --git a/modules/home/default.nix b/modules/features/core-home.nix similarity index 100% rename from modules/home/default.nix rename to modules/features/core-home.nix diff --git a/modules/features/desktop/niri.nix b/modules/features/desktop/niri.nix new file mode 100644 index 0000000..f0abd09 --- /dev/null +++ b/modules/features/desktop/niri.nix @@ -0,0 +1,49 @@ +{ self, inputs, ... }: { + + # module declaration + flake.modules.nixos.niri = { pkgs, ... }: { + + programs.niri = { + + # enables niri + enable = true; + + }; + + }; + + # defines a niri hm config + flake.modules.homeManager.niri = + { + config, + pkgs, + lib, + ... + }: + { + + imports = [ + # launcher + self.modules.homeManager.wofi + # desktop shell + self.modules.homeManager.noctalia + + ]; + + programs = { + + niri = { + + # enables niri + enable = true; + + # niri settings + settings = { + + }; + }; + }; + + }; + +} diff --git a/modules/home/desktop/noctalia.nix b/modules/features/desktop/noctalia.nix similarity index 100% rename from modules/home/desktop/noctalia.nix rename to modules/features/desktop/noctalia.nix diff --git a/modules/features/programs/gaming.nix b/modules/features/programs/gaming.nix new file mode 100644 index 0000000..3870175 --- /dev/null +++ b/modules/features/programs/gaming.nix @@ -0,0 +1,17 @@ +{ inputs, ... }: { + + # module declaration + flake.nixosModules.gaming = { pkgs, ... }: { + + # options declarations + #programs.whatever = {}; + + # steam + programs.steam = { }; + + # packages to include + environment.systemPackages = with pkgs; [ ]; + + }; + +} diff --git a/modules/home/terminal/default.nix b/modules/features/terminal/default.nix similarity index 100% rename from modules/home/terminal/default.nix rename to modules/features/terminal/default.nix diff --git a/modules/home/terminal/fish.nix b/modules/features/terminal/fish.nix similarity index 100% rename from modules/home/terminal/fish.nix rename to modules/features/terminal/fish.nix diff --git a/modules/home/terminal/git.nix b/modules/features/terminal/git.nix similarity index 100% rename from modules/home/terminal/git.nix rename to modules/features/terminal/git.nix diff --git a/modules/home/terminal/helix.nix b/modules/features/terminal/helix.nix similarity index 100% rename from modules/home/terminal/helix.nix rename to modules/features/terminal/helix.nix diff --git a/modules/home/terminal/kitty.nix b/modules/features/terminal/kitty.nix similarity index 100% rename from modules/home/terminal/kitty.nix rename to modules/features/terminal/kitty.nix diff --git a/modules/home/terminal/yazi.nix b/modules/features/terminal/yazi.nix similarity index 100% rename from modules/home/terminal/yazi.nix rename to modules/features/terminal/yazi.nix diff --git a/modules/home/desktop/README.md b/modules/home/desktop/README.md deleted file mode 100644 index 842d967..0000000 --- a/modules/home/desktop/README.md +++ /dev/null @@ -1,5 +0,0 @@ -TODO: - -- dendritify (use wrappers for) desktop configurations -- make noctalia discrete -- make gnome desktop diff --git a/modules/home/desktop/niri.nix b/modules/home/desktop/niri.nix deleted file mode 100644 index 7ccf671..0000000 --- a/modules/home/desktop/niri.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ self, inputs, ... }: { - - # module declaration - flake.nixosModules.niri = { pkgs, lib, ... }: { - - programs.niri = { - - # enables niri - enable = true; - - # use a custom niri package - package = self.packages.${pkgs.stdenv.hostPlatform.system}.myNiri; - - }; - - }; - - # defines a custom niri package - perSystem = - { - pkgs, - lib, - self', - ... - }: - { - - packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap { - - # follow global packages - inherit pkgs; - - # customised niri settings - settings = { - - # xwayland-satellite package to use - xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite; - - # makes our custom noctalia a dependency and spawns it at startup - spawn-at-startup = [ - (lib.getExe self'.packages.myNoctalia) - ]; - - # keyboard layout and binds - input.keyboard.xkb.layout = "us"; - binds = { - - # terminal and launcher binds - "Mod+Return".spawn-sh = lib.getExe self'.packages.myKitty; - "Mod+Tab".spawn-sh = "${lib.getExe self.packages.myNoctalia} ipc call launcher toggle"; - - # window control binds - "Mod+Q".close-window = null; - - }; - - # layout and visual settings - layout = { - - gaps = 5; - - }; - - }; - }; - }; - -} diff --git a/modules/home/programs/optional-program.nix b/modules/home/programs/optional-program.nix deleted file mode 100644 index 58ea2e7..0000000 --- a/modules/home/programs/optional-program.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ inputs, ... }: { - - # module declaration - flake.nixosModules.myFirstModule = { pkgs, ... }: { - - # options declarations - programs.firefox.enable = true; - - # packages to include - environment.systemPackages = with pkgs; [ - helix - ]; - - }; - -} diff --git a/modules/home/terminal/README.md b/modules/home/terminal/README.md deleted file mode 100644 index 10eb4a6..0000000 --- a/modules/home/terminal/README.md +++ /dev/null @@ -1,5 +0,0 @@ - -TODO: - - - make `kitty.nix` the core of -> `default.nix` - - dendiritify (use wrappers for) terminal config diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index 09bee3b..dd84114 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -19,6 +19,9 @@ self.nixosModules.hades self.nixosModules.hades-hardware + # extra modules + self.modules.nixos.gaming + # home manager and home manager imports inputs.home-manager.nixosModules.home-manager { @@ -26,7 +29,7 @@ home-manager.users.serenity = { imports = [ config.flake.homeModules.core-home - #config.flake.homeModules.hades-home + config.flake.homeModules.desktop ]; }; } diff --git a/modules/pkgs/custom-package.nix b/modules/pkgs/custom-package.nix deleted file mode 100644 index 58ea2e7..0000000 --- a/modules/pkgs/custom-package.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ inputs, ... }: { - - # module declaration - flake.nixosModules.myFirstModule = { pkgs, ... }: { - - # options declarations - programs.firefox.enable = true; - - # packages to include - environment.systemPackages = with pkgs; [ - helix - ]; - - }; - -} diff --git a/modules/system/programs/gaming.nix b/modules/system/programs/gaming.nix deleted file mode 100644 index 58ea2e7..0000000 --- a/modules/system/programs/gaming.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ inputs, ... }: { - - # module declaration - flake.nixosModules.myFirstModule = { pkgs, ... }: { - - # options declarations - programs.firefox.enable = true; - - # packages to include - environment.systemPackages = with pkgs; [ - helix - ]; - - }; - -} diff --git a/resources/boilerplate/boilerplate.nix b/resources/boilerplate/boilerplate.nix deleted file mode 100644 index 6812942..0000000 --- a/resources/boilerplate/boilerplate.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ inputs, ... }: - -# let bindings -let - - #foo = bar - # - -in - -{ - - # try `$ nix run .#boilerplate` - flake = { - - # modules declaration - nixosConfigurations.main = inputs.nixpkgs.lib.nixosSystem { - - # list of modules to import - modules = [ - ./configuration.nix - ]; - - }; - - }; - -}