update pacckages and uhm other stuff

README.md

@@ -21,6 +21,7 @@ each host should have these files:
   - divide steam and gamemode?
   - hidpi and cursor size option ? mostly auto these days though
   - better theming for hyprlock, rofi, dunst (accent for hyprlock & dunst, variants for rofi)
-  - libinput
   - some way for border radius, border, tranparency theme options
   - tags for pip and popups in hyprland config
+  - remove exec-once stuff and use systemd services instead
+  - gtk cursors are MESSED UP. top priority rn

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728326504,
+        "lastModified": 1731959031,
-        "narHash": "sha256-dQXAj+4d6neY7ldCiH6gNym3upP49PVxRzEPxXlD9Aw=",
+        "narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "65dd97b5d21e917295159bbef1d52e06963f4eb0",
+        "rev": "4468981c1c50999f315baa1508f0e53c4ee70c52",
         "type": "github"
       },
       "original": {
@@ -123,11 +123,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1728729581,
+        "lastModified": 1733861262,
-        "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=",
+        "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806",
+        "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
         "type": "github"
       },
       "original": {
@@ -143,11 +143,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728337164,
+        "lastModified": 1734043726,
-        "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=",
+        "narHash": "sha256-e9YAMReFV1fDPcZLFC2pa4k/8TloSXeX0z2VysNMAoA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "038630363e7de57c36c417fd2f5d7c14773403e4",
+        "rev": "3066cc58f552421a2c5414e78407fa5603405b1e",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727821604,
+        "lastModified": 1728669738,
-        "narHash": "sha256-hNw5J6xatedqytYowx0mJKgctjA4lQARZFdgnzM2RpM=",
+        "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "d60e1e01e6e6633ef1c87148b9137cc1dd39263d",
+        "rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
         "type": "github"
       },
       "original": {
@@ -185,6 +185,64 @@
         "type": "github"
       }
     },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733248371,
