From 33174e7bc2a04db3519e1f34dedba3c5ff3db5ef Mon Sep 17 00:00:00 2001 From: Tomas Rivera Date: Sat, 30 May 2026 13:00:07 +0200 Subject: [PATCH] nixos: 25.11 -> 26.05 --- flake.lock | 16 ++++++++-------- flake.nix | 4 ++-- modules/applications/anki.nix | 2 +- modules/applications/hyprland.nix | 7 ++++--- modules/applications/hyprlandScripts.nix | 12 ++++++------ modules/applications/neovim.nix | 4 +++- modules/applications/ssh.nix | 17 +++++++++-------- modules/systems.nix | 8 -------- .../utilities/communicationAndNotification.nix | 2 +- modules/utilities/development.nix | 2 +- modules/utilities/documentation.nix | 2 +- 11 files changed, 36 insertions(+), 40 deletions(-) delete mode 100644 modules/systems.nix diff --git a/flake.lock b/flake.lock index 8bc3c3c..90f02bc 100755 --- a/flake.lock +++ b/flake.lock @@ -89,16 +89,16 @@ ] }, "locked": { - "lastModified": 1779506708, - "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", + "lastModified": 1779726825, + "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", + "rev": "b179bde238977f7d4454fc770b1a727eaf55111c", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -201,16 +201,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1779796641, - "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", + "lastModified": 1779971959, + "narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25f538306313eae3927264466c70d7001dcea1df", + "rev": "ec942ba042dad5ef097e2ef3a3effc034241f011", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 0dd2610..806f1a1 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "Nixos config flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # used for some packages nixos-grub-themes.url = "github:jeslie0/nixos-grub-themes"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; notewrapper = { diff --git a/modules/applications/anki.nix b/modules/applications/anki.nix index eaa1cd3..eab1f29 100644 --- a/modules/applications/anki.nix +++ b/modules/applications/anki.nix @@ -57,7 +57,7 @@ _: { # we enable system wide with nixpkgs because it offers some addon configuration. We just use this for some config #enable = true; theme = "dark"; - sync = { + profiles."User 1".sync = { autoSync = true; autoSyncMediaMinutes = 10; syncMedia = true; diff --git a/modules/applications/hyprland.nix b/modules/applications/hyprland.nix index 361e60a..2638d2c 100644 --- a/modules/applications/hyprland.nix +++ b/modules/applications/hyprland.nix @@ -5,7 +5,7 @@ ... }: { environment.systemPackages = with pkgs; [ - swww #wallpaper daemon + awww #wallpaper daemon gruvbox-gtk-theme hyprcursor capitaine-cursors-themed # cursor theme @@ -60,6 +60,7 @@ #pkgs-unstable.hyprlandPlugins.hyprspace # currently broken #pkgs-unstable.hyprlandPlugins.hypr-dynamic-cursors # currently broken ]; + wayland.windowManager.hyprland.configType = "hyprlang"; wayland.windowManager.hyprland.settings = { "$mod" = "SUPER"; "$term" = "kitty"; @@ -260,8 +261,8 @@ "custom-batterywarning" #"birdtray" # thunderbird tray app # curently broken #wallpapers/b - "swww img ${wallpaper}" - "swww-daemon" + "awww img ${wallpaper}" + "awww-daemon" "sleep 1 && custom-wallpaper" "custom-checkKdrive && custom-mountkdrive" # checks if the remote works and mount it #"waybar" diff --git a/modules/applications/hyprlandScripts.nix b/modules/applications/hyprlandScripts.nix index 224ff53..957ba89 100644 --- a/modules/applications/hyprlandScripts.nix +++ b/modules/applications/hyprlandScripts.nix @@ -49,7 +49,7 @@ _: { name = "custom-wallpaper"; runtimeInputs = with pkgs; [ socat - swww + awww ]; text = '' handle() { @@ -60,19 +60,19 @@ _: { workspace="''${str:$i:1}" case $workspace in 1 | 6) - swww img -t none ${wallpaper1} + awww img -t none ${wallpaper1} ;; 2 | 7) - swww img -t none ${wallpaper2} + awww img -t none ${wallpaper2} ;; 3 | 8) - swww img -t none ${wallpaper3} + awww img -t none ${wallpaper3} ;; 4 | 9) - swww img -t none ${wallpaper4} + awww img -t none ${wallpaper4} ;; 5 | 10 | 0) - swww img -t none ${wallpaper5} + awww img -t none ${wallpaper5} ;; esac ;; diff --git a/modules/applications/neovim.nix b/modules/applications/neovim.nix index afb3f1b..8c3858a 100644 --- a/modules/applications/neovim.nix +++ b/modules/applications/neovim.nix @@ -1,6 +1,8 @@ _: { flake.homeModules.neovim = {pkgs-unstable, ...}: { programs.neovim = { + withRuby = false; + withPython3 = false; enable = true; vimAlias = false; viAlias = false; @@ -63,7 +65,7 @@ _: { pkgs-unstable.vimPlugins.better-diagnostic-virtual-text pkgs-unstable.vimPlugins.garbage-day-nvim ]; - extraLuaConfig = '' + initLua = '' local vim = vim diff --git a/modules/applications/ssh.nix b/modules/applications/ssh.nix index 491d1a6..7d56ea4 100644 --- a/modules/applications/ssh.nix +++ b/modules/applications/ssh.nix @@ -3,19 +3,20 @@ _: { programs.ssh = { enable = true; enableDefaultConfig = false; # will be removed in the futur. Removes evaluation warning - matchBlocks."*" = { + /*settings = { # equivalent to the default config - forwardAgent = false; - addKeysToAgent = "no"; - compression = false; + #forwardAgent = false; + # give errors in home-manager 26.05 + #addKeysToAgent = "no"; + #compression = false; serverAliveInterval = 0; serverAliveCountMax = 3; hashKnownHosts = false; userKnownHostsFile = "~/.ssh/known_hosts"; - controlMaster = "no"; - controlPath = "~/.ssh/master-%r@%n:%p"; - controlPersist = "no"; - }; + #controlMaster = "no"; + #controlPath = "~/.ssh/master-%r@%n:%p"; + #controlPersist = "no"; + };*/ }; services.ssh-agent.enable = true; home.file.".ssh/config".text = '' diff --git a/modules/systems.nix b/modules/systems.nix deleted file mode 100644 index 627dd9f..0000000 --- a/modules/systems.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - systems = [ - "x86_64-linux" - #"aarch64-linux" - #"x86_64-darwin" - #"aarch64-darwin" - ]; -} diff --git a/modules/utilities/communicationAndNotification.nix b/modules/utilities/communicationAndNotification.nix index 24c162d..d210a77 100644 --- a/modules/utilities/communicationAndNotification.nix +++ b/modules/utilities/communicationAndNotification.nix @@ -2,7 +2,7 @@ flake.nixosModules.notifications = {pkgs, ...}: { environment.systemPackages = with pkgs; [ libnotify # Library that sends desktop notifications to a notification daemon - socat # Utility for bidirectional data transfer between two independent data channels (used to communicate between hyprland and swww to change wallpapers dinamically) + socat # Utility for bidirectional data transfer between two independent data channels (used to communicate between hyprland and awww to change wallpapers dinamically) matrix-commander-rs # matrix client used to send notifications from scripts to my phone # battery notifications self.packages.${pkgs.system}.custom-batterynotify diff --git a/modules/utilities/development.nix b/modules/utilities/development.nix index bfca416..5a454ed 100644 --- a/modules/utilities/development.nix +++ b/modules/utilities/development.nix @@ -27,7 +27,7 @@ _: { cling # c interpreter used for coding # lsp clang-tools - python311Packages.python-lsp-server + python314Packages.python-lsp-server ltex-ls-plus pylint black diff --git a/modules/utilities/documentation.nix b/modules/utilities/documentation.nix index e1be8ff..e18f5ae 100644 --- a/modules/utilities/documentation.nix +++ b/modules/utilities/documentation.nix @@ -3,7 +3,7 @@ in { flake.nixosModules.documentation = {pkgs, ...}: { # unfortunatly this adds a lot of computation when nix rebuilds - documentation.man.generateCaches = true; # used for the man script + documentation.man.cache.enable = true; # used for the man script environment.pathsToLink = [ # see https://wiki.nixos.org/wiki/Documentation_Gaps#How_do_manpages_work?_Or:_environment.pathsToLink_and_buildEnv