ieh

.gitignore

@@ -1,3 +1,3 @@
-*.lock
+flake.lock
 .envrc
 

flake.nix

@@ -3,7 +3,10 @@
   description = "Autumn's multi-system configs";
 
   inputs = {
+    #dev stuff
     pydev.url ="./system/extras/pydev/";
+    currents.url = "github:autumnalmusing/currents/handler";
+    #regular flakes
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
     lix.flake = false;
@@ -24,6 +27,7 @@
     lix,
     home-manager,
     pydev,
+    currents,
     nixos-wsl,
     ...
   }@inputs:

home/autumn/home.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 
 {
   home = {
@@ -6,7 +6,6 @@
     homeDirectory = "/home/autumn";
     stateVersion = "25.11";
     packages = with pkgs; [
-      eza
       fm
       felix
       gnumake
@@ -26,14 +25,13 @@
     htop.enable = true;
     pls = {
       enable = true;
-      enableFishIntegration = true;
+      enableZshIntegration = true;
     };
   };
   nixpkgs.config = {
     alowUnfree = true;
     allowUnfreePredicate = (_: true);
   };
-  # wayland.windowManager.river.enable = true;
   imports = [
 
     ## Themeing
@@ -47,11 +45,17 @@
     ../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
     ../packages/zsh/zsh.nix
     # package bundles
     ./bundles/langs.nix
+
+    ## Development
+    inputs.currents.homeManagerModules.currents
   ];
+
+  services.currents.enable = true;
 }

home/autumn/sysconfs/yukigekko.nix

@@ -15,10 +15,11 @@
     };
   };
   imports = [
-    ../../packages/fish/fish.nix
+    # ../../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
   ];
 }

home/packages/mako/mako.nix

@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+  services.mako = {
+    enable = true;
+    settings = {
+        anchor = "top-center";
+      };
+  };
+}
+

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\"";

home/packages/spotifyd/spotifyd.nix

@@ -0,0 +1,16 @@
+{config, pkgs, ...}:
+{
+  services.spotifyd = {
+    enable = true;
+    settings = {
+      global = {
+        device_name = "yukigekko";
+        volume_controller = "volumectl";
+        backend = "pipe";
+        device_type = "computer";
+        use_mpris = true;
+        disable_discovery = true;
+      };
+    };
+  };
+}

home/packages/starship/starship.toml

@@ -30,9 +30,9 @@ $docker_context\
 [](fg:#83c092 bg:#7fbbb3)\
 $time\
 [](fg:#7fbbb3 bg:#d699B6)\
+$direnv\
 [ ](fg:#d699B6)\
 \n\
-$direnv\
 $status\
 $cmd_duration\
 [ ](fg:#E67380)
@@ -134,8 +134,7 @@ format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)'
 
 [rust]
 symbol = " "
-style = "fg:#434f55 bg:#a7c080 "
+format = '[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )'
-format = '[[ $symbol ($version) ](fg:#434f55 bg:#a7c080 )]($style)'
 
 [ruby]
 symbol = " "
@@ -163,8 +162,8 @@ loaded_msg = "󱥾 "
 unloaded_msg = "󱧴 "
 allowed_msg = "󱥾 "
 not_allowed_msg = "󱧴 "
-style = "fg:#434f55 bg:#E67380"
+style = "fg:#434f55 bg:#d699B6"
-format = '[$loaded_msg$not_loaded_msg$allowed_msg$not_allowed_msg]($style)'
+format = '[ $loaded]($style)'
 
 [time]
 disabled = false

home/packages/waybar/waybar.nix

@@ -17,8 +17,7 @@
           "river/tags"
         ];
         modules-center = [
-          #"river/mode"
+          "custom/currents"
-          # "river/layout"
           "river/window"
         ];
         modules-right = [
@@ -145,20 +144,24 @@
           format-source = "{volume}% ";
           format-source-muted = "";
           format-icons = {
-          headphone = "";
+            headphone = "";
-          hands-free = "";
+            hands-free = "";
-          headset = "";
+            headset = "";
-          phone = "";
+            phone = "";
-          portable = "";
+            portable = "";
-          car = "";
+            car = "";
-          default = ["" "" ""];
+            default = ["" "" ""];
-        on-click = "pavucontrol";
+            on-click = "pavucontrol";
+          };
         };
+          "custom/currents"= {
+            interval= 30;
+            exec= "/home/autumn/.local/bin/currents --output";
+            return-type= "json";
+          };
       };
     };
-  };
       
-      # Waybar styling inspired by the referenced swayhome configuration
     style = ''
       * {
         font-family: "Hack Nerd Font Mono";
@@ -175,7 +178,9 @@
       window#waybar.hidden {
         opacity: 0.2;
       }
