From df6c1c9402579838a11d66bf233c5bf0c13f3016 Mon Sep 17 00:00:00 2001 From: marc Date: Sat, 24 May 2025 19:06:04 +0200 Subject: [PATCH] Upgrade to nixpkgs 25.05 --- flake.lock | 502 ++++++++++++++++++++++++++++- flake.nix | 13 +- hosts/reykjavik/default.nix | 2 +- modules/app/alacritty.nix | 2 +- modules/app/yazi.nix | 2 +- modules/common.nix | 2 +- modules/desktop/tools/hyprlock.nix | 12 +- modules/desktop/wm/hyprland.nix | 4 +- modules/desktop/wm/i3.nix | 2 +- modules/shell/zsh.nix | 45 +-- 10 files changed, 539 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 77041a8..0c865ef 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,39 @@ "type": "github" } }, + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1747864449, + "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "base16-schemes": { "flake": false, "locked": { @@ -58,6 +91,44 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "hyprland", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -86,20 +157,69 @@ ] }, "locked": { - "lastModified": 1733050161, - "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, + "hy3": { + "inputs": { + "hyprland": [ + "hyprland" + ] + }, + "locked": { + "lastModified": 1747077256, + "narHash": "sha256-ryaXKevnISRiJb93QIAv7tGc6ZJqSkwETKm4oGh8HWI=", + "owner": "outfoxxed", + "repo": "hy3", + "rev": "567dc9dd20e15d95a56a81c516a70dba30bc2c9c", + "type": "github" + }, + "original": { + "owner": "outfoxxed", + "repo": "hy3", + "type": "github" + } + }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1745948457, + "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "ac903e80b33ba6a88df83d02232483d99f327573", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprcursor-rose-pine": { "inputs": { "hyprlang": "hyprlang", @@ -120,6 +240,187 @@ "type": "github" } }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1745015490, + "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "60754910946b4e2dc1377b967b7156cb989c5873", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "aquamarine": "aquamarine", + "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", + "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": "nixpkgs_3", + "pre-commit-hooks": "pre-commit-hooks", + "systems": "systems_4", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1748036495, + "narHash": "sha256-kYyrhoxu8pZ/YHd2Yy2VNaRGeqydOh1OTayvknhweGg=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "81cd526f923f4a9074bbfef59b4c7e9f3350c349", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1748089895, + "narHash": "sha256-XS2inFEyCsA91E2yRUlylHN7DUBwbLpqX1og4JDSXoE=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "c04dee3d0cd92423a2b970614ec4b423cf5a3f9c", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1743714874, + "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "8810df502cdee755993cb803eba7b23f189db795", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, + "hyprland-qtutils": { + "inputs": { + "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-qtutils", + "hyprlang", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1745951494, + "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "nixpkgs": [ @@ -142,6 +443,85 @@ "type": "github" } }, + "hyprlang_2": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1747484975, + "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "163c83b3db48a17c113729c220a60b94596c9291", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1746635225, + "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "674ea57373f08b7609ce93baff131117a0dfe70d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1747584298, + "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -226,21 +606,37 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", - "owner": "nixos", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-24.11", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { + "locked": { + "lastModified": 1747953325, + "narHash": "sha256-y2ZtlIlNTuVJUZCqzZAhIw5rrKP4DOSklev6c8PyCkQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "55d1f923c480dadce40f5231feb472e81b0bab48", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1727348695, "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", @@ -271,14 +667,40 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager_2", + "hy3": "hy3", "hyprcursor-rose-pine": "hyprcursor-rose-pine", + "hyprland": "hyprland", + "hyprland-plugins": "hyprland-plugins", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", "zen-browser": "zen-browser" } @@ -328,6 +750,21 @@ "type": "github" } }, + "systems_4": { + "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" + } + }, "utils": { "inputs": { "systems": "systems_3" @@ -346,9 +783,50 @@ "type": "github" } }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1745871725, + "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1739222645, diff --git a/flake.nix b/flake.nix index ee4f080..7cbc662 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,10 @@ inputs = { # - Nixpkgs ---------------------------------- - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; # - Home Manager ----------------------------- - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # - Agenix ----------------------------------- @@ -26,6 +26,15 @@ nix-colors.url = "github:misterio77/nix-colors"; # - Hyprland --------------------------------- + hyprland.url = "github:hyprwm/Hyprland"; + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland"; + }; + hy3 = { + url = "github:outfoxxed/hy3"; + inputs.hyprland.follows = "hyprland"; + }; hyprcursor-rose-pine.url = "github:ndom91/rose-pine-hyprcursor"; # - More stuff ------------------------------- diff --git a/hosts/reykjavik/default.nix b/hosts/reykjavik/default.nix index 10250ef..3d76375 100644 --- a/hosts/reykjavik/default.nix +++ b/hosts/reykjavik/default.nix @@ -92,7 +92,7 @@ in # - Other apps ------------------------------- app.spotify.enable = true; - app.skype.enable = true; + # app.skype.enable = true; app.nextcloud.enable = true; app.yazi.enable = true; diff --git a/modules/app/alacritty.nix b/modules/app/alacritty.nix index 1c59a0b..4a27b04 100644 --- a/modules/app/alacritty.nix +++ b/modules/app/alacritty.nix @@ -18,7 +18,7 @@ in fonts.packages = with pkgs; [ iosevka - (nerdfonts.override { fonts = [ "Iosevka" ]; }) + pkgs.nerd-fonts.iosevka ]; hm.xdg.configFile."alacritty/alacritty.toml".source = ../../config/alacritty/alacritty.toml; diff --git a/modules/app/yazi.nix b/modules/app/yazi.nix index bcd460b..ec8bc62 100644 --- a/modules/app/yazi.nix +++ b/modules/app/yazi.nix @@ -26,7 +26,7 @@ in fonts.packages = with pkgs; [ iosevka - (nerdfonts.override { fonts = [ "Iosevka" ]; }) + pkgs.nerd-fonts.iosevka ]; diff --git a/modules/common.nix b/modules/common.nix index 1312ce3..ee57bf9 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -27,7 +27,7 @@ # - Locale ------------------------------------- time.timeZone = "Europe/Madrid"; - i18n.defaultLocale = "ca_ES.utf8"; + i18n.defaultLocale = "ca_ES.UTF-8"; console.keyMap = "es"; services.xserver.xkb = { layout = "es"; diff --git a/modules/desktop/tools/hyprlock.nix b/modules/desktop/tools/hyprlock.nix index c3b6378..964bb6a 100644 --- a/modules/desktop/tools/hyprlock.nix +++ b/modules/desktop/tools/hyprlock.nix @@ -12,9 +12,9 @@ in config = mkIf cfg.enable { - # environment.systemPackages = with pkgs; [ - # hypridle - # ]; + environment.systemPackages = with pkgs; [ + hypridle + ]; hm.programs.hyprlock = { enable = true; @@ -107,9 +107,9 @@ in }; # - Execute on startup ----------------------- - # hm.wayland.windowManager.hyprland.settings.exec-once = [ - # "hypridle" - # ]; + hm.wayland.windowManager.hyprland.settings.exec-once = [ + "hypridle" + ]; }; } diff --git a/modules/desktop/wm/hyprland.nix b/modules/desktop/wm/hyprland.nix index 0470b8b..bb2bd7c 100644 --- a/modules/desktop/wm/hyprland.nix +++ b/modules/desktop/wm/hyprland.nix @@ -24,13 +24,13 @@ in { hm.wayland.windowManager.hyprland = { enable = true; - package = pkgs.hyprland; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; xwayland.enable = true; systemd.enable = true; plugins = [ - pkgs.hyprlandPlugins.hy3 + inputs.hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3 ]; settings = { diff --git a/modules/desktop/wm/i3.nix b/modules/desktop/wm/i3.nix index 9077b03..9e51090 100644 --- a/modules/desktop/wm/i3.nix +++ b/modules/desktop/wm/i3.nix @@ -31,7 +31,7 @@ in { fonts.packages = with pkgs; [ iosevka - (nerdfonts.override { fonts = [ "Iosevka" ]; }) + pkgs.nerd-fonts.iosevka ]; services.xserver = { diff --git a/modules/shell/zsh.nix b/modules/shell/zsh.nix index 04ccb2a..2cbc474 100644 --- a/modules/shell/zsh.nix +++ b/modules/shell/zsh.nix @@ -23,27 +23,32 @@ in enableCompletion = true; syntaxHighlighting.enable = true; - initExtra = '' - # Source generic (bash) configuration - if [ -d $HOME/.config/shell/sh ]; then - for rc in $HOME/.config/shell/sh/*.sh; do - emulate bash -c ". $rc" - done - fi + initContent = let + zshConfigBeforeCompInit = lib.mkOrder 550 '' + # p10k instant prompt + P10K_INSTANT_PROMPT="$XDG_CACHE_HOME/p10k-instant-prompt-''${(%):-%n}.zsh" + [[ ! -r "$P10K_INSTANT_PROMPT" ]] || source "$P10K_INSTANT_PROMPT" + ''; + zshConfig = lib.mkOrder 1000 '' + # Source generic (bash) configuration + if [ -d $HOME/.config/shell/sh ]; then + for rc in $HOME/.config/shell/sh/*.sh; do + emulate bash -c ". $rc" + done + fi - # Source zsh specific configuration - if [[ -d $HOME/.config/shell/zsh ]]; then - for rc in $HOME/.config/shell/zsh/*.zsh; do - source $rc - done - fi - ''; - - initExtraBeforeCompInit = '' - # p10k instant prompt - P10K_INSTANT_PROMPT="$XDG_CACHE_HOME/p10k-instant-prompt-''${(%):-%n}.zsh" - [[ ! -r "$P10K_INSTANT_PROMPT" ]] || source "$P10K_INSTANT_PROMPT" - ''; + # Source zsh specific configuration + if [[ -d $HOME/.config/shell/zsh ]]; then + for rc in $HOME/.config/shell/zsh/*.zsh; do + source $rc + done + fi + ''; + in + lib.mkMerge [ + zshConfigBeforeCompInit + zshConfig + ]; oh-my-zsh = { enable = true;