| ... | @@ -18,7 +18,6 @@ in | ... | @@ -18,7 +18,6 @@ in |
| 18 | ]; | 18 | ]; |
| 19 | # packages to install for desktop environments (non-server) | 19 | # packages to install for desktop environments (non-server) |
| 20 | desktop = [ | 20 | desktop = [ |
| 21 | git-town | | |
| 22 | lazygit | 21 | lazygit |
| 23 | jjui | 22 | jjui |
| 24 | ]; | 23 | ]; |
| ... | @@ -30,7 +29,6 @@ in | ... | @@ -30,7 +29,6 @@ in |
| 30 | ]; | 29 | ]; |
| 31 | # packages to install on linux desktops | 30 | # packages to install on linux desktops |
| 32 | linux = [ | 31 | linux = [ |
| 33 | reaper # TODO: why does this break on macOS | | |
| 34 | ]; | 32 | ]; |
| 35 | in | 33 | in |
| 36 | all ++ (if host.darwin then darwin else linux) ++ (if hostServer then server else desktop); | 34 | all ++ (if host.darwin then darwin else linux) ++ (if hostServer then server else desktop); |
| ... | @@ -66,7 +64,9 @@ in | ... | @@ -66,7 +64,9 @@ in |
| 66 | g = "git status"; | 64 | g = "git status"; |
| 67 | gp = "git pull --rebase && git push"; | 65 | gp = "git pull --rebase && git push"; |
| 68 | }; | 66 | }; |
| 69 | profileExtra = '' | 67 | initContent = '' |
| | 68 | export PS1="%{$(tput setaf 207)%}%m%{$(tput setaf 15)%}:%{$(tput setaf 87)%}%~ %{$(tput sgr0)%}$ " |
| | 69 | |
| 70 | function python() { | 70 | function python() { |
| 71 | dirname=$(dirname $1 2>/dev/null) | 71 | dirname=$(dirname $1 2>/dev/null) |
| 72 | if [ -z "$dirname" ]; then | 72 | if [ -z "$dirname" ]; then |
| ... | @@ -148,10 +148,10 @@ in | ... | @@ -148,10 +148,10 @@ in |
| 148 | }; | 148 | }; |
| 149 | # ui.graph.style = "square"; | 149 | # ui.graph.style = "square"; |
| 150 | revsets = { | 150 | revsets = { |
| 151 | log = "ancestors(description(regex:\"^(WIP:|\\\\s*$)\"), 3) | ancestors(immutable_heads(), 2) | ancestors(visible_heads(), 2)"; | 151 | log = "ancestors(description(regex:\"^(WIP:|\\\\s+$)\"):: | working_copies() | bookmarks(\"master\")::remote_bookmarks(\"master\") | bookmarks(glob:\"clo/*\")::, 5)"; |
| 152 | short-prefixes = "(trunk()..@)::"; | 152 | short-prefixes = "(trunk()..@)::"; |
| 153 | }; | 153 | }; |
| 154 | templates.log = "hl_wip(self)"; | 154 | # templates.log = "hl_wip(self)"; |
| 155 | | 155 | |
| 156 | template-aliases = { | 156 | template-aliases = { |
| 157 | # log template, highlighting the WIP commits by making everything else faded out | 157 | # log template, highlighting the WIP commits by making everything else faded out |
| ... | @@ -269,6 +269,9 @@ in | ... | @@ -269,6 +269,9 @@ in |
| 269 | | 269 | |
| 270 | ssh = { | 270 | ssh = { |
| 271 | enable = true; | 271 | enable = true; |
| | 272 | extraConfig = '' |
| | 273 | SetEnv TERM=xterm-color |
| | 274 | ''; |
| 272 | matchBlocks = rec { | 275 | matchBlocks = rec { |
| 273 | zenith = { | 276 | zenith = { |
| 274 | user = "clo"; | 277 | user = "clo"; |