From 6848a9d5e0e39797556abd458c692d0ddf0620e2 Mon Sep 17 00:00:00 2001
From: KoenDR06 <koen.de.ruiter@hotmail.com>
Date: Wed, 7 Jan 2026 16:58:48 +0100
Subject: [PATCH] idk changes

---
 flake.lock                       | 33 +++++++++++++++++---------------
 flake.nix                        |  2 +-
 {overlays => lib}/catppuccin.nix |  0
 {overlays => lib}/default.nix    |  0
 machines/artemis/modules.nix     |  2 +-
 machines/terra/modules.nix       |  4 ++--
 modules/wm/hyprland/default.nix  |  3 +++
 7 files changed, 25 insertions(+), 19 deletions(-)
 rename {overlays => lib}/catppuccin.nix (100%)
 rename {overlays => lib}/default.nix (100%)

diff --git a/flake.lock b/flake.lock
index 463d13b..c3ba809 100644
--- a/flake.lock
+++ b/flake.lock
@@ -73,11 +73,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766292113,
-        "narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=",
+        "lastModified": 1767780135,
+        "narHash": "sha256-5SbmsLMgxzPd9YMbFR4IHfOXv6bjWs+dfl6IbSq3r7s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed",
+        "rev": "c08430923ed417abc653884328a39e98496cfd0f",
         "type": "github"
       },
       "original": {
@@ -115,14 +115,17 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1767799636,
-        "narHash": "sha256-qBgbE4jC/VJaY86mNspzToyR08xacawAbMeZskejcJc=",
-        "path": "/home/horseman/Programming/nix-hyprland",
-        "type": "path"
+        "lastModified": 1767801421,
+        "narHash": "sha256-z6+cVdgkJSz+MLUOChLDUZsiBP/h6tuAZSjVG+66jpo=",
+        "owner": "KoenDR06",
+        "repo": "nix-hyprland",
+        "rev": "4efff468c6435080b0716fd289ab7c06c4bb215f",
+        "type": "github"
       },
       "original": {
-        "path": "/home/horseman/Programming/nix-hyprland",
-        "type": "path"
+        "owner": "KoenDR06",
+        "repo": "nix-hyprland",
+        "type": "github"
       }
     },
     "nixpkgs": {
@@ -143,11 +146,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1766201043,
-        "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
+        "lastModified": 1767634882,
+        "narHash": "sha256-2GffSfQxe3sedHzK+sTKlYo/NTIAGzbFCIsNMUPAAnk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
+        "rev": "3c9db02515ef1d9b6b709fc60ba9a540957f661c",
         "type": "github"
       },
       "original": {
@@ -167,11 +170,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763909441,
-        "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=",
+        "lastModified": 1767662275,
+        "narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=",
         "owner": "pjones",
         "repo": "plasma-manager",
-        "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4",
+        "rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 1972966..fac8c98 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,7 +52,7 @@
     ];
     forAllSystems = nixpkgs.lib.genAttrs systems;
 
-    lib = import ./overlays {inherit inputs;};
+    lib = import ./lib {inherit inputs;};
   in {
     formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra);
 
diff --git a/overlays/catppuccin.nix b/lib/catppuccin.nix
similarity index 100%
rename from overlays/catppuccin.nix
rename to lib/catppuccin.nix
diff --git a/overlays/default.nix b/lib/default.nix
similarity index 100%
rename from overlays/default.nix
rename to lib/default.nix
diff --git a/machines/artemis/modules.nix b/machines/artemis/modules.nix
index 5f94a9d..d1bad07 100644
--- a/machines/artemis/modules.nix
+++ b/machines/artemis/modules.nix
@@ -3,7 +3,7 @@
     ../../modules
   ];
 
-  nix-hyprland = {
+  config.nix-hyprland = {
     monitors = {
       bindWorkspaces = "interlaced";
       displays = [
diff --git a/machines/terra/modules.nix b/machines/terra/modules.nix
index fdce395..43c8e46 100644
--- a/machines/terra/modules.nix
+++ b/machines/terra/modules.nix
@@ -1,10 +1,9 @@
-{config, ...}: {
+{...}: {
   imports = [
     ../../modules
   ];
 
   config.nix-hyprland = {
-    username = config.horseman.username;
     monitors = {
       displays = [
         {
@@ -19,6 +18,7 @@
           y = 0;
           transform = 1;
           wallpaper = ../../misc/portrait.png;
+          bar = "top";
         }
       ];
       bindWorkspaces = "interlaced";
diff --git a/modules/wm/hyprland/default.nix b/modules/wm/hyprland/default.nix
index 09962f5..59428ce 100644
--- a/modules/wm/hyprland/default.nix
+++ b/modules/wm/hyprland/default.nix
@@ -46,6 +46,9 @@ in {
     horseman.hardware.keyd.enable = true;
 
     nix-hyprland = {
+      enable = true;
+      username = config.horseman.username;
+
       execOnce = [
         "hypridle"
         "hyprpaper"