-
+      #custom-weather{
+        border-bottom: #a7c080;
+      }
       button {
         box-shadow: inset 0 -3px transparent;
         border: 1px #000000 solid;
@@ -211,7 +216,6 @@
         background-color: #e67e80;
       }
 
-
       #backlight,
       #battery,
       #clock,
@@ -234,22 +238,22 @@
 
       #backlight {
         background-color: transparent;
-        border-bottom: 3px solid #cba6f7;
+        border-bottom: 3px solid #7fbbb3;
       }
 
       #battery {
         background-color: transparent;
-        border-bottom: 3px solid #a6e3a1;
+        border-bottom: 3px solid #a7c080;
       }
 
       #battery.critical.discharging {
-        background-color: #f38ba8;
+        background-color: #e67e80;
-        animation: blink 1s infinite;
+        animation: blink 5s infinite;
       }
 
       #battery.warning.discharging {
-        background-color: #f9e2af;
+        background-color: #dbbc7f;
-        animation: blink 1s infinite;
+        animation: blink 10s infinite;
       }
 
       @keyframes blink {
@@ -260,28 +264,22 @@
 
       #clock {
         background-color: transparent;
-        border-bottom: 3px solid #a6e3a1;
+        border-bottom: 3px solid #a7c080;
       }
 
       #cpu {
         background-color: transparent;
-        border-bottom: 3px solid #cba6f7;
+        border-bottom: 3px solid #7fbbb3;
       }
 
       #memory {
         background-color: transparent;
-        border-bottom: 3px solid #f9e2af;
+        border-bottom: 3px solid #dbbc7f;
-      }
-
-      #mode {
-        color: #ffffff;
-        background-color: #6e3a6d;
-        border-bottom: 3px solid #ffffff;
       }
 
       #network {
         background-color: transparent;
-        border-bottom: 3px solid #a6e3a1;
+        border-bottom: 3px solid #a7c080;
       }
 
       #network.disconnected {
@@ -291,31 +289,27 @@
 
       #pulseaudio {
         background-color: transparent;
-        border-bottom: 3px solid #a6e3a1;
+        border-bottom: 3px solid #7fbbb3;
       }
 
       #pulseaudio.muted {
         background-color: transparent;
-        border-bottom: 3px solid #f38ba8;
+        border-bottom: 3px solid #e67e80;
       }
 
       #temperature {
         background-color: transparent;
-        border-bottom: 3px solid #a6e3a1;
+        border-bottom: 3px solid #a7c080;
       }
 
       #temperature.critical {
         background-color: transparent;
-        border-bottom: 3px solid #f38ba8;
+        border-bottom: 3px solid #e67e80;
       }
 
       #tray {
         background-color: transparent;
-        border-bottom: 3px solid #6e3a6d;
+        border-bottom: 3px solid #7fbbb3;
-      }
-      #power-profiles-daemon {
-        background-color: transparent;
-        border-bottom: 3px solid #94e2d5;
       }
     '';
   };

home/packages/zsh/zsh.nix

@@ -9,10 +9,10 @@
   programs ={
     zsh = {
       enable = true;
-      initContent = lib.mkOrder 1200 ''
+      # initContent = lib.mkOrder 1200 ''
-          eval "$(ssh-agent -s)"
+      #     eval "$(ssh-agent -s)"
-          ssh-add ~/.ssh/id_ed25519
+      #     ssh-add ~/.ssh/id_ed25519
-        '';
+      #   '';
       antidote = {
         enable = true;
         plugins = [

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;

system/wsl-hive/configuration.nix

@@ -17,6 +17,7 @@
   wsl.enable = true;
   wsl.defaultUser = "autumn";
   networking.hostName = "wsl-hive";
+  networking.extraHosts = "10.0.0.217 hoardfrost";
   environment.systemPackages = [pkgs.git];
   programs.zsh.enable = true;
   nix.settings.experimental-features = ["nix-command" "flakes"];

system/yukigekko/configuration.nix

@@ -18,12 +18,20 @@
 
       #system packages
       ../packages/sddm/sddm.nix
+
+      #flatpaks
+      # ../extras/flatpak.nix
     ];
 
   networking.hostName = "yukigekko"; # Define your hostname.
   networking.networkmanager.enable = true;
+  networking.extraHosts = ''
+    10.0.0.217 hoardfrost
+    174.63.4.139 frosty
+  '';
 
   services.logind.lidSwitchExternalPower = "ignore";
+  services.blueman.enable = true;
 
   time.timeZone = "${timezone}";
 

system/yukigekko/hardware-configuration.nix

@@ -33,7 +33,7 @@
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp3s0f1.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
-
+  hardware.bluetooth.enable = true;
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }