From 6fa11eea8f35819bfefc4e4672004c3241bd58a0 Mon Sep 17 00:00:00 2001
From: blake <me@blakedheld.xyz>
Date: Sat, 25 Oct 2025 10:55:00 -0500
Subject: [PATCH] add hypr stuff and remove current_system var fromflake

---
 flake.lock                                    | 22 +++++++++++++++++++
 flake.nix                                     | 13 ++++++-----
 .../desktop/{hyprland => hypr}/default.nix    |  5 ++---
 users/blake/dots/hyprland/default.nix         | 18 ++++++++++-----
 4 files changed, 44 insertions(+), 14 deletions(-)
 rename modules/desktop/{hyprland => hypr}/default.nix (50%)

diff --git a/flake.lock b/flake.lock
index 449db9c..1c07c07 100644
--- a/flake.lock
+++ b/flake.lock
@@ -124,6 +124,27 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746728054,
+        "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "ff442f5d1425feb86344c028298548024f21256d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "latest",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
@@ -419,6 +440,7 @@
       "inputs": {
         "autoaspm": "autoaspm",
         "copyparty": "copyparty",
+        "disko": "disko",
         "home-manager": "home-manager",
         "nix-darwin": "nix-darwin",
         "nix-homebrew": "nix-homebrew",
diff --git a/flake.nix b/flake.nix
index 4b331a0..2e951e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,6 +19,10 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    disko = {
+      url = "github:nix-community/disko/latest";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     vpn-confinement = {
       url = "github:Maroka-chan/VPN-Confinement";
     };
@@ -51,20 +55,19 @@
     };
     stable_pkgs = builtins.mapAttrs (k: v: import nixpkgs {system = v;}) systems;
     unstable_pkgs = builtins.mapAttrs (k: v: import nixpkgs-unstable {system = v;}) systems;
-    current_system = builtins.currentSystem;
   in {
     nixosConfigurations = {
       snowbelle = nixpkgs.lib.nixosSystem {
         system = systems.x86_64;
-        specialArgs = {inherit inputs stable_pkgs unstable_pkgs current_system;};
+        specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
         modules = [
           ./hosts/nixos/snowbelle/configuration.nix
           inputs.home-manager.nixosModules.default
         ];
       };
-      yveltal = nixpkgs.lib.nixosSystem {
+      yveltal = nixpkgs-unstable.lib.nixosSystem {
         system = systems.x86_64;
-        specialArgs = {inherit inputs stable_pkgs unstable_pkgs current_system;};
+        specialArgs = {inherit inputs stable_pkgs unstable_pkgs;};
         modules = [
           ./hosts/nixos/yveltal/configuration.nix
           inputs.home-manager.nixosModules.default
@@ -82,7 +85,7 @@
     darwinConfigurations = {
       CEN-IT-07 = nix-darwin.lib.darwinSystem {
         system = systems.darwin;
-        specialArgs = {inherit inputs stable_pkgs unstable_pkgs nix-homebrew current_system;};
+        specialArgs = {inherit inputs stable_pkgs unstable_pkgs nix-homebrew;};
         modules = [
           ./hosts/darwin/cen-it-07/configuration.nix
           inputs.home-manager.darwinModules.default
diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hypr/default.nix
similarity index 50%
rename from modules/desktop/hyprland/default.nix
rename to modules/desktop/hypr/default.nix
index a2b9a6f..204c7cc 100644
--- a/modules/desktop/hyprland/default.nix
+++ b/modules/desktop/hypr/default.nix
@@ -8,8 +8,7 @@
   # enable hyprland
   programs.hyprland.enable = true;
 
-  # hint to election apps wayland is in use
-  environment.sessionVariables.NIXOS_OZONE_WL = "1";
-
 
+  # give hyprlock perms to unlock
+  security.pam.services.hyprlock = {};
 }
diff --git a/users/blake/dots/hyprland/default.nix b/users/blake/dots/hyprland/default.nix
index e8046e0..51a8bef 100644
--- a/users/blake/dots/hyprland/default.nix
+++ b/users/blake/dots/hyprland/default.nix
@@ -3,11 +3,19 @@
   config,
   ...
 }: {
-  home.packages = with pkgs; [nwg-displays];
+  home.packages = with pkgs; [
+    nwg-displays
+    hyprlock
+    hypridle
+    hyprpaper
+  ];
 
   wayland.windowManager.hyprland = {
     enable = true;
     systemd.variables = ["--all"];
+    settings = {
+
+    };
   };
 
   home.pointerCursor = {
@@ -18,9 +26,7 @@
     size = 48;
   };
 
-  xdg.configFile."hypr/hyprland.conf" = {
-    source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/hypr/hyprland.conf";
-  };
-
-
+  #xdg.configFile."hypr/hyprland.conf" = {
+  #  source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/hypr/hyprland.conf";
+  #};
 }