From 926a90ebbca48cbacc4a1f9cc8b43390a981d804 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 21 Feb 2025 10:34:40 +0100 Subject: [PATCH 01/10] chore(morty): install zellij --- hosts/morty/home-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/morty/home-config.nix b/hosts/morty/home-config.nix index c5bd59f..1aeab52 100644 --- a/hosts/morty/home-config.nix +++ b/hosts/morty/home-config.nix @@ -15,6 +15,7 @@ starship.enable = true; utils.enable = true; vifm.enable = true; + zellij.enable = true; zsh.enable = true; }; video = { From 82483fc0f98e27c489194e38decfabdbbf73acbc Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Sat, 22 Feb 2025 13:46:39 +0100 Subject: [PATCH 02/10] chore: rework sway keybindings --- .../desktop/sway/includes/sway.nix | 178 +++++++++--------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/modules/home-manager/desktop/sway/includes/sway.nix b/modules/home-manager/desktop/sway/includes/sway.nix index 9439f57..2592711 100644 --- a/modules/home-manager/desktop/sway/includes/sway.nix +++ b/modules/home-manager/desktop/sway/includes/sway.nix @@ -37,126 +37,126 @@ in left down up right terminal; in { - "${mod}+1" = "workspace $ws1"; - "${mod}+Shift+1" = "move container to workspace $ws1"; - "${mod}+2" = "workspace $ws2"; - "${mod}+Shift+2" = "move container to workspace $ws2"; - "${mod}+3" = "workspace $ws3"; - "${mod}+Shift+3" = "move container to workspace $ws3"; - "${mod}+4" = "workspace $ws4"; - "${mod}+Shift+4" = "move container to workspace $ws4"; - "${mod}+5" = "workspace $ws5"; - "${mod}+Shift+5" = "move container to workspace $ws5"; - "${mod}+6" = "workspace $ws6"; - "${mod}+Shift+6" = "move container to workspace $ws6"; - "${mod}+7" = "workspace $ws7"; - "${mod}+Shift+7" = "move container to workspace $ws7"; - "${mod}+8" = "workspace $ws8"; - "${mod}+Shift+8" = "move container to workspace $ws8"; - "${mod}+9" = "workspace $ws9"; - "${mod}+Shift+9" = "move container to workspace $ws9"; - "${mod}+0" = "workspace $ws0"; - "${mod}+Shift+0" = "move container to workspace $ws0"; - "${mod}+Return" = "exec ${terminal}"; - "${mod}+Shift+q" = "kill"; - "${mod}+d" = "exec ${pkgs.fuzzel}/bin/fuzzel"; - "${mod}+Shift+c" = "reload"; + # navigate only with direction or workspace + "${mod}+${left}" = "focus left"; + "${mod}+${down}" = "focus down"; + "${mod}+${up}" = "focus up"; + "${mod}+${right}" = " focus right"; + "${mod}+1" = "workspace $ws1"; + "${mod}+2" = "workspace $ws2"; + "${mod}+3" = "workspace $ws3"; + "${mod}+4" = "workspace $ws4"; + "${mod}+5" = "workspace $ws5"; + "${mod}+6" = "workspace $ws6"; + "${mod}+7" = "workspace $ws7"; + "${mod}+8" = "workspace $ws8"; + "${mod}+9" = "workspace $ws9"; + "${mod}+0" = "workspace $ws0"; + # move with Shift and direction + "${mod}+Shift+${left}" = "move left"; + "${mod}+Shift+${down}" = "move down"; + "${mod}+Shift+${up} move" = "move up"; + "${mod}+Shift+${right} move" = "move right"; + "${mod}+Shift+1" = "move container to workspace $ws1"; + "${mod}+Shift+2" = "move container to workspace $ws2"; + "${mod}+Shift+3" = "move container to workspace $ws3"; + "${mod}+Shift+4" = "move container to workspace $ws4"; + "${mod}+Shift+5" = "move container to workspace $ws5"; + "${mod}+Shift+6" = "move container to workspace $ws6"; + "${mod}+Shift+7" = "move container to workspace $ws7"; + "${mod}+Shift+8" = "move container to workspace $ws8"; + "${mod}+Shift+9" = "move container to workspace $ws9"; + "${mod}+Shift+0" = "move container to workspace $ws0"; + "${mod}+Ctrl+${right}" = "move workspace to output right"; + "${mod}+Ctrl+${left}" = "move workspace to output left"; + "${mod}+Return" = "exec ${terminal}"; + "${mod}+d" = "exec ${pkgs.fuzzel}/bin/fuzzel"; + # manage windows manager actions with Alt + "${mod}+Alt+k" = "kill"; + "${mod}+Alt+c" = "reload"; + "${mod}+Alt+Backspace" = "exec swaynag -t warning -m 'Exit sway?' -B 'Yes' 'swaymsg exit'"; "${mod}+Alt+l" = "exec ${pkgs.swaylock}/bin/swaylock"; - "${mod}+${left} focus" = "left"; - "${mod}+${down} focus" = "down"; - "${mod}+${up} focus" = "up"; - "${mod}+${right} focus" = "right"; - "${mod}+Left" = "focus left"; - "${mod}+Down" = "focus down"; - "${mod}+Up" = "focus up"; - "${mod}+Right" = "focus right"; - "${mod}+Shift+${left} move" = "left"; - "${mod}+Shift+${down} move" = "down"; - "${mod}+Shift+${up} move" = "up"; - "${mod}+Shift+${right} move" = "right"; - "${mod}+Shift+Left" = "move left"; - "${mod}+Shift+Down" = "move down"; - "${mod}+Shift+Up" = "move up"; - "${mod}+Shift+Right" = "move right"; - "${mod}+b" = "splith"; - "${mod}+v" = "splitv"; - "${mod}+s" = "layout stacking"; - "${mod}+w" = "layout tabbed"; - "${mod}+e" = "layout toggle split"; - "${mod}+f" = "fullscreen"; - "${mod}+Shift+space" = "floating toggle"; - "${mod}+space" = "focus mode_toggle"; - "${mod}+a" = "focus parent"; - "${mod}+Shift+p" = "move scratchpad"; - "${mod}+p" = "scratchpad show"; + # Manage windows placement + "${mod}+b" = "splith"; + "${mod}+v" = "splitv"; + "${mod}+s" = "layout stacking"; + "${mod}+w" = "layout tabbed"; + "${mod}+e" = "layout toggle split"; + "${mod}+f" = "fullscreen"; + "${mod}+Shift+space" = "floating toggle"; + "${mod}+space" = "focus mode_toggle"; + "${mod}+a" = "focus parent"; + "${mod}+Shift+p" = "move scratchpad"; + "${mod}+p" = "scratchpad show"; + # Media stuff "${mod}+F1" = "exec ${pkgs.brightnessctl}/bin/brightnessctl s 1%-"; "${mod}+F2" = "exec ${pkgs.brightnessctl}/bin/brightnessctl s +1%"; - "${mod}+F3" = "exec ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_SINK@ 5%-"; - "${mod}+F4" = "exec ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_SINK@ 5%+"; - "${mod}+F5" = "exec ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_SINK@ toggle"; - "${mod}+m" = "exec ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_SOURCE@ toggle"; + "${mod}+F3" = "exec ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_SINK@ 5%-"; + "${mod}+F4" = "exec ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_SINK@ 5%+"; + "${mod}+F5" = "exec ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_SINK@ toggle"; + "${mod}+m" = "exec ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_SOURCE@ toggle"; "${mod}+r" = "mode resize"; - "${mod}+n" = "exec makoctl dismiss"; - "${mod}+shift+n" = "exec makoctl dismiss -a"; - "${mod}+alt+n" = "mode notification"; + "${mod}+n" = "exec makoctl dismiss"; + "${mod}+shift+n" = "exec makoctl dismiss -a"; + "${mod}+alt+n" = "mode notification"; }; - modes = + modes = let inherit (config.wayland.windowManager.sway.config) left down up right; in { "resize" = { - "${left}" = "resize shrink width 10 px or 10 ppt"; - "${down}" = "resize grow height 10 px or 10 ppt"; - "${up}" = "resize shrink height 10 px or 10 ppt"; - "${right}" = "resize grow width 10 px or 10 ppt"; - "Return" = "mode default"; + "${left}" = "resize shrink width 10 px or 10 ppt"; + "${down}" = "resize grow height 10 px or 10 ppt"; + "${up}" = "resize shrink height 10 px or 10 ppt"; + "${right}" = "resize grow width 10 px or 10 ppt"; + "Return" = "mode default"; "Escape" = "mode default"; }; "notification" = { - "r" = "exec ${pkgs.mako}/bin/makoctl restore"; - "Escape" = "mode default"; + "r" = "exec ${pkgs.mako}/bin/makoctl restore"; + "Escape" = "mode default"; }; }; colors = { - focused = { - border = "#f268b3"; - background = "#f268b3"; - text = "#000000"; - indicator = "#1cd180"; + focused = { + border = "#f268b3"; + background = "#f268b3"; + text = "#000000"; + indicator = "#1cd180"; childBorder = "#f268b3"; }; - focusedInactive = { - border = "#323232"; - background = "#323232"; - text = "#f268b3"; - indicator = "#1cd180"; + focusedInactive = { + border = "#323232"; + background = "#323232"; + text = "#f268b3"; + indicator = "#1cd180"; childBorder = "#323232"; }; - unfocused = { - border = "#323232"; - background = "#323232"; - text = "#cccccc"; - indicator = "#1cd180"; + unfocused = { + border = "#323232"; + background = "#323232"; + text = "#cccccc"; + indicator = "#1cd180"; childBorder = "#323232"; }; urgent = { - border = "#2f343a"; - background = "#900000"; - text = "#cccccc"; - indicator = "#900000"; + border = "#2f343a"; + background = "#900000"; + text = "#cccccc"; + indicator = "#900000"; childBorder = "#900000" ; }; - #focused_tab_title = { - # boder = "#2f343a"; + #focused_tab_title = { + # boder = "#2f343a"; # background = "#2f343a"; - # text = "#ffffff"; + # text = "#ffffff"; #}; }; window = { border = 1; titlebar = false; - commands = [ + commands = [ { command = "inhibit_idle fullscreen"; criteria = { From a625471f8af2d6a1afdf4915abd86f4bdb48e2fb Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 24 Feb 2025 00:56:56 +0100 Subject: [PATCH 03/10] feat(home-manager): add tmux module --- hosts/luci/home-config.nix | 1 + modules/home-manager/cli/tmux/default.nix | 67 +++++++++++++++++++++++ modules/home-manager/default.nix | 1 + 3 files changed, 69 insertions(+) create mode 100644 modules/home-manager/cli/tmux/default.nix diff --git a/hosts/luci/home-config.nix b/hosts/luci/home-config.nix index 02d98b1..7b9558f 100644 --- a/hosts/luci/home-config.nix +++ b/hosts/luci/home-config.nix @@ -12,6 +12,7 @@ git.enable = true; neovim.enable = true; starship.enable = true; + tmux.enable = true; utils.enable = true; vifm.enable = true; zellij.enable = true; diff --git a/modules/home-manager/cli/tmux/default.nix b/modules/home-manager/cli/tmux/default.nix new file mode 100644 index 0000000..c52da09 --- /dev/null +++ b/modules/home-manager/cli/tmux/default.nix @@ -0,0 +1,67 @@ + +{ lib, config, pkgs, ... }: +with lib; +let + cfg = config.modules.cli.tmux; +in +{ + options.modules.cli.tmux = { + enable = mkEnableOption "enable Tmux"; + }; + config = mkIf cfg.enable { + programs.tmux = { + enable = true; + aggressiveResize = true; + baseIndex = 1; + customPaneNavigationAndResize = false; + escapeTime = 0; + focusEvents = true; + keyMode = "vi"; + mouse = true; + prefix = "C-a"; + terminal = "tmux-256color"; + extraConfig = '' + + bind -n -N "Select pane to the left of the active pane" M-h select-pane -L + bind -n -N "Select pane below the active pane" M-j select-pane -D + bind -n -N "Select pane above the active pane" M-k select-pane -U + bind -n -N "Select pane to the right of the active pane" M-l select-pane -R + + bind -n -r -N "Resize the pane left by 5" M-H resize-pane -L 5 + bind -n -r -N "Resize the pane down by 5" M-J resize-pane -D 5 + bind -n -r -N "Resize the pane up by 5" M-K resize-pane -U 5 + bind -n -r -N "Resize the pane right by 5" M-L resize-pane -R 5 + bind -n -n M-n split-window -h -c "#{pane_current_path}" + bind -n -n M-N split-window -v -c "#{pane_current_path}" + + # Theme + set -g status-interval 2 + setw -g automatic-rename on # rename window to reflect current program + set -g renumber-windows on # renumber windows when a window is closed + set -g set-titles on + set -g mode-style bg=colour10,fg=colour13 + set -g set-titles-string "#T" + set -g status-bg colour0 + set -g status-fg colour7 + set -g message-style bg=colour10,fg=colour7 + + setw -g window-status-current-format '#[fg=colour10,bg=colour3] #I\ + #[bg=colour10,fg=colour7,bold] #W\ + #{?window_active,󰎂 ,}#{?window_marked_flag,󰃃 ,}#{?window_activity_flag, ,}#{?window_silence_flag,󰝟 ,}#{?window_zoomed_flag,󱀅 ,}#{?window_bell_flag,#[fg=colour1]󱈸 ,}' + + set -g pane-border-style fg=colour11 + set -g pane-active-border-style fg=colour4 + + setw -g window-status-format '#[bg=color4,fg=colour10] #I\ + #[bg=colour10,fg=colour12] #W\ + #{?window_last_flag, ,}#{?window_marked_flag,󰃃 ,}#{?window_activity_flag, ,}#{?window_silence_flag,󰝟 ,}#{?window_zoomed_flag,󱀅 ,}#{?window_bell_flag,#[fg=colour1]󱈸 ,}' + set -g status-left "#[bg=colour0, fg=colour6]  #S " + set -g status-right "" + ''; + plugins = with pkgs; [ + tmuxPlugins.tmux-fzf + ]; + }; + }; +} + diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 6cd1619..8ca3f0b 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -11,6 +11,7 @@ ./cli/git ./cli/neovim ./cli/starship + ./cli/tmux ./cli/utils ./cli/vifm ./cli/zellij From 50ce6cfdec7a2db5573754b840833f4c7f716f7d Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Mon, 24 Feb 2025 00:57:35 +0100 Subject: [PATCH 04/10] fix(sway): inccorect statements for mouvments keybindings --- modules/home-manager/desktop/sway/includes/sway.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/home-manager/desktop/sway/includes/sway.nix b/modules/home-manager/desktop/sway/includes/sway.nix index 2592711..b94019e 100644 --- a/modules/home-manager/desktop/sway/includes/sway.nix +++ b/modules/home-manager/desktop/sway/includes/sway.nix @@ -55,8 +55,8 @@ in # move with Shift and direction "${mod}+Shift+${left}" = "move left"; "${mod}+Shift+${down}" = "move down"; - "${mod}+Shift+${up} move" = "move up"; - "${mod}+Shift+${right} move" = "move right"; + "${mod}+Shift+${up}" = "move up"; + "${mod}+Shift+${right}" = "move right"; "${mod}+Shift+1" = "move container to workspace $ws1"; "${mod}+Shift+2" = "move container to workspace $ws2"; "${mod}+Shift+3" = "move container to workspace $ws3"; From e7732df16a79127c80a6efcbfbe36495e1c993bc Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Thu, 27 Feb 2025 01:01:42 +0100 Subject: [PATCH 05/10] chore(neovim): rework yaml lsp configurations --- .../cli/neovim/files/lspconfig.lua | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/modules/home-manager/cli/neovim/files/lspconfig.lua b/modules/home-manager/cli/neovim/files/lspconfig.lua index 8cfd4ba..8a08268 100644 --- a/modules/home-manager/cli/neovim/files/lspconfig.lua +++ b/modules/home-manager/cli/neovim/files/lspconfig.lua @@ -19,14 +19,14 @@ local schemas = {} local kubernetes = "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/refs/heads/master/v1.29.6-standalone-strict/all.json" local flux2 = "https://raw.githubusercontent.com/fluxcd-community/flux2-schemas/refs/heads/main/all.json" -local gitlab = "https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json" +local gitlab_ci = "https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json" local taskfile = "https://taskfile.dev/schema.json" local podmonitor = "https://raw.githubusercontent.com/datreeio/CRDs-catalog/refs/heads/main/monitoring.coreos.com/podmonitor_v1.json" local servicemonitor = "https://raw.githubusercontent.com/datreeio/CRDs-catalog/refs/heads/main/monitoring.coreos.com/servicemonitor_v1.json" local prometheus = "https://raw.githubusercontent.com/datreeio/CRDs-catalog/refs/heads/main/monitoring.coreos.com/prometheus_v1.json" local ingress = "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/refs/heads/master/v1.30.1/ingress-networking-v1.json" -local lefthook = "https://json.schemastore.org/lefthook.json" -local github = "https://json.schemastore.org/github-workflow.json" +local lefthook = "https://raw.githubusercontent.com/evilmartians/lefthook/refs/heads/master/schema.json" +local github_workflow = "https://json.schemastore.org/github-workflow.json" schemas[kubernetes] = { "templates/*deployment.yaml", @@ -131,13 +131,14 @@ lspconfig.tflint.setup{ local cfg = require("yaml-companion").setup({ schemas = { { name = "Flux2", uri = flux2 }, - { name = "Gitlab", uri = gitlab }, + { name = "Gitlab", uri = gitlab_ci }, { name = "Taskfile", uri = taskfile }, { name = "PodMonitor", uri = podmonitor }, { name = "ServiceMonitor", uri = servicemonitor }, { name = "Prometheus", uri = prometheus }, { name = "Kubernetes", uri = kubernetes }, { name = "Lefthook", uri = lefthook }, + { name = "Github Workflow", uri = github_workflow}, }, lspconfig = { capabilities = capabilities, @@ -149,32 +150,33 @@ local cfg = require("yaml-companion").setup({ "gotk-sync.yaml", "gotk-*.yaml", }, - [gitlab] = { + [gitlab_ci] = { "ci/*.{yaml,yml}", ".gitlab/**/*.{yaml,yml}", ".gitlab-ci.{yaml,yml}", }, [taskfile] = { - "**/Taskfile*.{yaml,yml}", + "Taskfile*.{yaml,yml}", + "taskfile*.{yaml,yml}", "taskfiles/**/*.{yaml,yml}", }, [podmonitor] = { - "*podmonitor*.{yaml,yml}" + "*podmonitor*.{yaml,yml}", }, [servicemonitor] = { - "*servicemonitor*.{yaml,yml}" + "*servicemonitor*.{yaml,yml}", }, [prometheus] = { - "*prometheus*.{yaml,yml}" + "*prometheus*.{yaml,yml}", }, [ingress] = { - "*ingress*.{yaml,yml}" + "*ingress*.{yaml,yml}", }, [lefthook] = { - "**/lefthook.*" + "lefthook.{yaml,yml}", }, - [github] = { - ".github/workflow/**/*.{yaml,yml}" + [github_workflow] = { + ".github/workflow/**/*.{yaml,yml}", } }, }, From 529eaa5dab35c364e04b758eb1624fc45ca3c9d1 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Wed, 5 Mar 2025 00:56:12 +0100 Subject: [PATCH 06/10] chore(zsh): update configuration * Remove useless plugins * load base16 theme at startup --- modules/home-manager/cli/zsh/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix index 69ce68c..f8e5977 100644 --- a/modules/home-manager/cli/zsh/default.nix +++ b/modules/home-manager/cli/zsh/default.nix @@ -88,6 +88,7 @@ in } precmd_functions+=(zle-keymap-select) zle -N zle-keymap-select + base16_default-dark ''; completionInit = '' autoload -Uz compinit @@ -105,15 +106,6 @@ in rev = "588691ba71b47e75793ed9edfcfaa058326a6f41"; hash = "sha256-X89FsG9QICDw3jZvOCB/KsPBVOLUeE7xN3VCtf0DD3E="; }; - } - { - name = "history-search-multi-word"; - src = pkgs.fetchFromGitHub { - owner = "zdharma-continuum"; - repo = "history-search-multi-word"; - rev = "c4dcddc1cd17e7e0909471703f3526170db0f475"; - hash = "sha256-KgKm9qzFnwXDXwmTruPgC0tjmiTY5AiGdrWW4zDWUF4="; - }; }]; localVariables = { BASE16_THEME = "$HOME/.config/zsh/plugins/base16"; From 4881b34fa63e655cddc569c88d26014390644afd Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Wed, 5 Mar 2025 00:58:05 +0100 Subject: [PATCH 07/10] fix(tmux): bad colors on hosts with base16 theme loaded --- modules/home-manager/cli/tmux/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/home-manager/cli/tmux/default.nix b/modules/home-manager/cli/tmux/default.nix index c52da09..3a9ed4c 100644 --- a/modules/home-manager/cli/tmux/default.nix +++ b/modules/home-manager/cli/tmux/default.nix @@ -43,17 +43,17 @@ in set -g set-titles-string "#T" set -g status-bg colour0 set -g status-fg colour7 - set -g message-style bg=colour10,fg=colour7 + set -g message-style bg=colour19,fg=colour7 - setw -g window-status-current-format '#[fg=colour10,bg=colour3] #I\ - #[bg=colour10,fg=colour7,bold] #W\ + setw -g window-status-current-format '#[fg=colour18,bg=colour11] #I\ + #[bg=colour19,fg=colour7,bold] #W\ #{?window_active,󰎂 ,}#{?window_marked_flag,󰃃 ,}#{?window_activity_flag, ,}#{?window_silence_flag,󰝟 ,}#{?window_zoomed_flag,󱀅 ,}#{?window_bell_flag,#[fg=colour1]󱈸 ,}' - set -g pane-border-style fg=colour11 + set -g pane-border-style fg=colour19 set -g pane-active-border-style fg=colour4 - setw -g window-status-format '#[bg=color4,fg=colour10] #I\ - #[bg=colour10,fg=colour12] #W\ + setw -g window-status-format '#[bg=color12,fg=colour18] #I\ + #[bg=colour19,fg=colour7] #W\ #{?window_last_flag, ,}#{?window_marked_flag,󰃃 ,}#{?window_activity_flag, ,}#{?window_silence_flag,󰝟 ,}#{?window_zoomed_flag,󱀅 ,}#{?window_bell_flag,#[fg=colour1]󱈸 ,}' set -g status-left "#[bg=colour0, fg=colour6]  #S " set -g status-right "" From f00216cfd6c077b6488e6a9dc09d629e78d7e04d Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Wed, 5 Mar 2025 01:05:34 +0100 Subject: [PATCH 08/10] chore(mrmeeseeks): install tmux --- hosts/mrmeeseeks/home-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/mrmeeseeks/home-config.nix b/hosts/mrmeeseeks/home-config.nix index a507446..e180376 100644 --- a/hosts/mrmeeseeks/home-config.nix +++ b/hosts/mrmeeseeks/home-config.nix @@ -11,6 +11,7 @@ git.enable = true; neovim.enable = true; starship.enable = true; + tmux.enable = true; utils.enable = true; vifm.enable = true; zsh.enable = true; From c89cdad98e6b06d6e8e7a64787bcabd755e865bd Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 7 Mar 2025 18:04:59 +0100 Subject: [PATCH 09/10] feat(morty): enable tmux --- hosts/morty/home-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/morty/home-config.nix b/hosts/morty/home-config.nix index 1aeab52..d8708ff 100644 --- a/hosts/morty/home-config.nix +++ b/hosts/morty/home-config.nix @@ -13,6 +13,7 @@ git.enable = true; neovim.enable = true; starship.enable = true; + tmux.enable = true; utils.enable = true; vifm.enable = true; zellij.enable = true; From f00e5b971873f77b0b8022acc0a959c900e5ed6d Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 7 Mar 2025 21:46:47 +0100 Subject: [PATCH 10/10] chore(tmux): update theme --- modules/home-manager/cli/tmux/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/home-manager/cli/tmux/default.nix b/modules/home-manager/cli/tmux/default.nix index 3a9ed4c..160b517 100644 --- a/modules/home-manager/cli/tmux/default.nix +++ b/modules/home-manager/cli/tmux/default.nix @@ -39,7 +39,7 @@ in setw -g automatic-rename on # rename window to reflect current program set -g renumber-windows on # renumber windows when a window is closed set -g set-titles on - set -g mode-style bg=colour10,fg=colour13 + set -g mode-style bg=colour18,fg=colour7 set -g set-titles-string "#T" set -g status-bg colour0 set -g status-fg colour7 @@ -52,8 +52,8 @@ in set -g pane-border-style fg=colour19 set -g pane-active-border-style fg=colour4 - setw -g window-status-format '#[bg=color12,fg=colour18] #I\ - #[bg=colour19,fg=colour7] #W\ + setw -g window-status-format '#[bg=color12,fg=colour19] #I\ + #[bg=colour18,fg=colour7,dim] #W\ #{?window_last_flag, ,}#{?window_marked_flag,󰃃 ,}#{?window_activity_flag, ,}#{?window_silence_flag,󰝟 ,}#{?window_zoomed_flag,󱀅 ,}#{?window_bell_flag,#[fg=colour1]󱈸 ,}' set -g status-left "#[bg=colour0, fg=colour6]  #S " set -g status-right ""