Merge branch 'master' of github.com:materusPL/nixos-config

configurations/host/Old-materusPC/configuration.nix

@@ -264,14 +264,10 @@ in
     ubuntu_font_family
     wqy_zenhei
     monocraft
-    (nerdfonts.override {
+    nerd-fonts.fira-code
-      fonts = [
+    nerd-fonts.droid-sans-mono
-        "FiraCode"
+    nerd-fonts.meslo-lg
-        "DroidSansMono"
+    nerd-fonts.profont
-        "Meslo"
-        "ProFont"
-      ];
-    })
   ];
   fonts.fontconfig.enable = true;
   fonts.fontconfig.cache32Bit = true;

configurations/host/materusPC/home/materus/default.nix

@@ -2,6 +2,7 @@
   pkgs,
   materusArg,
   lib,
+  config,
   ...
 }:
 {
@@ -10,7 +11,9 @@
   ];
   home.stateVersion = "23.05";
   home.homeDirectory = "/home/materus";
-
+  
+  materus.profile.wezterm.enable = true;
+  
   programs.git.signing.signByDefault = true;
 
   xdg.userDirs.enable = true;
@@ -129,6 +132,7 @@
     org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_17_HOME,JAVA_21_HOME
     org.gradle.home=${pkgs.jdk21}
   '';
+  
 
   xdg.desktopEntries.brave-browser =
     let

configurations/host/materusPC/home/materus/plasma.nix

@@ -2,7 +2,7 @@
 {
   home.packages = [
     pkgs.papirus-icon-theme
-    (pkgs.nerdfonts.override { fonts = [ "Hack" ]; })
+    pkgs.nerd-fonts.hack
   ];
 
   xdg.dataFile."konsole/materus-linux.keytab".source = ("${materusArg.cfg.path}" + "/extraFiles/config/plasma/materus-linux.keytab");

configurations/host/materusPC/other/apps.nix

@@ -16,12 +16,7 @@
 
   environment.systemPackages = with pkgs; [
 
-    (vivaldi.overrideAttrs
+    vivaldi
-      (oldAttrs: {
-        dontWrapQtApps = false;
-        dontPatchELF = true;
-        nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.kdePackages.wrapQtAppsHook];
-      }))
 
     #(pkgs.lutris.override { extraLibraries = pkgs: with pkgs;  [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
     materusArg.pkgs.amdgpu-pro-libs.prefixes
@@ -112,7 +107,7 @@
 
     nix-du
 
-    kate
+    kdePackages.kate
     krusader
 
     wineWowPackages.stagingFull

configurations/host/materusPC/other/desktop/kde.nix

@@ -8,8 +8,8 @@
 
   services.desktopManager.plasma6.enable = true;
   services.desktopManager.plasma6.enableQt5Integration = true;
-  programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
+  #programs.gnupg.agent.pinentryPackage = lib.mkForce (pkgs.kwalletcli.overrideAttrs {meta.mainProgram = "pinentry-kwallet";});
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
+  #environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
   environment.variables = {
     # Old fix for black cursor on amdgpu, seems to work fine now
     #KWIN_DRM_NO_AMS = "1";
@@ -17,7 +17,7 @@
     #Fix for amdgpu crashes
     KWIN_DRM_USE_MODIFIERS = "0";
     KWIN_DRM_NO_DIRECT_SCANOUT = "1";
-    QT_PLUGIN_PATH = [ 
+    QT_PLUGIN_PATH = [
       "${pkgs.qt6.qtimageformats}/${pkgs.qt6.qtbase.qtPluginPrefix}"
       "${pkgs.kdePackages.ffmpegthumbs}/${pkgs.qt6.qtbase.qtPluginPrefix}"
      ];
@@ -29,4 +29,12 @@
   ];
   programs.kdeconnect.enable = true;
   materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin pkgs.vlc pkgs.vkbasalt-cli ];
+
+  programs.firefox = {
+    enable = true;
+    autoConfig = builtins.readFile(builtins.fetchurl {
+      url = "https://raw.githubusercontent.com/MrOtherGuy/fx-autoconfig/master/program/config.js";
+      sha256 = "1mx679fbc4d9x4bnqajqx5a95y1lfasvf90pbqkh9sm3ch945p40";
+    });
+  };
 }

