diff --git a/modules/features/terminal/btop.nix b/modules/features/terminal/btop.nix index 10d476c..3ce4dd8 100644 --- a/modules/features/terminal/btop.nix +++ b/modules/features/terminal/btop.nix @@ -2,7 +2,7 @@ { - # btop module declaration + # defines a custom btop module flake.modules.nixos.btop = { ... }: { # for home manager functionality diff --git a/modules/features/terminal/default.nix b/modules/features/terminal/default.nix index 9dde6f9..e44c622 100644 --- a/modules/features/terminal/default.nix +++ b/modules/features/terminal/default.nix @@ -18,10 +18,10 @@ self.nixosModules.helix # file manager - #self.nixosModules.yazi + self.nixosModules.yazi # shell and prompt - #self.nixosModules.fish + self.nixosModules.fish # system monitor self.nixosModules.btop diff --git a/modules/features/terminal/fish.nix b/modules/features/terminal/fish.nix new file mode 100644 index 0000000..eaad6ba --- /dev/null +++ b/modules/features/terminal/fish.nix @@ -0,0 +1,82 @@ +{ self, inputs, ... }: + +{ + + # defines a custom fish module + flake.modules.nixos.fish = { pkgs, ... }: { + + # for home manager functionality + imports = [ inputs.home-manager.nixosModules.home-manager ]; + + # home manager options + home-manager.users.serenity = { + + # program settings + programs = { + + # starship prompt + starship = { + enable = true; + }; + + # fish shell + fish = { + + # enables fish + enable = true; + + # shell initialisation + loginShellInit = ""; + interactiveShellInit = ""; + + # fish plugins + plugins = [ + + { + name = "done"; + src = pkgs.fishPlugins.done.src; + } + + { + name = "puffer"; + src = pkgs.fishPlugins.puffer.src; + } + + { + name = "autopair"; + src = pkgs.fishPlugins.autopair.src; + } + ]; + + # command aliases & abbreviations + shellAbbrs = { + nv = "hx"; + nvim = "hx"; + trc = "tree -C"; + }; + shellAliases = { + rbu "sudo systemctl reboot --firmware-setup"; + }; + + # fish functions + functions = { + + # foo + foo = '' + if bar + printf 'foo' + else + echo loser + end + ''; + }; + + }; + + }; + + }; + + }; + +} diff --git a/modules/features/terminal/git.nix b/modules/features/terminal/git.nix index 6de6c1e..646a5b3 100644 --- a/modules/features/terminal/git.nix +++ b/modules/features/terminal/git.nix @@ -2,7 +2,7 @@ { - # git module declaration + # defines a custom git module flake.modules.nixos.git = { ... }: { # for home manager functionality diff --git a/modules/features/terminal/kitty.nix b/modules/features/terminal/kitty.nix index da245b5..28adb89 100644 --- a/modules/features/terminal/kitty.nix +++ b/modules/features/terminal/kitty.nix @@ -3,85 +3,82 @@ { # defines a custom kitty module - flake.nixosModules.kitty = - { pkgs, ... }: + flake.nixosModules.kitty = { pkgs, ... }: { - { + # needed for home manager functionality + imports = [ inputs.home-manager.nixosModules.home-manager ]; - # needed for home manager functionality - imports = [ inputs.home-manager.nixosModules.home-manager ]; + # home manager options + home-manager.users.serenity = { - # home manager options - home-manager.users.serenity = { + # packages to include + home.packages = with pkgs; [ + kitty + ]; - # packages to include - home.packages = with pkgs; [ - kitty - ]; + # cli fuzzy finder + programs.fzf = { + enable = true; + enableFishIntegration = true; + }; - # cli fuzzy finder - programs.fzf = { - enable = true; - enableFishIntegration = true; + programs.kitty = { + + # enables kitty + enable = true; + + # kitty integrations + enableGitIntegration = true; + shellIntegration.enableFishIntegration = true; + + # font settings + font = { + name = "spleen 32x64"; + size = 12; }; - programs.kitty = { + # kitty settings + 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; - # kitty settings - settings = { + # 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; - # 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 - - }; - - # misecellaneous kitty config - extraConfig = '' - window_padding_width 0 20 - ''; + # Colours + # NOT YET IMPLEMENTED }; + # misecellaneous kitty config + extraConfig = '' + window_padding_width 0 20 + ''; + }; }; + }; + } diff --git a/modules/features/terminal/yazi.nix b/modules/features/terminal/yazi.nix new file mode 100644 index 0000000..5f95c5d --- /dev/null +++ b/modules/features/terminal/yazi.nix @@ -0,0 +1,44 @@ +{ self, inputs, ... }: + +{ + + # yazi module declaration + flake.modules.nixos.yazi = { ... }: { + + # for home manager functionality + imports = [ inputs.home-manager.nixosModules.home-manager ]; + + # home manager options + home-manager.users.serenity = { + + # yazi settings + programs = { + + yazi = { + + # enables yazi + enable = true; + + # shell integration + shellWrapperName = "y"; + enableFishIntegration = true; + + # yazi settings + settings.log.enabled = false; + manager = { + show_hidden = true; + linemode = "none"; + sort_by = "mtime"; + sort_reverse = false; + sort_dir_first = true; + }; + + }; + + }; + + }; + + }; + +}