diff --git a/configurations/host/Old-materusPC/configuration.nix b/configurations/host/Old-materusPC/configuration.nix index 21af257..7586f6c 100755 --- a/configurations/host/Old-materusPC/configuration.nix +++ b/configurations/host/Old-materusPC/configuration.nix @@ -264,14 +264,10 @@ in ubuntu_font_family wqy_zenhei monocraft - (nerdfonts.override { - fonts = [ - "FiraCode" - "DroidSansMono" - "Meslo" - "ProFont" - ]; - }) + nerd-fonts.fira-code + nerd-fonts.droid-sans-mono + nerd-fonts.meslo-lg + nerd-fonts.profont ]; fonts.fontconfig.enable = true; fonts.fontconfig.cache32Bit = true; diff --git a/configurations/host/materusPC/home/materus/default.nix b/configurations/host/materusPC/home/materus/default.nix index f0c028c..028d59f 100644 --- a/configurations/host/materusPC/home/materus/default.nix +++ b/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 diff --git a/configurations/host/materusPC/home/materus/plasma.nix b/configurations/host/materusPC/home/materus/plasma.nix index c966b98..b840ada 100644 --- a/configurations/host/materusPC/home/materus/plasma.nix +++ b/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"); diff --git a/configurations/host/materusPC/other/apps.nix b/configurations/host/materusPC/other/apps.nix index a2ce3ba..1609ae9 100644 --- a/configurations/host/materusPC/other/apps.nix +++ b/configurations/host/materusPC/other/apps.nix @@ -16,12 +16,7 @@ environment.systemPackages = with pkgs; [ - (vivaldi.overrideAttrs - (oldAttrs: { - dontWrapQtApps = false; - dontPatchELF = true; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [pkgs.kdePackages.wrapQtAppsHook]; - })) + vivaldi #(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 diff --git a/configurations/host/materusPC/other/desktop/kde.nix b/configurations/host/materusPC/other/desktop/kde.nix index c01e8a3..f1147f2 100644 --- a/configurations/host/materusPC/other/desktop/kde.nix +++ b/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; - environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ]; + #programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3; + #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"; diff --git a/configurations/profile/common/packages/fonts.nix b/configurations/profile/common/packages/fonts.nix index f80c4c6..1219b85 100644 --- a/configurations/profile/common/packages/fonts.nix +++ b/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 { diff --git a/configurations/profile/home/editor/emacs/default.nix b/configurations/profile/home/editor/emacs/default.nix index e7916cb..5f12566 100644 --- a/configurations/profile/home/editor/emacs/default.nix +++ b/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 - python3Full + nixfmt-rfc-style + (python3.withPackages (python-pkgs: with python-pkgs; [ + matplotlib + pandas + requests + ])) multimarkdown git emacs-lsp-booster diff --git a/configurations/profile/home/terminal/wezterm.nix b/configurations/profile/home/terminal/wezterm.nix index ab8fc6c..0734fb5 100644 --- a/configurations/profile/home/terminal/wezterm.nix +++ b/configurations/profile/home/terminal/wezterm.nix @@ -31,9 +31,7 @@ in ''; home.packages = [ - (lib.mkIf cfg.enableHackFont (pkgs.nerdfonts.override { - fonts = [ "Hack" ]; - })) + (lib.mkIf cfg.enableHackFont (pkgs.nerd-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'" $@ diff --git a/extraFiles/config/emacs/EMACS-CONFIG.org b/extraFiles/config/emacs/EMACS-CONFIG.org index 467ed3e..f780948 100644 --- a/extraFiles/config/emacs/EMACS-CONFIG.org +++ b/extraFiles/config/emacs/EMACS-CONFIG.org @@ -288,6 +288,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 @@ -567,17 +569,18 @@ Setting up mouse #+begin_src emacs-lisp (use-package dirvish :after (nerd-icons) - :config - (setq dired-mouse-drag-files t) - (dirvish-override-dired-mode 1) - (setq dirvish-attributes - '(vc-state - subtree-state - nerd-icons - collapse - git-msg - file-time - file-size))) + :config + (setq dired-mouse-drag-files t) + (dirvish-override-dired-mode 1) + (setq dirvish-attributes + '(vc-state + subtree-state + nerd-icons + collapse + git-msg + file-time + file-size)) + ) #+end_src *** Treemacs @@ -664,7 +667,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 +735,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 'display-line-numbers-mode) + (add-hook 'java-mode-hook #'lsp) + (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 'display-line-numbers-mode) + (add-hook 'java-ts-mode-hook #'lsp) + (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)) diff --git a/extraFiles/config/emacs/init.el b/extraFiles/config/emacs/init.el index 0249bb2..4bd86be 100644 --- a/extraFiles/config/emacs/init.el +++ b/extraFiles/config/emacs/init.el @@ -110,6 +110,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 @@ -321,17 +323,18 @@ (use-package dirvish :after (nerd-icons) - :config - (setq dired-mouse-drag-files t) - (dirvish-override-dired-mode 1) - (setq dirvish-attributes - '(vc-state - subtree-state - nerd-icons - collapse - git-msg - file-time - file-size))) + :config + (setq dired-mouse-drag-files t) + (dirvish-override-dired-mode 1) + (setq dirvish-attributes + '(vc-state + subtree-state + nerd-icons + collapse + git-msg + file-time + file-size)) + ) (use-package treemacs) (use-package treemacs-projectile @@ -385,7 +388,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 +440,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 'display-line-numbers-mode) + (add-hook 'java-mode-hook #'lsp) + (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 'display-line-numbers-mode) + (add-hook 'java-ts-mode-hook #'lsp) + (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)) diff --git a/flake.lock b/flake.lock index 962281d..64c76b7 100644 --- a/flake.lock +++ b/flake.lock @@ -159,11 +159,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1747188492, - "narHash": "sha256-9DZ/Wr6zDvb2GxgvxkGxCFJctqhn4vIPeCh+Yctflg0=", + "lastModified": 1749232178, + "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, - "narHash": "sha256-9DZ/Wr6zDvb2GxgvxkGxCFJctqhn4vIPeCh+Yctflg0=", + "lastModified": 1749232178, + "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, - "narHash": "sha256-D/6rkiC6w2p+4SwRiVKrWIeYzun8FBg7NlMKMwQMxO0=", + "lastModified": 1749154018, + "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, - "narHash": "sha256-GBZulv50wztp5cgc405t1uOkxQYhSkMqeKLI+iSrlpk=", + "lastModified": 1749243446, + "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, - "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", - "path": "/nix/store/xcqyjkljvvi1qk78la2vh5b783yzs7wl-source", - "rev": "50eee705bbdbac942074a8c120e8194185633675", + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "path": "/nix/store/dimhhb7nhymgd9f35ajdzf6xkij6rsh8-source", + "rev": "d5f1f641b289553927b3801580598d200a501863", "type": "path" }, "original": { @@ -500,11 +500,11 @@ ] }, "locked": { - "lastModified": 1747188026, - "narHash": "sha256-NjiJ2Bce5F7dn+6ZGCenzIjem2+Ei4SDF78x2wHVlOY=", + "lastModified": 1749175351, + "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, - "narHash": "sha256-NjiJ2Bce5F7dn+6ZGCenzIjem2+Ei4SDF78x2wHVlOY=", + "lastModified": 1749175351, + "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, - "narHash": "sha256-lnt9LypZVMRzRDpl+gQtrInxvsF7CL18TTEMthXz8p8=", + "lastModified": 1747602536, + "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, - "narHash": "sha256-lnt9LypZVMRzRDpl+gQtrInxvsF7CL18TTEMthXz8p8=", + "lastModified": 1747602536, + "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, - "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "lastModified": 1749195551, + "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, - "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "lastModified": 1749195551, + "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, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1748995628, + "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, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1748995628, + "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, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1749086602, + "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, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -894,11 +894,11 @@ ] }, "locked": { - "lastModified": 1742765550, - "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=", + "lastModified": 1748196248, + "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, - "narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=", + "lastModified": 1748196248, + "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, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "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, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4f6085a..5f3e9cc 100644 --- a/flake.nix +++ b/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"; };