diff --git a/modules/home/programs/optional-program.nix b/modules/home/programs/optional-program.nix new file mode 100644 index 0000000..58ea2e7 --- /dev/null +++ b/modules/home/programs/optional-program.nix @@ -0,0 +1,16 @@ +{ 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/kitty-d.nix b/modules/home/terminal/kitty-d.nix deleted file mode 100644 index f661a1a..0000000 --- a/modules/home/terminal/kitty-d.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ self, inputs, ... }: { - - perSystem = { pkgs, ... }: { - - packages.myKitty = inputs.wrapper-modules.wrappers.kitty.wrap { - settings = { - foo = bar; - }; - }; - - }; - -} diff --git a/modules/hosts/hades/configuration.nix b/modules/hosts/hades/configuration.nix index 971157e..3d6744e 100644 --- a/modules/hosts/hades/configuration.nix +++ b/modules/hosts/hades/configuration.nix @@ -71,8 +71,5 @@ openrgb-with-all-plugins ]; - # dont touch this - system.stateVersion = "24.11"; - }; } diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index 828134b..94ce41c 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -1,22 +1,38 @@ -{ self, inputs, config, ... }: { +{ + self, + inputs, + config, + ... +}: +{ + # defines the hades specific config modules flake.nixosConfigurations.hades = inputs.nixpkgs.lib.nixosSystem { + + # modules that comprise the host specific module modules = [ - self.nixosModules.hadesHardware - self.nixosModules.hadesConfig + + # core system modules self.nixosModules.coreConfig + # hades system modules + self.nixosModules.hadesHardware + self.nixosModules.hadesConfig + + # home manager and home manager imports inputs.home-manager.nixosModules.home-manager { home-manager.backupFileExtension = "bak"; home-manager.users.serenity = { imports = [ - config.flake.homeModules.base + config.flake.homeModules.baseHome config.flake.homeModules.hadesHome ]; }; } ]; + }; + } diff --git a/modules/pkgs/custom-package.nix b/modules/pkgs/custom-package.nix new file mode 100644 index 0000000..58ea2e7 --- /dev/null +++ b/modules/pkgs/custom-package.nix @@ -0,0 +1,16 @@ +{ 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/misc/flake-parts.nix b/modules/system/misc/flake-parts.nix similarity index 100% rename from modules/misc/flake-parts.nix rename to modules/system/misc/flake-parts.nix diff --git a/modules/misc/hm-parts.nix b/modules/system/misc/hm-parts.nix similarity index 100% rename from modules/misc/hm-parts.nix rename to modules/system/misc/hm-parts.nix diff --git a/modules/misc/theme.nix b/modules/system/misc/theme.nix similarity index 100% rename from modules/misc/theme.nix rename to modules/system/misc/theme.nix diff --git a/modules/system/packages.nix b/modules/system/packages.nix new file mode 100644 index 0000000..58ea2e7 --- /dev/null +++ b/modules/system/packages.nix @@ -0,0 +1,16 @@ +{ 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 new file mode 100644 index 0000000..58ea2e7 --- /dev/null +++ b/modules/system/programs/gaming.nix @@ -0,0 +1,16 @@ +{ 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/repository/screenshot-btop.png b/resources/repository/screenshot-desktop1.png similarity index 100% rename from resources/repository/screenshot-btop.png rename to resources/repository/screenshot-desktop1.png diff --git a/resources/repository/screenshot-desktop.png b/resources/repository/screenshot-desktop2.png similarity index 100% rename from resources/repository/screenshot-desktop.png rename to resources/repository/screenshot-desktop2.png diff --git a/resources/repository/screenshot-noctalia.png b/resources/repository/screenshot-noctalia.png deleted file mode 100644 index e69de29..0000000