diff --git a/assets/boilerplate/boilerplate.nix b/assets/boilerplate/boilerplate.nix index 343ddca..682e9ee 100644 --- a/assets/boilerplate/boilerplate.nix +++ b/assets/boilerplate/boilerplate.nix @@ -3,8 +3,8 @@ # let bindings let + # for foobar #foo = bar - # in @@ -17,23 +17,30 @@ in modules = [ self.modules.nixos.othermodule ]; - imports = [ - ./otherfile.nix - ]; - # options - programs = { }; + # for home manager functionality + imports = [ inputs.home-manager.nixosModules.home-manager ]; - }; + # nixos options + programs = { + foo = { + bar = true; + }; + }; - # home manager module declaration - flake.modules.homeManager.modulename = { ... }: { + # home manager options + home-manager.users.${username} = { - # module imports - imports = [ ]; + # program settings + programs = { - # options - programs = { }; + foo = { + bar = true; + }; + + }; + + }; }; diff --git a/modules/features/desktop/noctalia.nix b/modules/features/desktop/noctalia.nix index 9387ab2..390b683 100644 --- a/modules/features/desktop/noctalia.nix +++ b/modules/features/desktop/noctalia.nix @@ -1,21 +1,20 @@ -{ inputs, ... }: { +{ self, inputs, ... }: + +{ flake.nixosModules.noctalia = - { lib, ... }: - - let - #username = config.userOptions.username; - #hostName = config.userOptions.hostName; - #wallpaper = config.userOptions.wallpaper; - in + { pkgs, ... }: { # for home manager functionality imports = [ inputs.home-manager.nixosModules.home-manager ]; - home-manager.users.serenity = { - imports = [ inputs.noctalia.homeModules.default ]; + # home manager options + home-manager.users.serenity = { + + # for noctalia home manager configuration + imports = [ inputs.noctalia.homeModules.default ]; programs.noctalia-shell = { # enables noctalia @@ -31,6 +30,7 @@ #colorSchemes.predefinedscheme = "foobar"; + # no want dock :( dock = { enabled = false; }; @@ -38,8 +38,11 @@ bar = { }; }; + }; + }; + }; } diff --git a/modules/features/terminal/kitty.nix b/modules/features/terminal/kitty.nix index ee48cfc..880fdae 100644 --- a/modules/features/terminal/kitty.nix +++ b/modules/features/terminal/kitty.nix @@ -1,9 +1,5 @@ -{ - self, - inputs, - pkgs, - ... -}: +{ self, inputs, ... }: + { # defines a custom kitty module @@ -12,8 +8,10 @@ { + # for home manager functionality imports = [ inputs.home-manager.nixosModules.home-manager ]; + # home manager settings home-manager.users.serenity = { # packages to include @@ -42,11 +40,7 @@ size = 12; }; - # misecellaneous kitty config - extraConfig = '' - window_padding_width 0 20 - ''; - + # kitty settings settings = { # sets fish as the default shell @@ -79,9 +73,15 @@ }; + # misecellaneous kitty config + extraConfig = '' + window_padding_width 0 20 + ''; + }; }; + }; } diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index 3e39fb5..3daf778 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -18,6 +18,7 @@ # extra modules to include on host terminal #desktop + noctalia ];