feat: add tailscale restart service, make wallpaper declarative, add

music player

home/common/optional/desktop/hyprland/hyprland.nix

@@ -28,6 +28,7 @@
           platforms = platforms.linux;
         };
       })
+      hyprlandPlugins.hyprscrolling
     ];
 
     settings = {
@@ -39,7 +40,7 @@
       "$fileManager" = "${pkgs.uwsm}/bin/uwsm-app -- ${pkgs.pcmanfm}/bin/pcmanfm";
       "$browser" = "${pkgs.uwsm}/bin/uwsm-app -- zen-beta";
       "$menu" = "${pkgs.walker}/bin/walker";
-      "$player" = "${pkgs.playerctl}/bin/playerctl --player=mpd,%any";
+      "$player" = "${pkgs.playerctl}/bin/playerctl";
 
       monitor = [
         "eDP-1,preferred,1721x1080,auto"
@@ -73,7 +74,7 @@
         # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
         allow_tearing = false;
 
-        layout = "dwindle";
+        layout = "scrolling";
       };
 
       decoration = {
@@ -130,9 +131,9 @@
           "layersOut, 1, 1.5, linear, fade"
           "fadeLayersIn, 1, 1.79, almostLinear"
           "fadeLayersOut, 1, 1.39, almostLinear"
-          "workspaces, 1, 1.94, almostLinear, fade"
-          "workspacesIn, 1, 1.21, almostLinear, fade"
-          "workspacesOut, 1, 1.94, almostLinear, fade"
+          "workspaces, 0, 1.94, almostLinear, fade"
+          "workspacesIn, 0, 1.21, almostLinear, fade"
+          "workspacesOut, 0, 1.94, almostLinear, fade"
         ];
       };
 
@@ -199,6 +200,7 @@
         "$mainMod, M, exec, $terminal -e ${pkgs-unstable.gurk-rs}/bin/gurk"
         "$mainMod, P, exec, $terminal -e ${pkgs.ncmpcpp}/bin/ncmpcpp"
         "$mainMod SHIFT, B, exec, $terminal -e \"$EDITOR\" /home/max/bible.txt -R"
+        "$mainMod SHIFT, R, exec, ${pkgs.hyprshot}/bin/hyprshot -m region --clipboard-only"
 
         # "$mainMod, V, togglefloating,"
         "$mainMod, space, exec, $menu"
@@ -315,6 +317,9 @@
 
           border_size = 1.0;
         };
+        hyprscrolling = {
+          fullscreen_on_one_column = true;
+        };
       };
     };
   };

home/common/optional/desktop/hyprland/wallpaper.nix

@@ -1,15 +1,18 @@
 { ... }:
+let
+  wallpaper = builtins.toString ../../../../../assets/wallpaper.jpg;
+in
 {
   services.hyprpaper = {
     enable = true;
     settings = {
       spash = false;
 
-      preload = ["~/Downloads/wallpaper.png"];
+      preload = [ wallpaper ];
 
       wallpaper = [
-        "eDP-1,~/Downloads/wallpaper.png"
-        "HDMI-A-1,~/Downloads/wallpaper.png"
+        "eDP-1,${wallpaper}"
+        "HDMI-A-1,${wallpaper}"
       ];
     };
   };

host/max/default.nix

@@ -6,6 +6,7 @@
     ./user.nix
     ./work.nix
     ./sops.nix
+    ./tailscale.nix
 
     ../common/optional/desktop/hyprland.nix
     ../common/optional/font.nix
@@ -46,8 +47,6 @@
     powerOnBoot = true;
   };
 
-  services.tailscale.enable = true;
-
   environment.variables = {
     XDG_DATA_HOME = "/home/max/.local/share";
     GSK_RENDERER = "ngl";

host/max/home/browser.nix

@@ -52,6 +52,9 @@
         Fingerprinting = true;
       };
 
+
+      # ID's can be collected from this command:
+      # nix run github:tupakkatapa/mozid -- "https://addons.mozilla.org/en-US/firefox/addon/<example>/"
       ExtensionSettings = {
         # The default behaviour of ctrl+click, shift+click, cmd+click (on macOS) and middle-click when clicking on links is to open the link in a new tab (or new window in the case of shift).
         # This behaviour is sometimes broken by silly developers.
@@ -146,6 +149,8 @@
         ublock-origin
         proton-pass
         istilldontcareaboutcookies
+        better-canvas
+        darkreader
       ];
     };
   };

host/max/home/music.nix

@@ -8,12 +8,24 @@
     enable = true;
     musicDirectory = "/home/max/media/music";
 
+    # extraConfig = ''
+    #   audio_output {
+    #     type "pipewire"
+    #     name "pipewire"
+    #   }
+    # '';
+
+
     extraConfig = ''
       audio_output {
-        type "pipewire"
-        name "pipewire"
+        type "alsa"
+        name "My ALSA"
+        mixer_type		"hardware"
+        mixer_device	"default"
+        mixer_control	"PCM"
       }
     '';
+
   };
 
   services.mpd-mpris.enable = true;

host/max/home/terminal.nix

@@ -84,6 +84,7 @@
 
     envExtra = ''
       export PER_DIRECTORY_HISTORY_TOGGLE="^H"
+      export HISTORY_BASE="$HOME/.local/share/directory_history"
     '';
 
     shellAliases = {

host/max/tailscale.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+  services.tailscale.enable = true;
+
+  systemd.services.tailscale-restart = {
+    description = "Restart Tailscale after waking up";
+    after = [ "suspend.target" ];
+    wantedBy = [ "suspend.target" ];
+
+    serviceConfig = {
+      Type = "simple";
+      ExecStart = "${pkgs.systemd}/bin/systemctl restart tailscaled.service";
+    };
+  };
+}
+