diff --git a/flake.nix b/flake.nix index c11a591..94a6357 100644 --- a/flake.nix +++ b/flake.nix @@ -125,6 +125,7 @@ ./hosts/iso ./shared/caches.nix ./shared/vim.nix + ./shared/tmux.nix ]; }; }; diff --git a/hosts/falkenstein-1/modules/mail/default.nix b/hosts/falkenstein-1/modules/mail/default.nix index 14bcdbf..2aa7042 100644 --- a/hosts/falkenstein-1/modules/mail/default.nix +++ b/hosts/falkenstein-1/modules/mail/default.nix @@ -13,7 +13,7 @@ }; }; - certificateScheme = 3; + certificateScheme = "acme-nginx"; }; services.rspamd.locals."worker-controller.inc".source = config.sops.secrets."rspamd".path; services.nginx.virtualHosts."rspamd.rfive.de" = { diff --git a/shared/default.nix b/shared/default.nix index ea774a0..886bf93 100644 --- a/shared/default.nix +++ b/shared/default.nix @@ -7,6 +7,7 @@ ./gpg.nix ./sops.nix ./vim.nix + ./tmux.nix ./zsh.nix ]; } diff --git a/users/rouven/modules/tmux/default.nix b/shared/tmux.nix similarity index 60% rename from users/rouven/modules/tmux/default.nix rename to shared/tmux.nix index 9145d44..66d7d92 100644 --- a/users/rouven/modules/tmux/default.nix +++ b/shared/tmux.nix @@ -10,16 +10,12 @@ set -g default-shell ${pkgs.zsh}/bin/zsh bind P display-popup set -sg escape-time 10 + set -g @dracula-plugins "git time" + set -g @dracula-show-left-icon session + set -g @dracula-show-powerline true + run-shell ${pkgs.tmuxPlugins.dracula}/share/tmux-plugins/dracula/dracula.tmux ''; plugins = with pkgs.tmuxPlugins; [ - { - plugin = dracula; - extraConfig = '' - set -g @dracula-plugins "git time" - set -g @dracula-show-left-icon session - set -g @dracula-show-powerline true - ''; - } tmux-fzf ]; }; diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix index d9be568..aa0a8ec 100644 --- a/users/rouven/modules/default.nix +++ b/users/rouven/modules/default.nix @@ -11,7 +11,6 @@ ./sops ./spotify ./ssh - ./tmux ./vifm ./theme ./packages.nix diff --git a/users/rouven/modules/git/default.nix b/users/rouven/modules/git/default.nix index 187d4ca..36aef60 100644 --- a/users/rouven/modules/git/default.nix +++ b/users/rouven/modules/git/default.nix @@ -24,7 +24,7 @@ programs.gh = { enable = true; settings = { - editor = "nvim"; + editor = "hx"; git_protocol = "ssh"; }; }; diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index ec69c3b..8524491 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -7,7 +7,7 @@ # better desktop application name. "wpa_gui" kinda sucks postInstall = prev.postInstall + '' - substituteInPlace $out/share/applications/wpa_gui.desktop --replace "Name=wpa_gui" "Name=WPA Supplicant" + substituteInPlace $out/share/applications/wpa_gui.desktop --replace "Name=wpa_gui" "Name=Manage Wifi" ''; })) # manage wifi cinnamon.nemo