From b70dbcee068f927445887e27c70328b527a86a9b Mon Sep 17 00:00:00 2001
From: foglar <kohout.fi.2023@skola.ssps.cz>
Date: Tue, 29 Oct 2024 09:42:27 +0100
Subject: [PATCH] updates

---
 flake.lock                          | 41 +++++++++++++++++++++++++++--
 flake.nix                           | 16 ++++++++++-
 nixos/desktop/hyprland/hyprland.nix |  7 +++++
 nixos/packages.nix                  |  4 +++
 4 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 70e10c4..0c54b7f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,26 @@
 {
   "nodes": {
+    "Hyprspace": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ],
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1730146253,
+        "narHash": "sha256-SpYOCfoWsEvoVn8VHhb09Hwl8K5iAGmJaGMr64/fd+g=",
+        "owner": "KZDKM",
+        "repo": "Hyprspace",
+        "rev": "031f77772814395774de55461f68cfe82ddfcc9f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "KZDKM",
+        "repo": "Hyprspace",
+        "type": "github"
+      }
+    },
     "aquamarine": {
       "inputs": {
         "hyprutils": [
@@ -287,7 +308,7 @@
         "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": "nixpkgs",
         "pre-commit-hooks": "pre-commit-hooks",
-        "systems": "systems",
+        "systems": "systems_2",
         "xdph": "xdph"
       },
       "locked": {
@@ -498,6 +519,7 @@
     },
     "root": {
       "inputs": {
+        "Hyprspace": "Hyprspace",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nixpkgs": "nixpkgs_2",
@@ -515,7 +537,7 @@
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_2",
         "nixpkgs": "nixpkgs_3",
-        "systems": "systems_2",
+        "systems": "systems_3",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-tmux": "tinted-tmux"
@@ -550,6 +572,21 @@
       }
     },
     "systems_2": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
diff --git a/flake.nix b/flake.nix
index 5ee0fd7..6b7975c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,21 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    hyprland.url = "github:hyprwm/Hyprland";
+    hyprland = {
+      url = "github:hyprwm/Hyprland";
+      type = "git";
+      submodules = true;
+    };
+    #hyprland-plugins = {
+    #  url = "github:hyprwm/hyprland-plugins";
+    #  inputs.hyprland.follows = "hyprland";
+    #};
+
+    Hyprspace = {
+      url = "github:KZDKM/Hyprspace";
+      # Hyprspace uses latest Hyprland. We declare this to keep them in sync.
+      inputs.hyprland.follows = "hyprland";
+    };
 
     home-manager = {
       url = "github:nix-community/home-manager";
diff --git a/nixos/desktop/hyprland/hyprland.nix b/nixos/desktop/hyprland/hyprland.nix
index d67090a..6cae337 100644
--- a/nixos/desktop/hyprland/hyprland.nix
+++ b/nixos/desktop/hyprland/hyprland.nix
@@ -1,4 +1,6 @@
 {
+  inputs,
+  pkgs,
   lib,
   config,
   ...
@@ -23,6 +25,11 @@
     wayland.windowManager.hyprland = {
       enable = true;
 
+      plugins = [
+        #inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars
+        inputs.Hyprspace.packages.${pkgs.system}.Hyprspace
+      ];
+
       settings = {
         monitor = [
           "eDP-1,1920x1080,0x0,1"
diff --git a/nixos/packages.nix b/nixos/packages.nix
index 3cbaf14..53741ea 100644
--- a/nixos/packages.nix
+++ b/nixos/packages.nix
@@ -15,6 +15,10 @@
     librewolf
     discord
 
+    cmake
+    meson
+    cpio
+
     pfetch
     zoxide
     bat