hosts/nixos-laptop/default.nix

@@ -20,8 +20,8 @@
       webis.enable = true;
       impermanence.enable = true;
     };
-    programs.hyprland.enable = true;
-    # programs.river.enable = true;
+    programs.hyprland.enable = false;
+    programs.river.enable = true;
     programs.exercism.enable = true;
   };
 

modules/profiles/base.nix

@@ -249,7 +249,7 @@ in
     parallel
     ripgrep
     vim
-    (viu.override { withSixel = true; })
+    viu
     wget
   ];
 

modules/profiles/impermanence.nix

@@ -54,6 +54,7 @@ in
           ".local/share/nvim"
           ".local/share/zoxide"
           ".local/state/nvim"
+          ".local/state/tofi-history"
           ".mozilla"
           "Documents"
           "Downloads"
@@ -68,7 +69,6 @@ in
           ".local/share/fish/fish_history"
           ".local/share/nix/trusted-settings.json"
           ".parallel/will-cite"
-          ".local/state/tofi-history"
         ];
       };
       users.root = {

modules/programs/foot.nix

@@ -16,6 +16,7 @@ in
       systemd.user.services.foot.Service.Environment = lib.mkForce "PATH=/run/current-system/sw/bin/";
       programs.foot = {
         enable = true;
+        server.enable = true;
         settings = {
           main = {
             term = "xterm-256color";

modules/programs/river/default.nix

@@ -99,30 +99,7 @@ in
 
               # bump in layout stack
               "Super Z" = "zoom";
-
-            } //
-            # tags
-            (
-              let
-                numbers = range 1 9;
-                toTag = num: "$((1 << (${toString num} - 1)))";
-
-                mkMappings = num:
-                  let
-                    numStr = toString num;
-                    tag = toTag num;
-                  in
-                  [
-                    # Super+Control+[1-9] to toggle focus of tag [0-8]
-                    { name = "Super ${numStr}"; value = "toggle-focused-tags ${tag}"; }
-
-                    # Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view
-                    { name = "Super+Shift ${numStr}"; value = "toggle-view-tags ${tag}"; }
-                  ];
-                mappings = flatten (map mkMappings numbers);
-              in
-              listToAttrs mappings
-            );
+            };
           };
           map-pointer = {
             normal = {
@@ -131,19 +108,12 @@ in
               "Super BTN_MIDDLE" = "toggle-float";
             };
           };
-          attach-mode = "bottom";
-          default-layout = "rivercarro";
-          focus-follows-cursor = "normal";
-          hide-cursor = {
-            timeout = "1500";
-            when-typing = "enabled";
-          };
-          set-cursor-warp = "on-focus-change";
         };
         extraConfig = /* bash */ ''
+          riverctl default-layout rivercarro
           rivercarro_pid="$(pidof rivercarro)"
           if [[ -z $rivercarro_pid ]]; then
-            rivercarro -inner-gaps 4 -outer-gaps 4 &
+            rivercarro -inner-gaps 4 -outer-gaps 4
           fi
         '';
       };
@@ -169,11 +139,6 @@ in
             modules-right = [ "network" "memory" "cpu" "battery" "clock" ];
           };
         };
-        style = ''
-          #tags button.focused {
-            color: #ffffff
-          }
-        '';
       };
 
       # lock screen after timeout

modules/programs/wallpaper/default.nix

@@ -8,14 +8,7 @@ let
 
   script = pkgs.writeShellApplication {
     name = "wallpaper";
-    runtimeInputs = with pkgs; [
-      findutils
-      coreutils
-      feh
-      swaybg
-      fzf
-      (viu.override { withSixel = true; })
-    ];
+    runtimeInputs = with pkgs; [ findutils coreutils feh swaybg fzf viu ];
     text = builtins.readFile ./wallpaper.sh;
   };
 in