+        "narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
+    "hyprgraphics_2": {
+      "inputs": {
+        "hyprutils": [
+          "hyprlock",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprlock",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprlock",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733248371,
+        "narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
     "hypridle": {
       "inputs": {
         "hyprlang": "hyprlang",
@@ -193,11 +251,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1727257269,
+        "lastModified": 1731958956,
-        "narHash": "sha256-b/j875k6RrxQLtbW+NCLw7NLToMd9KDYywjtUoihpq4=",
+        "narHash": "sha256-21R5LD61oUqjdo9Vz0kLn0qSHCDMXyUMXbbod3kX+ho=",
         "owner": "hyprwm",
         "repo": "hypridle",
-        "rev": "cc23f97836adbba1abc8edd48169fb1f1f698c32",
+        "rev": "9f23e70bb494107df8f959c925d4521a298c65eb",
         "type": "github"
       },
       "original": {
@@ -210,7 +268,9 @@
       "inputs": {
         "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
         "hyprland-protocols": "hyprland-protocols",
+        "hyprland-qtutils": "hyprland-qtutils",
         "hyprlang": "hyprlang_2",
         "hyprutils": "hyprutils_2",
         "hyprwayland-scanner": "hyprwayland-scanner",
@@ -220,11 +280,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1728507606,
+        "lastModified": 1734005819,
-        "narHash": "sha256-Bt6aMwB63lmb8SqKLo6hKdi//camzM3KvJ5242gn+gQ=",
+        "narHash": "sha256-CuMZHLveDk6Ouv0l3h86tdCjj3r+h1nj1/s2gEistHI=",
         "ref": "refs/heads/main",
-        "rev": "c4eb1940336cd88ca65ba65582ce104e49dfc7c9",
+        "rev": "aefaeedf5e3f773c923373795267c1633141566c",
-        "revCount": 5324,
+        "revCount": 5535,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -276,6 +336,35 @@
         "type": "github"
       }
     },
+    "hyprland-qtutils": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733472316,
+        "narHash": "sha256-PvXiFLIExJEJj+goLbIuXLTN5CSDSAUsAfiYSdbbWg0=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "rev": "969427419276c7ee170301ef1ebe0f68eb6eb2e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "type": "github"
+      }
+    },
     "hyprlang": {
       "inputs": {
         "hyprutils": [
@@ -365,19 +454,18 @@
     },
     "hyprlock": {
       "inputs": {
+        "hyprgraphics": "hyprgraphics_2",
         "hyprlang": "hyprlang_3",
         "hyprutils": "hyprutils_3",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_4",
-          "nixpkgs"
-        ],
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1728821111,
+        "lastModified": 1733672536,
-        "narHash": "sha256-3dDOBfFkmusoF+6LWXkvQaSfzXb0DEqMEQQvEBbjN9Q=",
+        "narHash": "sha256-bCtJwEmKG114e0y5GDj5fZ24KkgVVunbN9xgCjQa1OQ=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "11694528b4e0af597f25a5308d6872afd0b06807",
+        "rev": "8010b81e7b4100a1f2ef937be5268a13c27987e9",
         "type": "github"
       },
       "original": {
@@ -423,11 +511,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727300645,
+        "lastModified": 1732288281,
-        "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
+        "narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
+        "rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c",
         "type": "github"
       },
       "original": {
@@ -448,11 +536,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727300645,
+        "lastModified": 1733502241,
-        "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
+        "narHash": "sha256-KAUNC4Dgq8WQjYov5auBw/usaHixhacvb7cRDd0AG/k=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
+        "rev": "104117aed6dd68561be38b50f218190aa47f2cd8",
         "type": "github"
       },
       "original": {
@@ -538,11 +626,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1720386169,
+        "lastModified": 1730741070,
-        "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
+        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
+        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
         "type": "github"
       },
       "original": {
@@ -570,11 +658,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1728241625,
+        "lastModified": 1733392399,
-        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
+        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
+        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
         "type": "github"
       },
       "original": {
@@ -586,11 +674,27 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1728241625,
+        "lastModified": 1733392399,
-        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
+        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1733759999,
+        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
+        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
         "type": "github"
       },
       "original": {
@@ -600,7 +704,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1720957393,
         "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
@@ -627,11 +731,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1728092656,
+        "lastModified": 1733318908,
-        "narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
+        "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
+        "rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
         "type": "github"
       },
       "original": {
@@ -650,7 +754,7 @@
         "hyprland-catppuccin": "hyprland-catppuccin",
         "hyprlock": "hyprlock",
         "nix-colors": "nix-colors",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "waybar": "waybar",
         "waybar-catppuccin": "waybar-catppuccin"
       }
@@ -703,7 +807,7 @@
     "waybar": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1721250245,
@@ -763,11 +867,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728166987,
+        "lastModified": 1733157064,
-        "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=",
+        "narHash": "sha256-NetqJHAN4bbZDQADvpep+wXk2AbMZ2bN6tINz8Kpz6M=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787",
+        "rev": "fd85ef39369f95eed67fdf3f025e86916edeea2f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -15,7 +15,6 @@
     # hypr suite
     hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
     hyprlock.url = "github:hyprwm/hyprlock";
-    hyprlock.inputs.nixpkgs.follows = "nixpkgs";
     hypridle.url = "github:hyprwm/hypridle";
 
     waybar-catppuccin.url = "github:catppuccin/waybar";

hosts/goopnet-interface/apple-macbook-air-9-1.nix

@@ -10,8 +10,6 @@
   services.power-profiles-daemon.enable = true;
   # manage fans for macbook devices
   services.mbpfan.enable = true;
-  # disable tiny-dfr module from the nixos-hardware module
-  hardware.apple-t2.enableTinyDfr = false;
 
   # better performance than the actual intel driver
   services.xserver.videoDrivers = [ "modesetting" ];
@@ -37,13 +35,11 @@
   hardware.graphics = {
     extraPackages = with pkgs; [
       intel-media-driver
-      (intel-vaapi-driver.override { enableHybridCodec = true; })
       libvdpau-va-gl
     ];
 
     extraPackages32 = with pkgs.pkgsi686Linux; [
       intel-media-driver
-      (intel-vaapi-driver.override { enableHybridCodec = true; })
       libvdpau-va-gl
     ];
   };

modules/desktop/fonts.nix

@@ -67,6 +67,7 @@ in {
       fonts = {
         fontDir.enable = true;
         fontconfig.enable = true;
+        fontconfig.useEmbeddedBitmaps = true;
         fontconfig.defaultFonts = {
           sansSerif = [ cfg.fonts.sansSerif.family ];
           serif = [ cfg.fonts.serif.family ];

modules/desktop/hyprland.nix

@@ -190,7 +190,13 @@ in {
 
           follow_mouse = 1;
 
-          sensitivity = 0; # -1.0 - 1.0, 0 means no modification
+          # uhm?? why do i have to do this here. should be automatic from libinput
+          # whatever. ill just hardcode for now
+          # TODO
+          touchpad = {
+            disable_while_typing = false;
+            natural_scroll = true;
+          };
         };
 
         monitor=",highrr,auto,auto";
@@ -203,7 +209,7 @@ in {
 
         env = [
           "XCURSOR_THEME,${config.modules.desktop.themes.cursorTheme.name}"
-          "XCURSOR_SIZE,24"
+          "XCURSOR_SIZE,${toString config.modules.desktop.themes.cursorTheme.size}"
         ];
 
         general = {
@@ -269,7 +275,7 @@ in {
 
           # workspace moving
           "workspace 1 silent, class:^firefox"
-          "workspace 2 silent, class:code-url-handler"
+          "workspace 2 silent, class:code"
           "workspace 4 silent, class:vesktop"
         ];
 
@@ -278,7 +284,7 @@ in {
           "animation slide, waybar"
           "animation popin, rofi"
           "dimaround, rofi"
-          "blur, gtk-layer-shell"
+          "blur, nwg-drawer"
           "blur, wob"
           "blur, notifications"
           "blur, waybar"
@@ -300,10 +306,12 @@ in {
             special = true;
           };
 
-          drop_shadow = true;
+          shadow = {
-          shadow_range = 6;
+            enabled = true;
-          shadow_render_power = 3;
+            range = 6;
-          shadow_ignore_window = true;
+            render_power = 3;
+            ignore_window = true;
+          };
         };
 
         animations = {

modules/desktop/swww.nix

@@ -41,6 +41,7 @@ in {
   };
 
   config = mkIf cfg.enable {
+    hm.home.packages = [ cfg.package ];
     modules.desktop.execOnStart = [ "${cfg.startScript}" ];
   };
 }

modules/desktop/themes/catppuccin/default.nix

@@ -25,10 +25,10 @@ in {
       };
 
       kvantumTheme = {
-        name = "Catppuccin-${pascalCase variant}-${pascalCase accent}";
+        name = "catppuccin-${variant}-${accent}";
         package = pkgs.catppuccin-kvantum.override {
-          variant = pascalCase variant;
+          variant = variant;
-          accent = pascalCase accent;
+          accent = accent;
         };
       };
 
@@ -40,6 +40,7 @@ in {
       cursorTheme = {
         name = "graphite-dark";
         package = pkgs.graphite-cursors;
+        size = 24;
       };
 
       sddmTheme = {
@@ -88,9 +89,9 @@ in {
             col.active_border=''$${accent}
             col.inactive_border=$surface0
           }
-          decoration {
+          decoration:shadow {
-            col.shadow=$crust
+            color=$crust
-            col.shadow_inactive=$crust
+            color_inactive=$crust
           }
           misc {
             background_color=$crust

modules/desktop/themes/default.nix

@@ -29,6 +29,7 @@ in {
     cursorTheme = {
       name = mkOpt str "";
       package = mkPackageOption pkgs "cursor" {};
+      size = mkOpt int 24;
     };
     sddmTheme = {
       name = mkOpt str "";
@@ -81,13 +82,18 @@ in {
       settings."org/gnome/desktop/interface".gtk-theme = cfg.gtkTheme.name;
       settings."org/gnome/desktop/interface".icon-theme = cfg.iconTheme.name;
       settings."org/gnome/desktop/interface".cursor-theme = cfg.cursorTheme.name;
+      settings."org/gnome/desktop/interface".cursor-size = cfg.cursorTheme.size;
 
       settings."org/gnome/shell/extensions/user-theme".name = cfg.gtkTheme.name;
     };
 
     hm.gtk = {
       enable = true;
-      cursorTheme = cfg.cursorTheme;
+      cursorTheme = {
+        name = cfg.cursorTheme.name;
+        package = cfg.cursorTheme.package;
+        size = cfg.cursorTheme.size;
+      };
       iconTheme = cfg.iconTheme;
       theme = cfg.gtkTheme;
       gtk3.extraConfig.gtk-application-prefer-dark-theme = mkIf cfg.dark "1";
@@ -105,6 +111,7 @@ in {
       x11.enable = true;
       name = cfg.cursorTheme.name;
       package = cfg.cursorTheme.package;
+      size = cfg.cursorTheme.size;
     };
 
     hm.services.dunst.iconTheme = {

modules/hardware/pointer.nix

@@ -18,6 +18,7 @@ in {
         middleEmulation = false;
       };
       touchpad = {
+        accelProfile = "adaptive"; # not gameing
         scrollMethod = "twofinger";
         sendEventsMode = "disabled-on-external-mouse";
         naturalScrolling = true;

modules/software/system/syncthing.nix

@@ -13,7 +13,6 @@ in {
     # edit: turns out you can't with hm??
     hm.services.syncthing = {
       enable = true;
-      # shit broken as hell ngl
       tray = {
         enable = true;
         package = pkgs.syncthingtray-minimal;