home/c/programs/git/default.nix

@@ -34,6 +34,6 @@
       ghq = {root = "~/repos";};
     };
 
-    delta.enable = true;
+    diff-so-fancy.enable = true;
   };
 }

home/c/programs/tmux/bar.patch

@@ -1,24 +0,0 @@
-diff --git a/tmux-onedark-theme.tmux b/tmux-onedark-theme.tmux
-index e440cc7..33ba373 100755
---- a/tmux-onedark-theme.tmux
-+++ b/tmux-onedark-theme.tmux
-@@ -75,14 +75,14 @@ set "status-fg" "$onedark_white"
- set "@prefix_highlight_fg" "$onedark_black"
- set "@prefix_highlight_bg" "$onedark_green"
- set "@prefix_highlight_copy_mode_attr" "fg=$onedark_black,bg=$onedark_green"
--set "@prefix_highlight_output_prefix" "  "
-+set "@prefix_highlight_output_prefix" "  "
- 
- status_widgets=$(get "@onedark_widgets")
- time_format=$(get "@onedark_time_format" "%R")
- date_format=$(get "@onedark_date_format" "%d/%m/%Y")
- 
--set "status-right" "#[fg=$onedark_white,bg=$onedark_black,nounderscore,noitalics]${time_format}  ${date_format} #[fg=$onedark_visual_grey,bg=$onedark_black]#[fg=$onedark_visual_grey,bg=$onedark_visual_grey]#[fg=$onedark_white, bg=$onedark_visual_grey]${status_widgets} #[fg=$onedark_green,bg=$onedark_visual_grey,nobold,nounderscore,noitalics]#[fg=$onedark_black,bg=$onedark_green,bold] #h #[fg=$onedark_yellow, bg=$onedark_green]#[fg=$onedark_red,bg=$onedark_yellow]"
--set "status-left" "#[fg=$onedark_black,bg=$onedark_green,bold] #S #{prefix_highlight}#[fg=$onedark_green,bg=$onedark_black,nobold,nounderscore,noitalics]"
-+set "status-right" "#[fg=$onedark_white,bg=$onedark_black,nounderscore,noitalics]${time_format}  ${date_format} #[fg=$onedark_visual_grey,bg=$onedark_black]#[fg=$onedark_visual_grey,bg=$onedark_visual_grey]#[fg=$onedark_white, bg=$onedark_visual_grey]${status_widgets} #[fg=$onedark_green,bg=$onedark_visual_grey,nobold,nounderscore,noitalics]#[fg=$onedark_black,bg=$onedark_green,bold] #h #[fg=$onedark_yellow, bg=$onedark_green]#[fg=$onedark_red,bg=$onedark_yellow]"
-+set "status-left" "#[fg=$onedark_black,bg=$onedark_green,bold] #S #{prefix_highlight}#[fg=$onedark_green,bg=$onedark_black,nobold,nounderscore,noitalics]"
- 
--set "window-status-format" "#[fg=$onedark_black,bg=$onedark_black,nobold,nounderscore,noitalics]#[fg=$onedark_white,bg=$onedark_black] #I  #W #[fg=$onedark_black,bg=$onedark_black,nobold,nounderscore,noitalics]"
--set "window-status-current-format" "#[fg=$onedark_black,bg=$onedark_visual_grey,nobold,nounderscore,noitalics]#[fg=$onedark_white,bg=$onedark_visual_grey,nobold] #I  #W #[fg=$onedark_visual_grey,bg=$onedark_black,nobold,nounderscore,noitalics]"
-+set "window-status-format" "#[fg=$onedark_black,bg=$onedark_black,nobold,nounderscore,noitalics]#[fg=$onedark_white,bg=$onedark_black] #I  #W #[fg=$onedark_black,bg=$onedark_black,nobold,nounderscore,noitalics]"
-+set "window-status-current-format" "#[fg=$onedark_black,bg=$onedark_visual_grey,nobold,nounderscore,noitalics]#[fg=$onedark_white,bg=$onedark_visual_grey,nobold] #I  #W #[fg=$onedark_visual_grey,bg=$onedark_black,nobold,nounderscore,noitalics]"

