diff --git a/users/clover/configuration.nix b/users/clover/configuration.nix index 103b011a987ed79def16b4bae7aef256192e681d..a02a361b99dede3b63eeef4c137f3f6e12e9e63e 100644 --- a/users/clover/configuration.nix +++ b/users/clover/configuration.nix @@ -17,6 +17,14 @@ ]; }; + homebrew = { + enable = true; + casks = [ + "db-browser-for-sqlite" + "alt-tab" + ]; + }; + # system preferences system.defaults = { NSGlobalDomain = { diff --git a/users/clover/home.nix b/users/clover/home.nix index 4f799cb1e39b41021b6abfc173356266bfab50b0..bf3d6838a0719a93f9c88a12d087b6345d6b36cd 100644 --- a/users/clover/home.nix +++ b/users/clover/home.nix @@ -18,7 +18,6 @@ in ]; # packages to install for desktop environments (non-server) desktop = [ - git-town lazygit jjui ]; @@ -30,7 +29,6 @@ in ]; # packages to install on linux desktops linux = [ - reaper # TODO: why does this break on macOS ]; in all ++ (if host.darwin then darwin else linux) ++ (if hostServer then server else desktop); @@ -66,7 +64,9 @@ in g = "git status"; gp = "git pull --rebase && git push"; }; - profileExtra = '' + initContent = '' + export PS1="%{$(tput setaf 207)%}%m%{$(tput setaf 15)%}:%{$(tput setaf 87)%}%~ %{$(tput sgr0)%}$ " + function python() { dirname=$(dirname $1 2>/dev/null) if [ -z "$dirname" ]; then @@ -148,10 +148,10 @@ in }; # ui.graph.style = "square"; revsets = { - log = "ancestors(description(regex:\"^(WIP:|\\\\s*$)\"), 3) | ancestors(immutable_heads(), 2) | ancestors(visible_heads(), 2)"; + log = "ancestors(description(regex:\"^(WIP:|\\\\s+$)\"):: | working_copies() | bookmarks(\"master\")::remote_bookmarks(\"master\") | bookmarks(glob:\"clo/*\")::, 5)"; short-prefixes = "(trunk()..@)::"; }; - templates.log = "hl_wip(self)"; + # templates.log = "hl_wip(self)"; template-aliases = { # log template, highlighting the WIP commits by making everything else faded out @@ -269,6 +269,9 @@ in ssh = { enable = true; + extraConfig = '' + SetEnv TERM=xterm-color + ''; matchBlocks = rec { zenith = { user = "clo"; diff --git a/users/clover/paperback/configuration.nix b/users/clover/paperback/configuration.nix index 33d6590bbae174414152184a49ac07e49f4204a8..87a13d7f8638f6a81a6931539129b22e07a0512c 100644 --- a/users/clover/paperback/configuration.nix +++ b/users/clover/paperback/configuration.nix @@ -1,8 +1,2 @@ _: { - homebrew = { - enable = true; - casks = [ - "db-browser-for-sqlite" - ]; - }; }