From 7bf49268f2e3b08ef5ce496a8fc3ca5d09e3a557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <dev@theaninova.de>
Date: Wed, 7 May 2025 19:25:40 +0200
Subject: [PATCH] fix stuff

---
 flake.lock                                     | 18 +++++++++---------
 hosts/MONSTER/default.nix                      |  2 ++
 modules/home-manager/packages/default.nix      |  2 +-
 .../nixvim/presets/base/diagnostics.nix        |  2 +-
 modules/home-manager/services/default.nix      |  2 +-
 modules/nixos/desktops/hyprland.nix            |  9 ++++-----
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index abcc4cc..c950720 100644
--- a/flake.lock
+++ b/flake.lock
@@ -46,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745987135,
-        "narHash": "sha256-8Up4QPuMZEJBU0eefAY+nUe7DYKQQzvaHnMpNdwRgKA=",
+        "lastModified": 1746317522,
+        "narHash": "sha256-/jZ4Wd4HHUEWPSlNj48k1E4Mh+1fUbwI/vSlPPIMG3U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d2b3e6c83d457aa0e7f9344c61c3fed32bad0f7e",
+        "rev": "621986fed37c5d0cb8df010ed8369694dc47c09b",
         "type": "github"
       },
       "original": {
@@ -127,11 +127,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1745930157,
-        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
+        "lastModified": 1746232882,
+        "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
+        "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008",
         "type": "github"
       },
       "original": {
@@ -150,11 +150,11 @@
         "nuschtosSearch": "nuschtosSearch"
       },
       "locked": {
-        "lastModified": 1745933874,
-        "narHash": "sha256-K/bEekSd3iibHoTUgytBYJZd0/e4xQ4IyKkS+NI1XyI=",
+        "lastModified": 1746309817,
+        "narHash": "sha256-oqOpTyjdeY+LP+WiU9LxGdZ/bZ9YK7MNzNMDUw98kPM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "cd3cbb1e26f463543dc4710548ed35b0ac711370",
+        "rev": "c978122396a4208bf1965d346b7456e7256fe70c",
         "type": "github"
       },
       "original": {
diff --git a/hosts/MONSTER/default.nix b/hosts/MONSTER/default.nix
index 8d0990d..c38b9b1 100644
--- a/hosts/MONSTER/default.nix
+++ b/hosts/MONSTER/default.nix
@@ -121,6 +121,7 @@
     extraGroups = [
       "scanner"
       "lp"
+      "storage"
       "networkmanager"
       "audio"
       "video"
@@ -134,6 +135,7 @@
   environment.systemPackages = with pkgs; [
     # Essential utils
     usbutils
+    usbimager
     uhubctl
     pciutils
     htop
diff --git a/modules/home-manager/packages/default.nix b/modules/home-manager/packages/default.nix
index 4b86002..fc877fd 100644
--- a/modules/home-manager/packages/default.nix
+++ b/modules/home-manager/packages/default.nix
@@ -41,7 +41,7 @@
     apostrophe
 
     # creative
-    gimp
+    gimp3
     inkscape-with-extensions
     scribus
     audacity
diff --git a/modules/home-manager/programs/nixvim/presets/base/diagnostics.nix b/modules/home-manager/programs/nixvim/presets/base/diagnostics.nix
index 2d91f69..a2951e7 100644
--- a/modules/home-manager/programs/nixvim/presets/base/diagnostics.nix
+++ b/modules/home-manager/programs/nixvim/presets/base/diagnostics.nix
@@ -18,7 +18,7 @@ in
         vim.lsp.set_log_level("off")
         vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = "solid" })
       '';
-    diagnostics = {
+    diagnostic.settings = {
       virtual_text.prefix = "●";
       signs = false;
       float = {
diff --git a/modules/home-manager/services/default.nix b/modules/home-manager/services/default.nix
index adad91d..f4ef43f 100644
--- a/modules/home-manager/services/default.nix
+++ b/modules/home-manager/services/default.nix
@@ -4,7 +4,7 @@
     gpg-agent = {
       enable = true;
       enableSshSupport = true;
-      pinentryPackage = pkgs.pinentry-gnome3;
+      pinentry.package = pkgs.pinentry-gnome3;
     };
     # fix pinentry on non-gnome with this in
     # the system config: services.dbus.packages = with pkgs; [ gcr ];
diff --git a/modules/nixos/desktops/hyprland.nix b/modules/nixos/desktops/hyprland.nix
index b100f99..3e89a26 100644
--- a/modules/nixos/desktops/hyprland.nix
+++ b/modules/nixos/desktops/hyprland.nix
@@ -23,7 +23,10 @@ in
     };
     home-manager.users.${username} = {
       wayland.windowManager.hyprland = {
+        enable = true;
         systemd.enable = false;
+        package = null;
+        portalPackage = null;
       };
       home = {
         packages = with pkgs; [ grim ];
@@ -49,6 +52,7 @@ in
           Wants = [ "network-online.target" ];
         };
       };
+      services.polkit-gnome.enable = true;
     };
 
     systemd.services = {
@@ -66,16 +70,11 @@ in
           "hyprland"
           "gtk"
         ];
-        "org.freedesktop.impl.portal.FileChooser" = [ "gtk" ];
         "org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
       };
     };
 
     services = {
-      seatd = {
-        enable = true;
-        user = username;
-      };
       kmscon = {
         enable = true;
         hwRender = true;