diff --git a/flake.lock b/flake.lock index ed17213..0932201 100644 --- a/flake.lock +++ b/flake.lock @@ -61,10 +61,10 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1754865211, - "narHash": "sha256-/J6DVTh9f2KXB9N6Dvdf/tZQjkwCzVNxztgNPl2wNVI=", + "lastModified": 1754945619, + "narHash": "sha256-kcvY8kUakGwUUWvk6mgIbp5Xj2ABsjj0oBcKQ3MtjTM=", "ref": "main", - "rev": "bb8073a0dc9ac1299e73c4a576bbd9e1314483e6", + "rev": "6878e000fef8449ed6d640436a3bc630fa8788b2", "shallow": true, "type": "git", "url": "ssh://git@git.epha.se:24422/ephase/nix-private.git" diff --git a/hosts/morty/home-config.nix b/hosts/morty/home-config.nix index ed063e5..ae0d96c 100644 --- a/hosts/morty/home-config.nix +++ b/hosts/morty/home-config.nix @@ -25,7 +25,10 @@ git.enable = true; neovim.enable = true; starship.enable = true; - tmux.enable = true; + tmux = { + enable = true; + extraConfig = inputs.nix-private.tmux.personal; + }; utils.enable = true; vifm.enable = true; zellij.enable = true; diff --git a/hosts/work/home-config.nix b/hosts/work/home-config.nix index aafdbb0..0712e15 100644 --- a/hosts/work/home-config.nix +++ b/hosts/work/home-config.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ pkgs, inputs, ... }: { config.modules = { application = { zathura.enable = true; @@ -13,9 +13,8 @@ ghq.enable = true; git = { enable = true; - userEmail = "ybarbanneau@sellsy.com"; - signingKey = "6E1A834E282FBD98B48069444447A19BBEDB8DBA"; - signByDefault = true; + userEmail = inputs.nix-private.git.work.userEmail; + signingKey = inputs.nix-private.git.work.signingKey; }; k8s = { enable = true; @@ -27,12 +26,8 @@ starship.enable = true; tmux = { enable = true; - extraConfig = '' - bind -n M-F9 run 'create-tmux-session -n quipu -r quipuapp "run:nvim ." repo:quipu-infrastructure neww:quipu-infra p:sellsy hsplit:50 run:k9s repo:charts neww:charts' - bind -n M-F8 run 'create-tmux-session -n verifactu -r verifactu "run:nvim ." repo:verifactu-infrastructure neww:verifactu-infra repo:sellsy hsplit:50 run:k9s repo:charts neww:charts' - ''; + extraConfig = inputs.nix-private.tmux.work; }; - utils.enable = true; vifm.enable = true; zellij.enable = true; diff --git a/modules/home-manager/cli/git/default.nix b/modules/home-manager/cli/git/default.nix index 6b78820..fc1236b 100644 --- a/modules/home-manager/cli/git/default.nix +++ b/modules/home-manager/cli/git/default.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: +{ lib, config, pkgs, inputs, ... }: with lib; let cfg = config.modules.cli.git; @@ -15,19 +15,19 @@ in userEmail = mkOption { type = types.str; - default = "ephase@xieme-art.org"; + default = inputs.nix-private.git.personal.userEmail; description = "git email"; }; signingKey = mkOption { type = types.nullOr types.str; - default = null; + default = inputs.nix-private.git.personal.signingKey; description = "signing key fingerprint"; }; signByDefault = mkOption { type = types.bool; - default = false; + default = true; description = "activate signing by default"; }; }; diff --git a/modules/home-manager/cli/tmux/default.nix b/modules/home-manager/cli/tmux/default.nix index a2748ba..1ff3293 100644 --- a/modules/home-manager/cli/tmux/default.nix +++ b/modules/home-manager/cli/tmux/default.nix @@ -1,5 +1,5 @@ -{ lib, config, pkgs, ... }: +{ lib, config, pkgs, inputs, ... }: with lib; let cfg = config.modules.cli.tmux; @@ -51,9 +51,6 @@ in bind -n M-F3 if 'tmux has-session -t 3' {switch-client -t 3} {display-popup -E -E 'create-tmux-session -i 3'} bind -n M-F4 if 'tmux has-session -t 4' {switch-client -t 4} {display-popup -E -E 'create-tmux-session -i 4'} - # Alt+F10 for launching my Nix project - bind -n M-F10 run 'create-tmux-session -n config -r nix "run:nvim ." vsplit:20' - # change window with Alt+{1..5} bind -n -N "Goto window 1" M-1 select-window -T -t 1 bind -n -N "Goto window 2" M-2 select-window -T -t 2 @@ -86,7 +83,9 @@ in set -g status-left-length 100 set -g status-left '#[bg=colour0, fg=colour6]  #S ' set -g status-right ' ' - '' + cfg.extraConfig; + '' + + inputs.nix-private.tmux.nix + + cfg.extraConfig; plugins = with pkgs; [ tmuxPlugins.tmux-fzf ];