diff --git a/modules/features/desktop/default.nix b/modules/features/desktop/default.nix index 6d1b046..2f2c016 100644 --- a/modules/features/desktop/default.nix +++ b/modules/features/desktop/default.nix @@ -11,7 +11,6 @@ noctalia #stylix ] - ++ [ inputs.home-manager.nixosModules.home-manager ]; #programs.foo = bar; diff --git a/modules/features/desktop/niri.nix b/modules/features/desktop/niri.nix index cf053cc..39a6b69 100644 --- a/modules/features/desktop/niri.nix +++ b/modules/features/desktop/niri.nix @@ -50,10 +50,8 @@ # niri settings home-manager.users.serenity = { programs.niri = { - - settings = { - - }; + enable = true; + #settings = { }; }; diff --git a/modules/features/terminal/default.nix b/modules/features/terminal/default.nix index 54d18bb..1456ae0 100644 --- a/modules/features/terminal/default.nix +++ b/modules/features/terminal/default.nix @@ -1,32 +1,23 @@ { self, inputs, - config, ... }: -# let bindings -let - - # xdg variables - data = config.xdg.dataHome; - conf = config.xdg.configHome; - cache = config.xdg.cacheHome; - -in - { # terminal supermodule flake.nixosModules.terminal = { pkgs, ... }: { # list of modules to include - imports = with self.nixosModules; [ + imports = [ + # home manager + inputs.home-manager.nixosModules.home-manager # terminal emulator - kitty + self.nixosModules.kitty # text editor - helix + self.nixosModules.helix # file manager #self.modules.yazi # shell and prompt diff --git a/modules/features/terminal/helix.nix b/modules/features/terminal/helix.nix index c1fb81c..098fbf2 100644 --- a/modules/features/terminal/helix.nix +++ b/modules/features/terminal/helix.nix @@ -8,54 +8,59 @@ { # defines a custom helix module - flake.modules.homeManager.helix = { + flake.nixosModules.helix = { - home.packages = with pkgs; [ - helix - ]; + imports = [ inputs.home-manager.nixosModules.home-manager ]; - programs.helix = { + home-manager.users.serenity = { - # enables helix - enable = true; + home.packages = with pkgs; [ + helix + ]; - settings = { + programs.helix = { + + # enables helix + enable = true; + + settings = { + + # cursor settings + editor.cursor-shape = { + normal = "underline"; + insert = "bar"; + select = "block"; + }; + + # declare theme to use + theme = "onedarker_transparent"; - # cursor settings - editor.cursor-shape = { - normal = "underline"; - insert = "bar"; - select = "block"; }; - # declare theme to use - theme = "onedarker_transparent"; + # list of themes + themes = { - }; + # modified theme + onedarker_transparent = { + "inherits" = "onedarker"; + "ui.background" = { }; + }; - # list of themes - themes = { - - # modified theme - onedarker_transparent = { - "inherits" = "onedarker"; - "ui.background" = { }; }; - }; + # lsp settings + languages = { - # lsp settings - languages = { - - # nix - language = [ - { - name = "nix"; - auto-format = true; - formatter.command = lib.getExe pkgs.nxfmt; - } - ]; + # nix + language = [ + { + name = "nix"; + auto-format = true; + formatter.command = lib.getExe pkgs.nxfmt; + } + ]; + }; }; }; }; diff --git a/modules/features/terminal/kitty.nix b/modules/features/terminal/kitty.nix index a8a410d..d638190 100644 --- a/modules/features/terminal/kitty.nix +++ b/modules/features/terminal/kitty.nix @@ -7,73 +7,78 @@ { # defines a custom kitty module - flake.modules.homeManager.kitty = { + flake.nixosModules.kitty = { - # packages to include - home.packages = with pkgs; [ - kitty - ]; + imports = [ inputs.home-manager.nixosModules.home-manager ]; - # cli fuzzy finder - programs.fzf = { - enable = true; - enableFishIntegration = true; - }; + home-manager.users.serenity = { - programs.kitty = { + # packages to include + home.packages = with pkgs; [ + kitty + ]; - # enables kitty - enable = true; - - # kitty integrations - enableGitIntegration = true; - shellIntegration.enableFishIntegration = true; - - # font settings - font = { - name = "spleen 32x64"; - size = 12; + # cli fuzzy finder + programs.fzf = { + enable = true; + enableFishIntegration = true; }; - # misecellaneous kitty config - extraConfig = '' - window_padding_width 0 20 - ''; + programs.kitty = { - settings = { + # enables kitty + enable = true; - # sets fish as the default shell - shell = "${pkgs.fish}/bin/fish"; + # kitty integrations + enableGitIntegration = true; + shellIntegration.enableFishIntegration = true; - # misc. settings - url_style = "curly"; - disable_ligutures = "never"; - scrollback_lines = 10000; - enable_audio_bell = false; - update_check_interval = 0; + # font settings + font = { + name = "spleen 32x64"; + size = 12; + }; - # cursor settings - cursor_shape = "Underline"; - cursor_shape_unfocused = "unchanged"; - cursor_underline_thickness = 1; - cursor_trail = 1; + # misecellaneous kitty config + extraConfig = '' + window_padding_width 0 20 + ''; - # window settings - window_padding_width = 5; - remember_window_size = "no"; - initial_window_width = 1200; - initial_window_height = 600; - confirm_os_window_close = "0"; - hide_window_decorations = true; - show_window_resize_notification = false; + settings = { - # Colours - # NOT YET IMPLEMENTED + # sets fish as the default shell + shell = "${pkgs.fish}/bin/fish"; + + # misc. settings + url_style = "curly"; + disable_ligutures = "never"; + scrollback_lines = 10000; + enable_audio_bell = false; + update_check_interval = 0; + + # cursor settings + cursor_shape = "Underline"; + cursor_shape_unfocused = "unchanged"; + cursor_underline_thickness = 1; + cursor_trail = 1; + + # window settings + window_padding_width = 5; + remember_window_size = "no"; + initial_window_width = 1200; + initial_window_height = 600; + confirm_os_window_close = "0"; + hide_window_decorations = true; + show_window_resize_notification = false; + + # Colours + # NOT YET IMPLEMENTED + + }; }; }; - }; } diff --git a/modules/hosts/hades/default.nix b/modules/hosts/hades/default.nix index 22472ca..3e39fb5 100644 --- a/modules/hosts/hades/default.nix +++ b/modules/hosts/hades/default.nix @@ -16,8 +16,8 @@ serenity # extra modules to include on host - #terminal - desktop + terminal + #desktop ];