home/c/programs/tmux/default.nix

@@ -20,15 +20,15 @@ in {
       sensible
       yank
       {
-        plugin = onedark-theme.overrideAttrs (_: {
+        plugin = onedark-theme;
-          patches = [./bar.patch];
-        });
         extraConfig = "\n";
       }
       {
         plugin = resurrect;
         extraConfig = ''
-          set -g @resurrect-capture-pane-contents 'off'
+          set -g @resurrect-strategy-vim 'session'
+          set -g @resurrect-strategy-nvim 'session'
+          set -g @resurrect-capture-pane-contents 'on'
         '';
       }
       {
@@ -62,4 +62,8 @@ in {
       bind -r l select-pane -R
     '';
   };
+
+  # home.packages = [
+  #   pkgs.tmux-sessionizer-cl
+  # ];
 }

hosts/hermes/ddns.nix

@@ -1,13 +0,0 @@
-{config, ...}: {
-  services.cloudflare-dyndns = {
-    enable = true;
-    ipv4 = true;
-    ipv6 = false;
-    proxied = false;
-    deleteMissing = false;
-    domains = [];
-    apiTokenFile = config.age.secrets.cloudflare-api.path;
-  };
-  # services.cloudflare-dyndns.domains = [];
-  age.secrets."cloudflare-api".file = ../../secrets/cloudflare-api.age;
-}

hosts/hermes/default.nix

@@ -2,7 +2,6 @@
   imports = [
     ./hardware-configuration.nix
     ./configuration.nix
-    ./ddns.nix
     ./quassel.nix
     ./fail2ban.nix
     ./containers.nix

hosts/hermes/forgejo.nix

@@ -6,7 +6,6 @@
   domain = "git.cleslie.uk";
 in {
   services = {
-    cloudflare-dyndns.domains = [domain];
     forgejo = {
       enable = true;
       database.type = "postgres";

hosts/hermes/headscale.nix

@@ -13,7 +13,6 @@ in {
         ip_prefixes = "100.64.0.0/10";
       };
     };
-    cloudflare-dyndns.domains = [domain];
     caddy.virtualHosts.${domain}.extraConfig = ''
       reverse_proxy localhost:${toString config.services.headscale.port}
     '';

hosts/hermes/media.nix

@@ -85,8 +85,6 @@ in {
       };
     };
 
-    cloudflare-dyndns.domains = ["media.cleslie.uk" "watch.cleslie.uk" "request.cleslie.uk"];
-
     jellyfin = {
       enable = true;
       package = pkgs.jellyfin;

justfile

@@ -5,7 +5,6 @@ alias r := rebuild
 alias v := vim
 alias u := update
 alias c := cache
-alias d := deploy
 
 rebuild:
 	sudo nixos-rebuild switch --flake .#

secrets/cloudflare-api.age

@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 /RyXeg p2ROUhWiDQDOjALQnhhf566js8ivYTsgwNfCaaoe6yQ
-UnCc2/4lb+PxnrKdAPVqwAyXavFGr8M3NV3+fSSdAU0
--> ssh-ed25519 aSaoJQ hHqpvUCaH5RLAQwTdH1llfF/0aTraXtl25qFDaFhUwk
-+4VMHc3PGR9HBlVTw4anbYORQPgFl24WGF5pwmt7w20
---- qa7ctM764SNg3u/ITk+6DRXbLqF1Lom1xgKysY9DrkE
-ô›Zš¾;Qš
-7î‡kÔ4%ú½#<08>ŸÞåpqÃÅâvìyú]
ièeǺð]
É©i¾Ó!4Ø=ÇsŒä‰<C3A4>JfÉpúH«sæò29½¥œs¯åF}µ‘˪—#ói8ù

secrets/secrets.nix

@@ -10,5 +10,4 @@ in {
   "mesh-conf-infra.age".publicKeys = keys.c ++ allSystems;
   "mesh-conf-cleslie.age".publicKeys = keys.c ++ allSystems;
   "forgejo-password.age".publicKeys = keys.c ++ [systems.hermes];
-  "cloudflare-api.age".publicKeys = keys.c ++ [systems.hermes];
 }