configurations/host/valkyrie/services/pleroma.nix

@@ -50,7 +50,7 @@ in
       "L+   /var/lib/pleroma/static/frontends/soapbox/${soapbox.version}  0766 pleroma pleroma - ${soapbox}"
     ];
 
-   s ervices.nginx.virtualHosts."podkos.xyz" = {
+   services.nginx.virtualHosts."podkos.xyz" = {
       http2 = true;
       useACMEHost = "podkos.xyz";
       forceSSL = true;

configurations/host/waffentrager/configuration.nix

@@ -28,7 +28,7 @@
     gzip
 
   ];
-  sound.enable = false;
+  
   boot.tmp.useTmpfs = true;
   services.xserver.enable = false;
   networking.hostName = "waffentrager";

configurations/host/waffentrager/services/storage/nextcloud.nix

@@ -22,7 +22,7 @@
       services.nextcloud = {
         enable = true;
         notify_push.enable = true;
-        package = pkgs.nextcloud29;
+        package = pkgs.nextcloud31;
         hostName = "waffentrager.materus.pl";
         home = config.waffentragerService.elements.nextcloudDir;
         config.adminuser = "nextcloud-master";
@@ -37,7 +37,7 @@
         appstoreEnable = true;
         database.createLocally = true;
         nginx.recommendedHttpHeaders = true;
-        extraApps = with pkgs.nextcloud29Packages.apps; {
+        extraApps = with pkgs.nextcloud31Packages.apps; {
           inherit notify_push previewgenerator;
         };
         settings = {

configurations/host/waffentrager/services/storage/samba.nix

@@ -24,33 +24,34 @@
         package = pkgs.sambaFull;
         securityType = "user";
         openFirewall = true;
-        extraConfig = ''
+        settings = 
-          workgroup = WORKGROUP
+          {
-          server string = smbwaffentrager
+            global = {
-          netbios name = smbwaffentrager
+              "workgroup" = "WORKGROUP";
-          security = user 
+              "server string" = "smbwaffentrager";
-          hosts allow = ${materusArg.wireguard.sambaIp} 192.168.100. 127.0.0.1 localhost
+              "netbios name" = "smbwaffentrager";
-          hosts deny = 0.0.0.0/0
+              "security" = "user"; 
-          guest account = nobody
+              "hosts allow" = "${materusArg.wireguard.sambaIp} 192.168.100. 127.0.0.1 localhost";
-          map to guest = bad user
+              "hosts deny" = "0.0.0.0/0";
-          mangled names = no
+              "guest account" = "nobody";
-          dos charset = CP850
+              "map to guest" = "bad user";
-          unix charset = UTF-8
+              "mangled names" = "no";
-	        display charset = UTF-8
+              "dos charset" = "CP850";
-          catia:mappings = 0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6
+              "unix charset" = "UTF-8";
-        '';
+	          "display charset" = "UTF-8";
-        shares = {
+              "catia:mappings" = "0x22:0xa8,0x2a:0xa4,0x2f:0xf8,0x3a:0xf7,0x3c:0xab,0x3e:0xbb,0x3f:0xbf,0x5c:0xff,0x7c:0xa6";
-          materus = {
+            };
-            path = "${config.waffentragerService.elements.path}/storage/materus";
+            materus = {
-            browseable = "yes";
+              "path" = "${config.waffentragerService.elements.path}/storage/materus";
-            "read only" = "no";
+              "browseable" = "yes";
-            "guest ok" = "no";
+              "read only" = "no";
-            "create mask" = "0770";
+              "guest ok" = "no";
-            "directory mask" = "0770";
+              "create mask" = "0770";
-            "force user" = "materus";
+              "directory mask" = "0770";
-            "force group" = "nextcloud";
+              "force user" = "materus";
+              "force group" = "nextcloud";   
+            };
           };
-        };
       };
     };
 }

configurations/profile/common/packages/fonts.nix

@@ -17,14 +17,17 @@ let
     pkgs.wqy_zenhei
     pkgs.corefonts
     pkgs.hack-font
-    (pkgs.nerdfonts.override { fonts = [ "Hack" ]; })
+    pkgs.nerd-fonts.hack
 
   ] ++ defaultFonts;
 
   moreFonts = [
     pkgs.ubuntu_font_family
     pkgs.monocraft
-    (pkgs.nerdfonts.override { fonts = [ "DroidSansMono" "Meslo" "ProFont" "FiraCode"]; })
+    pkgs.nerd-fonts.droid-sans-mono
+    pkgs.nerd-fonts.meslo-lg
+    pkgs.nerd-fonts.profont
+    pkgs.nerd-fonts.fira-code
   ];
 in
 {

configurations/profile/home/editor/emacs/default.nix

@@ -3,9 +3,10 @@
   lib,
   pkgs,
   materusArg,
+  materusCfg,
   ...
 }: let
-  emacs-pkg = pkgs.emacs;
+  emacs-pkg = materusCfg.configInputs.emacs-overlay.packages.x86_64-linux.emacs-git;
 
   materus-nix = e:
     e.trivialBuild {
@@ -188,8 +189,12 @@
       ripgrep
       cmake
       gnumake
-      nixfmt-rfc-style
+      nixfmt-rfc-style  
-      python3Full
+      (python3.withPackages (python-pkgs: with python-pkgs; [
+        matplotlib
+        pandas
+        requests
+      ]))
       multimarkdown
       git
       emacs-lsp-booster

configurations/profile/home/terminal/wezterm.nix

@@ -31,9 +31,7 @@ in
     '';
 
       home.packages = [
-        (lib.mkIf cfg.enableHackFont (pkgs.nerdfonts.override {
+        (lib.mkIf cfg.enableHackFont (pkgs.nerd-fonts.hack))
-          fonts = [ "Hack" ];
-        }))
         (lib.mkIf cfg.enableWezcraft (pkgs.monocraft))
         (lib.mkIf cfg.enableWezcraft (pkgs.writeShellScriptBin "wezcraft" ''
           ${lib.getExe config.programs.wezterm.package} --config font="wezterm.font 'Monocraft Nerd Font'" $@

extraFiles/config/emacs/EMACS-CONFIG.org

@@ -11,6 +11,7 @@
 - [[#init-core][Init Core]]
   - [[#prepare][Prepare]]
   - [[#elpaca][Elpaca]]
+  - [[#variables][Variables]]
   - [[#functions][Functions]]
   - [[#custom-file][Custom File]]
   - [[#font--text][Font & Text]]
@@ -172,14 +173,13 @@
 :END:
 ** Prepare
 #+begin_src emacs-lisp :noweb-ref init
-;; Prepare
+  ;; Prepare
   (require 'materus-nix nil t)
   (require 'elec-pair)
   (when (not emacs-build-time)
     (print "WARN: emacs-build-time not set up, using current time")
     (setq emacs-build-time (decode-time (current-time))))
-  (add-to-list 'load-path (concat user-emacs-directory "etc/pkgs/"))                ; Extra load path for packages
+  (add-to-list 'load-path (concat user-emacs-directory "etc/pkgs/"))                ; Extra load path for packages  
-  (defvar materus/nixos-config (getenv "MATERUS_CONFIG_DIR"))  
   (setq read-process-output-max (* 1024 1024 3))
 
 #+END_src
@@ -230,6 +230,16 @@
     (setq elpaca-use-package-by-default t))
 
 #+END_src
+** Variables
+#+begin_src emacs-lisp :noweb-ref init-variables
+  (defvar materus/nixos-config (getenv "MATERUS_CONFIG_DIR"))
+  (defvar materus/server-env nil)
+  (defvar materus/pkgs/vterm-enable nil)
+
+  (let ((vars-file (expand-file-name "etc/variables.el" user-emacs-directory)))
+    (unless (file-exists-p vars-file) (make-empty-file vars-file))
+    (load vars-file))
+#+end_src
 ** Functions
 #+begin_src emacs-lisp :noweb-ref init-functions
   ;; Use package preffering built-in / nix packages
@@ -288,6 +298,8 @@
   (global-completion-preview-mode 1)
   (electric-pair-mode 1)
   (electric-indent-mode -1)
+
+  (setq isearch-allow-scroll t) ; Allows scrolling without closing isearch
 #+end_src
 
 ** Frame
@@ -457,7 +469,8 @@ Setting up mouse
 #+end_src
 *** Vterm
 #+begin_src emacs-lisp
-(materus/use-package vterm)
+(when (or materus/pkgs/vterm-enable (locate-library (symbol-name 'vterm)))
+(materus/use-package vterm))
 #+end_src
 ** Navigation and Completion
 *** minibuffer (orderless, vertico, marginalia, consult)
@@ -567,17 +580,18 @@ Setting up mouse
 #+begin_src emacs-lisp
   (use-package dirvish
     :after (nerd-icons)
-   :config
+    :config
-   (setq dired-mouse-drag-files t)
+    (setq dired-mouse-drag-files t)
-   (dirvish-override-dired-mode 1)
+    (dirvish-override-dired-mode 1)
-   (setq dirvish-attributes
+    (setq dirvish-attributes
-         '(vc-state
+          '(vc-state
-           subtree-state
+            subtree-state
-           nerd-icons
+            nerd-icons
-           collapse
+            collapse
-           git-msg
+            git-msg
-           file-time 
+            file-time 
-           file-size)))
+            file-size))
+    )
 
 #+end_src
 *** Treemacs
@@ -664,7 +678,7 @@ Setting up mouse
   (use-package lsp-treemacs
     :after (lsp-mode treemacs)
     :config
-    (lsp-treemacs-sync-mode 1))
+    (lsp-treemacs-sync-mode 0))
 
 
 #+end_src
@@ -732,12 +746,16 @@ Setting up mouse
     :config
     (setq lsp-java-vmargs '("-XX:+UseParallelGC" "-XX:GCTimeRatio=4" "-XX:AdaptiveSizePolicyWeight=90" "-Dsun.zip.disableMemoryMapping=true" "-Xmx4G" "-Xms512m"))
     ;;(add-hook 'java-mode-hook (lambda ()  (when (getenv "JDTLS_PATH") (setq lsp-java-server-install-dir (getenv "JDTLS_PATH")))))
-    (add-hook 'java-mode-hook 'lsp-deferred)
+    (add-hook 'java-mode-hook #'lsp)
-    (add-hook 'java-mode-hook 'display-line-numbers-mode)
+    (add-hook 'java-mode-hook #'display-line-numbers-mode)
+    (add-hook 'java-mode-hook #'lsp-lens-mode)
+    (add-hook 'java-mode-hook #'lsp-java-boot-lens-mode)
 
     ;;(add-hook 'java-ts-mode-hook (lambda ()  (when (getenv "JDTLS_PATH") (setq lsp-java-server-install-dir (getenv "JDTLS_PATH")))))
-    (add-hook 'java-ts-mode-hook 'lsp-deferred)
+    (add-hook 'java-ts-mode-hook #'lsp)
-    (add-hook 'java-ts-mode-hook 'display-line-numbers-mode)
+    (add-hook 'java-ts-mode-hook #'display-line-numbers-mode)
+    (add-hook 'java-ts-mode-hook #'lsp-lens-mode)
+    (add-hook 'java-ts-mode-hook #'lsp-java-boot-lens-mode)
 
     (when (treesit-language-available-p 'java) (push '(java-mode . java-ts-mode) major-mode-remap-alist))
 
@@ -790,7 +808,7 @@ Setting up mouse
 #+end_src
 **** Common Lisp
 #+begin_src emacs-lisp
-  (use-package slime
+  (use-package sly
     :if (executable-find "sbcl")
     :config
     (setq inferior-lisp-program "sbcl"))
@@ -934,14 +952,16 @@ Setting up mouse
 #+end_src
 *** Elcord
 #+begin_src emacs-lisp
-  (defun materus/elcord-toggle (&optional _frame)
+
-    "Toggle elcord based on visible frames"
-    (if (> (length (frame-list)) 1)
-        (elcord-mode 1)
-      (elcord-mode -1))
-    )
   (use-package elcord
+    :if (not materus/server-env)
     :config
+    (defun materus/elcord-toggle (&optional _frame)
+      "Toggle elcord based on visible frames"
+      (if (> (length (frame-list)) 1)
+          (elcord-mode 1)
+        (elcord-mode -1))
+      )
     (unless (daemonp) (elcord-mode 1))
     (add-hook 'after-delete-frame-functions 'materus/elcord-toggle)
     (add-hook 'server-after-make-frame-hook 'materus/elcord-toggle))
@@ -1049,6 +1069,7 @@ Setting up mouse
   ;;; -*- lexical-binding: t; -*-
   <<init>>
   <<init-elpaca>>
+  <<init-variables>>
   <<init-functions>>
   <<package-no-littering>>
   <<init-extra>>

extraFiles/config/emacs/init.el

@@ -1,13 +1,12 @@
 ;;; -*- lexical-binding: t; -*-
 ;; Prepare
-  (require 'materus-nix nil t)
+(require 'materus-nix nil t)
-  (require 'elec-pair)
+(require 'elec-pair)
-  (when (not emacs-build-time)
+(when (not emacs-build-time)
-    (print "WARN: emacs-build-time not set up, using current time")
+  (print "WARN: emacs-build-time not set up, using current time")
-    (setq emacs-build-time (decode-time (current-time))))
+  (setq emacs-build-time (decode-time (current-time))))
-  (add-to-list 'load-path (concat user-emacs-directory "etc/pkgs/"))                ; Extra load path for packages
+(add-to-list 'load-path (concat user-emacs-directory "etc/pkgs/"))                ; Extra load path for packages  
-  (defvar materus/nixos-config (getenv "MATERUS_CONFIG_DIR"))  
+(setq read-process-output-max (* 1024 1024 3))
-  (setq read-process-output-max (* 1024 1024 3))
 
 ;; Elpaca Init
 (defvar elpaca-installer-version 0.11)
@@ -53,6 +52,13 @@
   (elpaca-use-package-mode)
   (setq elpaca-use-package-by-default t))
 
+(defvar materus/nixos-config (getenv "MATERUS_CONFIG_DIR"))
+(defvar materus/server-env nil)
+(defvar materus/pkgs/vterm-enable nil)
+
+(let ((vars-file (expand-file-name "etc/variables.el" user-emacs-directory)))
+  (unless (file-exists-p vars-file) (make-empty-file vars-file))
+  (load vars-file))
 ;; Use package preffering built-in / nix packages
 (defmacro materus/use-package (package &rest body)
   (if (locate-library (symbol-name `,package))
@@ -110,6 +116,8 @@
 (global-completion-preview-mode 1)
 (electric-pair-mode 1)
 (electric-indent-mode -1)
+
+(setq isearch-allow-scroll t) ; Allows scrolling without closing isearch
 ;; Frame Init
 (when (daemonp)
   (add-hook 'after-make-frame-functions 
@@ -222,7 +230,8 @@
          ("C-r" . visual-replace-from-isearch)))
 (use-package eat)
 
-(materus/use-package vterm)
+(when (or materus/pkgs/vterm-enable (locate-library (symbol-name 'vterm)))
+(materus/use-package vterm))
 (use-package orderless
   :init
   ;; Tune the global completion style settings to your liking!
@@ -321,17 +330,18 @@
 
 (use-package dirvish
   :after (nerd-icons)
- :config
+  :config
- (setq dired-mouse-drag-files t)
+  (setq dired-mouse-drag-files t)
- (dirvish-override-dired-mode 1)
+  (dirvish-override-dired-mode 1)
- (setq dirvish-attributes
+  (setq dirvish-attributes
-       '(vc-state
+        '(vc-state
-         subtree-state
+          subtree-state
-         nerd-icons
+          nerd-icons
-         collapse
+          collapse
-         git-msg
+          git-msg
-         file-time 
+          file-time 
-         file-size)))
+          file-size))
+  )
 
 (use-package treemacs)
 (use-package treemacs-projectile
@@ -385,7 +395,7 @@
 (use-package lsp-treemacs
   :after (lsp-mode treemacs)
   :config
-  (lsp-treemacs-sync-mode 1))
+  (lsp-treemacs-sync-mode 0))
 
 
 (use-package dap-mode
@@ -437,12 +447,16 @@
   :config
   (setq lsp-java-vmargs '("-XX:+UseParallelGC" "-XX:GCTimeRatio=4" "-XX:AdaptiveSizePolicyWeight=90" "-Dsun.zip.disableMemoryMapping=true" "-Xmx4G" "-Xms512m"))
   ;;(add-hook 'java-mode-hook (lambda ()  (when (getenv "JDTLS_PATH") (setq lsp-java-server-install-dir (getenv "JDTLS_PATH")))))
-  (add-hook 'java-mode-hook 'lsp-deferred)
+  (add-hook 'java-mode-hook #'lsp)
-  (add-hook 'java-mode-hook 'display-line-numbers-mode)
+  (add-hook 'java-mode-hook #'display-line-numbers-mode)
+  (add-hook 'java-mode-hook #'lsp-lens-mode)
+  (add-hook 'java-mode-hook #'lsp-java-boot-lens-mode)
 
   ;;(add-hook 'java-ts-mode-hook (lambda ()  (when (getenv "JDTLS_PATH") (setq lsp-java-server-install-dir (getenv "JDTLS_PATH")))))
-  (add-hook 'java-ts-mode-hook 'lsp-deferred)
+  (add-hook 'java-ts-mode-hook #'lsp)
-  (add-hook 'java-ts-mode-hook 'display-line-numbers-mode)
+  (add-hook 'java-ts-mode-hook #'display-line-numbers-mode)
+  (add-hook 'java-ts-mode-hook #'lsp-lens-mode)
+  (add-hook 'java-ts-mode-hook #'lsp-java-boot-lens-mode)
 
   (when (treesit-language-available-p 'java) (push '(java-mode . java-ts-mode) major-mode-remap-alist))
 
@@ -480,7 +494,7 @@
   (when (treesit-language-available-p 'nix) (push '(nix-mode . nix-ts-mode) major-mode-remap-alist)))
 (use-package paredit)
 
-(use-package slime
+(use-package sly
   :if (executable-find "sbcl")
   :config
   (setq inferior-lisp-program "sbcl"))
@@ -568,14 +582,16 @@
   (setq persp-modestring-short t)
   (persp-mode 1)
   )
-(defun materus/elcord-toggle (&optional _frame)
+
-  "Toggle elcord based on visible frames"
-  (if (> (length (frame-list)) 1)
-      (elcord-mode 1)
-    (elcord-mode -1))
-  )
 (use-package elcord
+  :if (not materus/server-env)
   :config
+  (defun materus/elcord-toggle (&optional _frame)
+    "Toggle elcord based on visible frames"
+    (if (> (length (frame-list)) 1)
+        (elcord-mode 1)
+      (elcord-mode -1))
+    )
   (unless (daemonp) (elcord-mode 1))
   (add-hook 'after-delete-frame-functions 'materus/elcord-toggle)
   (add-hook 'server-after-make-frame-hook 'materus/elcord-toggle))

flake.lock

@@ -159,11 +159,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1747188492,
+        "lastModified": 1749232178,
-        "narHash": "sha256-9DZ/Wr6zDvb2GxgvxkGxCFJctqhn4vIPeCh+Yctflg0=",
+        "narHash": "sha256-pekC+SuqoHkoYPuWhC1aADCIP0cD3tvemu4WOF/JMUY=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "6d15ffa9720fc7d6635238d961593a289062b555",
+        "rev": "f6850858f78e2b6328f6e8bb7bf9df10dd0b7973",
         "type": "github"
       },
       "original": {
@@ -182,11 +182,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1747188492,
+        "lastModified": 1749232178,
-        "narHash": "sha256-9DZ/Wr6zDvb2GxgvxkGxCFJctqhn4vIPeCh+Yctflg0=",
+        "narHash": "sha256-pekC+SuqoHkoYPuWhC1aADCIP0cD3tvemu4WOF/JMUY=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "6d15ffa9720fc7d6635238d961593a289062b555",
+        "rev": "f6850858f78e2b6328f6e8bb7bf9df10dd0b7973",
         "type": "github"
       },
       "original": {
@@ -436,16 +436,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1747020534,
+        "lastModified": 1749154018,
-        "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=",
+        "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b4bbdc6fde16fc2051fcde232f6e288cd22007ca",
+        "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -458,11 +458,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747184352,
+        "lastModified": 1749243446,
-        "narHash": "sha256-GBZulv50wztp5cgc405t1uOkxQYhSkMqeKLI+iSrlpk=",
+        "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7c1cefb98369cc85440642fdccc1c1394ca6dd2c",
+        "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36",
         "type": "github"
       },
       "original": {
@@ -477,10 +477,10 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1746171682,
+        "lastModified": 1747688870,
-        "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
+        "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
-        "path": "/nix/store/xcqyjkljvvi1qk78la2vh5b783yzs7wl-source",
+        "path": "/nix/store/dimhhb7nhymgd9f35ajdzf6xkij6rsh8-source",
-        "rev": "50eee705bbdbac942074a8c120e8194185633675",
+        "rev": "d5f1f641b289553927b3801580598d200a501863",
         "type": "path"
       },
       "original": {
@@ -500,11 +500,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747188026,
+        "lastModified": 1749175351,
-        "narHash": "sha256-NjiJ2Bce5F7dn+6ZGCenzIjem2+Ei4SDF78x2wHVlOY=",
+        "narHash": "sha256-TIOk5mBsbs/HBYkgnU/trAjmxAO50OTHZkSdMvvAGok=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "083675f78e7de80e9fec1f621b8a508e58327131",
+        "rev": "832bd4f14d5a64df323b456132c33c572e7f0c75",
         "type": "github"
       },
       "original": {
@@ -526,11 +526,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747188026,
+        "lastModified": 1749175351,
-        "narHash": "sha256-NjiJ2Bce5F7dn+6ZGCenzIjem2+Ei4SDF78x2wHVlOY=",
+        "narHash": "sha256-TIOk5mBsbs/HBYkgnU/trAjmxAO50OTHZkSdMvvAGok=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "083675f78e7de80e9fec1f621b8a508e58327131",
+        "rev": "832bd4f14d5a64df323b456132c33c572e7f0c75",
         "type": "github"
       },
       "original": {
@@ -553,11 +553,11 @@
         "nur": "nur"
       },
       "locked": {
-        "lastModified": 1747136507,
+        "lastModified": 1747602536,
-        "narHash": "sha256-lnt9LypZVMRzRDpl+gQtrInxvsF7CL18TTEMthXz8p8=",
+        "narHash": "sha256-XpXAp3tgfPWeV+Wq3/iilz4mCgvRD75Q8kvgHKRIJRw=",
         "owner": "materusPL",
         "repo": "Nixerus",
-        "rev": "8c329020c653c04a8f0f50dc7400c01b3b9e3733",
+        "rev": "84d8b84d1e6883d3e393c889ea62cba503c83a1d",
         "type": "github"
       },
       "original": {
@@ -580,11 +580,11 @@
         "nur": "nur_3"
       },
       "locked": {
-        "lastModified": 1747136507,
+        "lastModified": 1747602536,
-        "narHash": "sha256-lnt9LypZVMRzRDpl+gQtrInxvsF7CL18TTEMthXz8p8=",
+        "narHash": "sha256-XpXAp3tgfPWeV+Wq3/iilz4mCgvRD75Q8kvgHKRIJRw=",
         "owner": "materusPL",
         "repo": "Nixerus",
-        "rev": "8c329020c653c04a8f0f50dc7400c01b3b9e3733",
+        "rev": "84d8b84d1e6883d3e393c889ea62cba503c83a1d",
         "type": "github"
       },
       "original": {
@@ -596,11 +596,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1747129300,
+        "lastModified": 1749195551,
-        "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
+        "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e81fd167b33121269149c57806599045fd33eeed",
+        "rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
         "type": "github"
       },
       "original": {
@@ -612,11 +612,11 @@
     },
     "nixos-hardware_2": {
       "locked": {
-        "lastModified": 1747129300,
+        "lastModified": 1749195551,
-        "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
+        "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "e81fd167b33121269149c57806599045fd33eeed",
+        "rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
         "type": "github"
       },
       "original": {
@@ -644,11 +644,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1746957726,
+        "lastModified": 1748995628,
-        "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
+        "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
+        "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b",
         "type": "github"
       },
       "original": {
@@ -660,11 +660,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1746957726,
+        "lastModified": 1748995628,
-        "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
+        "narHash": "sha256-bFufQGSAEYQgjtc4wMrobS5HWN0hDP+ZX+zthYcml9U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
+        "rev": "8eb3b6a2366a7095939cd22f0dc0e9991313294b",
         "type": "github"
       },
       "original": {
@@ -676,16 +676,16 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1746957726,
+        "lastModified": 1749086602,
-        "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
+        "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
+        "rev": "4792576cb003c994bd7cc1edada3129def20b27d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -756,11 +756,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1746904237,
+        "lastModified": 1749143949,
-        "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
+        "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
+        "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
         "type": "github"
       },
       "original": {
@@ -894,11 +894,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742765550,
+        "lastModified": 1748196248,
-        "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=",
+        "narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16",
+        "rev": "b7697abe89967839b273a863a3805345ea54ab56",
         "type": "github"
       },
       "original": {
@@ -920,11 +920,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742765550,
+        "lastModified": 1748196248,
-        "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=",
+        "narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "b70be387276e632fe51232887f9e04e2b6ef8c16",
+        "rev": "b7697abe89967839b273a863a3805345ea54ab56",
         "type": "github"
       },
       "original": {
@@ -970,11 +970,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746485181,
+        "lastModified": 1747603214,
-        "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
+        "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
+        "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
         "type": "github"
       },
       "original": {
@@ -992,11 +992,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746485181,
+        "lastModified": 1747603214,
-        "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
+        "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
+        "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
         "type": "github"
       },
       "original": {

flake.nix

@@ -29,14 +29,14 @@
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
-      ref = "nixos-24.11";
+      ref = "nixos-25.05";
     };
 
     hm-stable = {
       type = "github";
       owner = "nix-community";
       repo = "home-manager";
-      ref = "release-24.11";
+      ref = "release-25.05";
       inputs.nixpkgs.follows = "nixpkgs-stable";
     };