From 3ed4ccca9e491b2fe8b8eba1b1a5cf9bed1dd377 Mon Sep 17 00:00:00 2001
From: autumn <autumnal.musing@gmail.com>
Date: Mon, 29 Sep 2025 20:53:10 -0600
Subject: [PATCH] mako

---
 home/autumn/home.nix                |  2 +-
 home/autumn/sysconfs/yukigekko.nix  |  3 ++-
 home/packages/mako/mako.nix         | 13 +++++++++++++
 home/packages/river/river.nix       | 10 ++++++++--
 home/packages/spotifyd/spotifyd.nix |  5 +++++
 home/themefiles/cursor.nix          |  1 +
 system/yukigekko/configuration.nix  |  7 +++++--
 7 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 home/packages/mako/mako.nix

diff --git a/home/autumn/home.nix b/home/autumn/home.nix
index 41988ba..98ab4d3 100644
--- a/home/autumn/home.nix
+++ b/home/autumn/home.nix
@@ -12,7 +12,6 @@
       htop
       nerd-fonts.hack
       neofetch
-      spotifyd
       uv
       wev
     ];
@@ -46,6 +45,7 @@
     ../packages/direnv/direnv.nix
     ../packages/git/git.nix
     ../packages/helix/helix.nix
+    ../packages/spotifyd/spotifyd.nix
     ../packages/starship/starship.nix
     ../packages/thunderbird/thunderbird.nix
     ../packages/zoxide/zoxide.nix
diff --git a/home/autumn/sysconfs/yukigekko.nix b/home/autumn/sysconfs/yukigekko.nix
index 61eb39f..756585d 100644
--- a/home/autumn/sysconfs/yukigekko.nix
+++ b/home/autumn/sysconfs/yukigekko.nix
@@ -18,7 +18,8 @@
     # ../../packages/fish/fish.nix
     ../../packages/river/river.nix
     ../../packages/waybar/waybar.nix
-    ../../packages/twmn/twmn.nix
+    # ../../packages/twmn/twmn.nix
+    ../../packages/mako/mako.nix
     ../../packages/fuzzel/fuzzel.nix
   ];
 }
diff --git a/home/packages/mako/mako.nix b/home/packages/mako/mako.nix
new file mode 100644
index 0000000..13bcd0a
--- /dev/null
+++ b/home/packages/mako/mako.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  programs.mako = {
+    enable = true;
+    settings = ''
+      {
+        anchor = "top-center"
+      }
+    '';
+  };
+}
+
diff --git a/home/packages/river/river.nix b/home/packages/river/river.nix
index 84f735b..dbeeac4 100644
--- a/home/packages/river/river.nix
+++ b/home/packages/river/river.nix
@@ -32,7 +32,13 @@ in
         "~/login-wm-setup-2.sh"
       ];
       output-layout = "wideriver";
-      rule-add = "ssd";
+      rule-add = {
+        "-app-id" = {
+          "'twmnd'" = {
+            float = true;
+          };
+        };
+      };
       border-color-urgent = "0xe67e80";
       map = {
         normal = {
@@ -41,7 +47,7 @@ in
           "Super R"      = "spawn fuzzel";
           "Super E"      = "spawn fm";
           "Super B"      = "spawn obsidian";
-          "Super Escape"  = "spawn \"swaylock --screenshots --clock --indicator --indicator-radius 250 --indicator-thickness 12 --effect-blur 7x5 --ring-color 7fbbb3 --line-color d3c6aa --inside-color 2b3339 --separator-color 83c092\"";
+          "Super Escape" = "spawn \"swaylock --screenshots --clock --indicator --indicator-radius 250 --indicator-thickness 12 --effect-blur 7x5 --ring-color 7fbbb3 --line-color d3c6aa --inside-color 2b3339 --separator-color 83c092\"";
 
           # format changes
           "Super U" = "${cmd} \"--layout left\"";
diff --git a/home/packages/spotifyd/spotifyd.nix b/home/packages/spotifyd/spotifyd.nix
index 0cf4a48..1bdc49e 100644
--- a/home/packages/spotifyd/spotifyd.nix
+++ b/home/packages/spotifyd/spotifyd.nix
@@ -5,6 +5,11 @@
     settings = {
       global = {
         device_name = "yukigekko";
+        volume_controller = "volumectl";
+        backend = "pipe";
+        device_type = "computer";
+        use_mpris = true;
+        disable_discovery = true;
       };
     };
   };
diff --git a/home/themefiles/cursor.nix b/home/themefiles/cursor.nix
index 4d815b2..65a634e 100644
--- a/home/themefiles/cursor.nix
+++ b/home/themefiles/cursor.nix
@@ -1,5 +1,6 @@
 {config, pkgs, ...}:
 {
+  home.packages = with pkgs; [oreo-cursors-plus];
   home.pointerCursor = {
     name = "oreo-cursors-plus";
     package = pkgs.oreo-cursors-plus;
diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix
index 5aa412d..82c431d 100644
--- a/system/yukigekko/configuration.nix
+++ b/system/yukigekko/configuration.nix
@@ -20,12 +20,15 @@
       ../packages/sddm/sddm.nix
 
       #flatpaks
-      ../extras/flatpak.nix
+      # ../extras/flatpak.nix
     ];
 
   networking.hostName = "yukigekko"; # Define your hostname.
   networking.networkmanager.enable = true;
-  networking.extraHosts = "10.0.0.217 hoardfrost";
+  networking.extraHosts = ''
+    10.0.0.217 hoardfrost
+    174.63.4.139 frosty
+  '';
 
   services.logind.lidSwitchExternalPower = "ignore";
   services.blueman.enable = true;