From 948ac61d8b49a56b38814c6fc5b37e00fccdf044 Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Mon, 1 Jun 2026 23:35:03 +0200
Subject: [PATCH] Fix deprecation warnings

---
 homes/julian/features/emacs/default.nix          |  2 +-
 homes/julian/features/hyprland/swayidle.nix      |  2 +-
 homes/julian/features/i3/default.nix             |  6 +++---
 homes/julian/features/neovim/default.nix         |  2 +-
 homes/julian/features/suites/cli/default.nix     |  2 +-
 homes/julian/features/suites/desktop/default.nix |  6 +++---
 homes/julian/global/mimeapps.nix                 |  4 ++--
 homes/julian/hm-standalone-config.nix            | 13 -------------
 8 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/homes/julian/features/emacs/default.nix b/homes/julian/features/emacs/default.nix
index 78ed0ec..83d93a6 100644
--- a/homes/julian/features/emacs/default.nix
+++ b/homes/julian/features/emacs/default.nix
@@ -41,7 +41,7 @@ in {
       sqlite
 
       # Code formatters for use with doom emacs
-      nixfmt-rfc-style # nix
+      nixfmt # nix
       alejandra # nix
 
       nixd # nix lsp
diff --git a/homes/julian/features/hyprland/swayidle.nix b/homes/julian/features/hyprland/swayidle.nix
index de2ba57..c58425a 100644
--- a/homes/julian/features/hyprland/swayidle.nix
+++ b/homes/julian/features/hyprland/swayidle.nix
@@ -31,7 +31,7 @@
 in {
   services.swayidle = {
     enable = true;
-    systemdTarget = "graphical-session.target";
+    systemdTargets = ["graphical-session.target"];
     timeouts =
       # Lock screen
       [
diff --git a/homes/julian/features/i3/default.nix b/homes/julian/features/i3/default.nix
index da081fa..4b16a16 100644
--- a/homes/julian/features/i3/default.nix
+++ b/homes/julian/features/i3/default.nix
@@ -22,9 +22,9 @@
   # Prevent screen from going blank (check these settings with `xset q`)
   # And disable bell sound (b)
   xsession.initExtra = ''
-    ${pkgs.xorg.xset}/bin/xset s off
-    ${pkgs.xorg.xset}/bin/xset -dpms
-    ${pkgs.xorg.xset}/bin/xset b off
+    ${pkgs.xset}/bin/xset s off
+    ${pkgs.xset}/bin/xset -dpms
+    ${pkgs.xset}/bin/xset b off
   '';
   xsession.windowManager.i3 = {
     enable = true;
diff --git a/homes/julian/features/neovim/default.nix b/homes/julian/features/neovim/default.nix
index a47af65..3c2515c 100644
--- a/homes/julian/features/neovim/default.nix
+++ b/homes/julian/features/neovim/default.nix
@@ -18,7 +18,7 @@
     fd
     stylua
     black
-    nixfmt-rfc-style # nixfmt
+    nixfmt # nixfmt
   ];
 
   programs.nixvim = {
diff --git a/homes/julian/features/suites/cli/default.nix b/homes/julian/features/suites/cli/default.nix
index 62fc9ac..a716be2 100644
--- a/homes/julian/features/suites/cli/default.nix
+++ b/homes/julian/features/suites/cli/default.nix
@@ -37,7 +37,7 @@
     usbutils # lsusb
     wget
     wireguard-tools # wg-quick
-    xorg.xkill
+    xkill
     zip
     dig
 
diff --git a/homes/julian/features/suites/desktop/default.nix b/homes/julian/features/suites/desktop/default.nix
index 1d0a905..4a68a45 100644
--- a/homes/julian/features/suites/desktop/default.nix
+++ b/homes/julian/features/suites/desktop/default.nix
@@ -39,7 +39,7 @@
     # kitty # Terminal, already available as feature
     libnotify
     libreoffice
-    mate.engrampa
+    engrampa
     nomacs # Image viewer
     kdePackages.okular # Pdf reader with many features, good for commenting documents
     pavucontrol
@@ -53,10 +53,10 @@
     tor-browser
     rusty-path-of-building # Path of Building for poe1 and poe2
     vlc
-    wineWowPackages.stable # 32-bit and 64-bit wine
+    wineWow64Packages.stable # 32-bit and 64-bit wine
     winetricks
     xclip # x11 clipboard access from terminal
-    xfce.mousepad # simple text editor
+    mousepad # simple text editor
     xournalpp # Edit pdf files
     zoom-us # Video conferencing
     zotero # Manage papers and other sources
diff --git a/homes/julian/global/mimeapps.nix b/homes/julian/global/mimeapps.nix
index 4c5de97..8c5eba4 100644
--- a/homes/julian/global/mimeapps.nix
+++ b/homes/julian/global/mimeapps.nix
@@ -20,8 +20,8 @@
     "text/calendar" = thunderbird;
     "application/x-extension-ics" = thunderbird;
     "x-scheme-handler/webcals" = thunderbird;
-    "application/zip" = mate.engrampa;
-    "text/plain" = xfce.mousepad;
+    "application/zip" = engrampa;
+    "text/plain" = mousepad;
     "image/jpeg" = nomacs;
     "application/pdf" = evince;
     "text/html" = firefox;
diff --git a/homes/julian/hm-standalone-config.nix b/homes/julian/hm-standalone-config.nix
index f91a197..f828f0f 100644
--- a/homes/julian/hm-standalone-config.nix
+++ b/homes/julian/hm-standalone-config.nix
@@ -1,18 +1,5 @@
 # Only apply this to home-manager standalone
 {outputs, ...}: {
-  # Apply overlays
-  nixpkgs = {
-    overlays = builtins.attrValues outputs.overlays;
-    config = {
-      allowUnfree = true;
-      allowUnfreePredicate = _: true; # TODO: what is this
-      permittedInsecurePackages = [
-        "olm-3.2.16"
-      ];
-      warn-dirty = false;
-    };
-  };
-
   # Expire old hm generations
   hm-expire = {
     enable = true;