diff --git a/config/home.nix b/config/home.nix index ae85194..6d08c9d 100644 --- a/config/home.nix +++ b/config/home.nix @@ -77,6 +77,7 @@ grc catppuccin-cursors.macchiatoGreen xorg.xmodmap + playerctl #Terminal libsixel diff --git a/moduler/common/fish.nix b/moduler/common/fish.nix index 45795ca..578d850 100644 --- a/moduler/common/fish.nix +++ b/moduler/common/fish.nix @@ -16,6 +16,10 @@ name = "autopair"; src = pkgs.fishPlugins.autopair.src; } + { + name = "foreign-env"; + src = pkgs.fishPlugins.foreign-env.src; + } { name = "tide"; src = pkgs.fishPlugins.tide.src; @@ -40,6 +44,7 @@ shellAbbrs = { homec="nvim ~/nix/config/home.nix"; ls="exa -lag --header"; + dev="nix develop --command fish"; }; interactiveShellInit = '' set fish_greeting # Disable greeting diff --git a/moduler/common/kitty.nix b/moduler/common/kitty.nix index 2750ded..93d1548 100644 --- a/moduler/common/kitty.nix +++ b/moduler/common/kitty.nix @@ -2,17 +2,14 @@ { programs.kitty = { enable = true; - font = if myhostname == "desktop" then { + font = if myhostname == "laptop" then { name = "FiraCode Nerd Font"; - size = 18; + size = 24; } else { name = "FiraCode Nerd Font"; - # size = 18; - size = 24; - # size = 30; + size = 18; }; shellIntegration = { - # enableZshIntegration = true; mode = "no-cursor"; }; theme = "Catppuccin-Macchiato"; diff --git a/moduler/common/tmux.nix b/moduler/common/tmux.nix index 6f9c0d9..dcae08b 100644 --- a/moduler/common/tmux.nix +++ b/moduler/common/tmux.nix @@ -1,15 +1,27 @@ -{ pkgs, lib, ... }: +{ lib, config, pkgs, fetchFromGitHub, ... }: { programs.tmux = { enable = true; mouse = true; plugins = with pkgs; [ tmuxPlugins.sensible - tmuxPlugins.tmux-fzf + # tmuxPlugins.tmux-fzf tmuxPlugins.pain-control tmuxPlugins.sessionist - # tmuxPlugins.catppuccin - # tmuxPlugins.weather + { + plugin = tmuxPlugins.dracula; + extraConfig = '' + set -g @dracula-show-battery false + set -g @dracula-show-powerline true + # available plugins: battery, cpu-usage, git, gpu-usage, ram-usage, tmux-ram-usage, network, network-bandwidth, network-ping, ssh-session, attached-clients, network-vpn, weather, time, mpc, spotify-tui, playerctl, kubernetes-context, synchronize-panes + set -g @dracula-plugins 'playerctl git network time' + set -g @dracula-refresh-rate 10 + set -g @dracula-playerctl-format "► {{ artist }} - {{ title }}" + set -g @dracula-show-timezone false + set -g @dracula-military-time true + set -g @dracula-day-month true + ''; + } tmuxPlugins.resurrect tmuxPlugins.continuum ]; @@ -18,30 +30,7 @@ keyMode = "vi"; escapeTime = 0; extraConfig = " - set -g @catppuccin_flavour 'macchiato' - set -g @catppuccin_window_left_separator '█' - set -g @catppuccin_window_right_separator '█ ' - set -g @catppuccin_window_number_position 'right' - set -g @catppuccin_window_middle_separator ' █' - set -g @catppuccin_window_default_fill 'number' - - set -g @catppuccin_window_current_fill 'number' - set -g @catppuccin_window_current_text '#{pane_current_path}' - - set -g @catppuccin_status_left_separator '' - set -g @catppuccin_status_right_separator ' ' - set -g @catppuccin_status_fill 'all' - set -g @catppuccin_status_connect_separator 'yes' - run-shell ${pkgs.tmuxPlugins.catppuccin}/share/tmux-plugins/catppuccin/catppuccin.tmux - run-shell ${pkgs.tmuxPlugins.weather}/share/tmux-plugins/weather/weather.tmux - set -g @catppuccin_status_modules_right 'date_time weather' - set -g @catppuccin_window_number_position 'right' - set -g @continuum-boot 'on' - set -g @continuum-restore 'on' - set -g @resurrect-strategy-nvim 'session' - set -g @resurrect-capture-pane-contents 'on' - set -g @resurrect-processes 'nvim' "; }; }