From 7477a2950035c018babeaceede53ea648f25f283 Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Sat, 21 Jun 2025 13:53:37 -0400 Subject: [PATCH 1/4] compat: pin `hy3` with `nixpkgs` --- flake.nix | 4 ---- home-manager/wayland/hyprland.nix | 6 ++---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index e3e2c97..8aa8cea 100644 --- a/flake.nix +++ b/flake.nix @@ -13,10 +13,6 @@ inputs = { home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - # TODO: Remove on next update - hy3.url = "github:outfoxxed/hy3"; - hy3.flake = false; - tokyo-night-sddm-src.url = "github:rototrash/tokyo-night-sddm"; tokyo-night-sddm-src.flake = false; macos-hyprcursor-src.url = "github:driedpampas/macOS-hyprcursor"; diff --git a/home-manager/wayland/hyprland.nix b/home-manager/wayland/hyprland.nix index 4d0219c..fe6d607 100644 --- a/home-manager/wayland/hyprland.nix +++ b/home-manager/wayland/hyprland.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, hy3, ... }: +{ config, pkgs, lib, ... }: let scripts = ./scripts; in { @@ -7,9 +7,7 @@ in { systemd.enable = true; xwayland.enable = true; - plugins = [ (pkgs.hyprlandPlugins.hy3.overrideAttrs { - src = hy3; - }) ]; + plugins = [ pkgs.hyprlandPlugins.hy3 ]; settings = let # Volume using pamixer From 1c822fd3886a6fbee80514da1e2670fd8ca3d9f9 Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Sat, 21 Jun 2025 14:18:54 -0400 Subject: [PATCH 2/4] chore: bump inputs --- flake.lock | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 51df6fb..31a0b56 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1743648554, - "narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -21,22 +21,6 @@ "type": "github" } }, - "hy3": { - "flake": false, - "locked": { - "lastModified": 1743128724, - "narHash": "sha256-CUlxc2u1Y8gpeAl7NKrZxxpeZjyU2DBxOYb8b0haM2M=", - "owner": "outfoxxed", - "repo": "hy3", - "rev": "4014433d1c3d1bf36c6684cff14c23d538337070", - "type": "github" - }, - "original": { - "owner": "outfoxxed", - "repo": "hy3", - "type": "github" - } - }, "macos-hyprcursor-src": { "flake": false, "locked": { @@ -56,11 +40,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1741101701, - "narHash": "sha256-Kup8HWWC2AR1j2c9pAjXQXLYmuhyv8sRRfX0o03sNQg=", + "lastModified": 1749499850, + "narHash": "sha256-Fyy9ySTJ7jJ7z2h5+KHJU6OUhPJvy12OlVOichkwmZ0=", "owner": "mobile-nixos", "repo": "mobile-nixos", - "rev": "8956d72cf8fa9110dcc5fcbc537adee45a8014f5", + "rev": "26faf325d6efb169e2e4a2c435346b46c19d08bc", "type": "github" }, "original": { @@ -71,11 +55,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743420942, - "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -86,11 +70,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -103,7 +87,6 @@ "root": { "inputs": { "home-manager": "home-manager", - "hy3": "hy3", "macos-hyprcursor-src": "macos-hyprcursor-src", "mobile-nixos": "mobile-nixos", "nixos-hardware": "nixos-hardware", From f19ee7f547129051ceadde37f7220171cfca4cd4 Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Sun, 22 Jun 2025 02:17:12 -0400 Subject: [PATCH 3/4] compat: fix config options for mako --- home-manager/wayland/wltools.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/home-manager/wayland/wltools.nix b/home-manager/wayland/wltools.nix index 9aaaf30..a764b3a 100644 --- a/home-manager/wayland/wltools.nix +++ b/home-manager/wayland/wltools.nix @@ -142,9 +142,8 @@ # Mako - services.mako = { - enable = true; - + services.mako.enable = true; + services.mako.settings = { font = "JetBrainsMono Nerd Font 10"; format = ''%a\n%s\n\n%b''; layer = "overlay"; From 4ecaa23cb2438cf38d66f928a81f0b9615fb5496 Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Sun, 22 Jun 2025 02:18:09 -0400 Subject: [PATCH 4/4] compat: update partition UUIDs --- hardware-configuration/fire.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hardware-configuration/fire.nix b/hardware-configuration/fire.nix index ad5a3b5..7990a20 100644 --- a/hardware-configuration/fire.nix +++ b/hardware-configuration/fire.nix @@ -9,17 +9,20 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/DA81-CC53"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + fileSystems."/" = { device = "/dev/disk/by-uuid/c926bae1-6832-4ba9-a3d7-f5da11bfc846"; fsType = "ext4"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5008-DA4A"; - fsType = "vfat"; - }; - - swapDevices = [ ]; + swapDevices = + [ { device = "/dev/disk/by-uuid/3a81bb60-49e4-41fc-8716-8db7dd5f698f"; } + ]; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;