From 5bfab60b739b775d28518d0995c2785940670086 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Tue, 11 Jun 2024 19:59:58 +0200 Subject: [PATCH] Use tmux --- .envrc | 1 - configuration.nix | 3 ++- home.nix | 46 ++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 42 insertions(+), 8 deletions(-) delete mode 100644 .envrc diff --git a/.envrc b/.envrc deleted file mode 100644 index 620169d..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -PATH_add . diff --git a/configuration.nix b/configuration.nix index 451f90f..366f473 100644 --- a/configuration.nix +++ b/configuration.nix @@ -228,7 +228,8 @@ cursor = { package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; + name = "Bibata-Modern-Classic"; + size = 28; }; fonts = { diff --git a/home.nix b/home.nix index e5b3afe..bce4441 100644 --- a/home.nix +++ b/home.nix @@ -49,7 +49,10 @@ alacritty = { enable = true; - settings.shell.program = lib.getExe config.programs.zsh.package; + settings.shell = { + program = lib.getExe config.programs.tmux.package; + args = [ "attach" ]; + }; }; thunderbird = { @@ -73,6 +76,42 @@ autocd = true; autosuggestion.enable = true; prezto.enable = true; + + shellAliases = + let + gitExe = lib.getExe config.programs.git.package; + in + { + htop = lib.getExe pkgs.btop; + gp = "${gitExe} push"; + gco = "${gitExe} checkout"; + gd = "${gitExe} diff"; + gc = "${gitExe} commit"; + gpl = "${gitExe} pull"; + gb = "${gitExe} branch"; + ga = "${gitExe} add"; + gl = "${gitExe} log"; + gs = "${gitExe} status"; + tf = lib.getExe pkgs.opentofu; + }; + }; + + tmux = { + enable = true; + shell = lib.getExe config.programs.zsh.package; + shortcut = "a"; + clock24 = true; + newSession = true; + mouse = true; + escapeTime = 10; + terminal = "screen-256color"; + + extraConfig = '' + unbind _ + bind _ split-window -h + unbind - + bind - split-window -v + ''; }; ssh = { @@ -103,11 +142,6 @@ commit.verbose = true; pull.rebase = true; }; - - includes = [{ - path = "~/git/suecode/.gitconfig"; - condition = "gitdir:~/git/suecode/**"; - }]; }; # Currently, it is not possible to have Home Manager manage Liberwolf extensions.