Compare commits

..

No commits in common. "6e9ef448dbd75d222e2da6267b5d045a016153d0" and "55517dba816fc03fe000b35caf695da11c664584" have entirely different histories.

5 changed files with 22 additions and 19 deletions

6
flake.lock generated
View file

@ -61,10 +61,10 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1754945619, "lastModified": 1754865211,
"narHash": "sha256-kcvY8kUakGwUUWvk6mgIbp5Xj2ABsjj0oBcKQ3MtjTM=", "narHash": "sha256-/J6DVTh9f2KXB9N6Dvdf/tZQjkwCzVNxztgNPl2wNVI=",
"ref": "main", "ref": "main",
"rev": "6878e000fef8449ed6d640436a3bc630fa8788b2", "rev": "bb8073a0dc9ac1299e73c4a576bbd9e1314483e6",
"shallow": true, "shallow": true,
"type": "git", "type": "git",
"url": "ssh://git@git.epha.se:24422/ephase/nix-private.git" "url": "ssh://git@git.epha.se:24422/ephase/nix-private.git"

View file

@ -25,10 +25,7 @@
git.enable = true; git.enable = true;
neovim.enable = true; neovim.enable = true;
starship.enable = true; starship.enable = true;
tmux = { tmux.enable = true;
enable = true;
extraConfig = inputs.nix-private.tmux.personal;
};
utils.enable = true; utils.enable = true;
vifm.enable = true; vifm.enable = true;
zellij.enable = true; zellij.enable = true;

View file

@ -1,4 +1,4 @@
{ pkgs, inputs, ... }: { { pkgs, ... }: {
config.modules = { config.modules = {
application = { application = {
zathura.enable = true; zathura.enable = true;
@ -13,8 +13,9 @@
ghq.enable = true; ghq.enable = true;
git = { git = {
enable = true; enable = true;
userEmail = inputs.nix-private.git.work.userEmail; userEmail = "ybarbanneau@sellsy.com";
signingKey = inputs.nix-private.git.work.signingKey; signingKey = "6E1A834E282FBD98B48069444447A19BBEDB8DBA";
signByDefault = true;
}; };
k8s = { k8s = {
enable = true; enable = true;
@ -26,8 +27,12 @@
starship.enable = true; starship.enable = true;
tmux = { tmux = {
enable = true; enable = true;
extraConfig = inputs.nix-private.tmux.work; 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'
'';
}; };
utils.enable = true; utils.enable = true;
vifm.enable = true; vifm.enable = true;
zellij.enable = true; zellij.enable = true;

View file

@ -1,4 +1,4 @@
{ lib, config, pkgs, inputs, ... }: { lib, config, pkgs, ... }:
with lib; with lib;
let let
cfg = config.modules.cli.git; cfg = config.modules.cli.git;
@ -15,19 +15,19 @@ in
userEmail = mkOption { userEmail = mkOption {
type = types.str; type = types.str;
default = inputs.nix-private.git.personal.userEmail; default = "ephase@xieme-art.org";
description = "git email"; description = "git email";
}; };
signingKey = mkOption { signingKey = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = inputs.nix-private.git.personal.signingKey; default = null;
description = "signing key fingerprint"; description = "signing key fingerprint";
}; };
signByDefault = mkOption { signByDefault = mkOption {
type = types.bool; type = types.bool;
default = true; default = false;
description = "activate signing by default"; description = "activate signing by default";
}; };
}; };

View file

@ -1,5 +1,5 @@
{ lib, config, pkgs, inputs, ... }: { lib, config, pkgs, ... }:
with lib; with lib;
let let
cfg = config.modules.cli.tmux; cfg = config.modules.cli.tmux;
@ -51,6 +51,9 @@ 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-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'} 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} # change window with Alt+{1..5}
bind -n -N "Goto window 1" M-1 select-window -T -t 1 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 bind -n -N "Goto window 2" M-2 select-window -T -t 2
@ -83,9 +86,7 @@ in
set -g status-left-length 100 set -g status-left-length 100
set -g status-left '#[bg=colour0, fg=colour6]  #S ' set -g status-left '#[bg=colour0, fg=colour6]  #S '
set -g status-right ' ' set -g status-right ' '
'' '' + cfg.extraConfig;
+ inputs.nix-private.tmux.nix
+ cfg.extraConfig;
plugins = with pkgs; [ plugins = with pkgs; [
tmuxPlugins.tmux-fzf tmuxPlugins.tmux-fzf
]; ];