From e48e8895f8085d9d86e7cfc942c95d7acf0c1bdb Mon Sep 17 00:00:00 2001 From: janis Date: Mon, 23 Mar 2026 10:31:00 +0100 Subject: [PATCH] updating everything 22.3.26 --- flake.lock | 87 ++++++++++++++++++++++++------------------------ flake.nix | 4 +-- home/common.nix | 2 +- home/rofi.nix | 2 +- home/sway.nix | 2 +- pkgs/nordvpn.nix | 22 ++++++------ system/fonts.nix | 2 +- user/greetd.nix | 2 +- 8 files changed, 63 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index faf3a8c..09ffe1a 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ "sf-pro": "sf-pro" }, "locked": { - "lastModified": 1758228441, - "narHash": "sha256-3mA9oFuhJ1EHyhPd17g/EuJi4jDYPGhyxkEitdh3Kmc=", + "lastModified": 1772251183, + "narHash": "sha256-Zfr9trB8LaesfpupugDgXPqC4F25MO18kyMyb9b2PkM=", "owner": "Lyndeno", "repo": "apple-fonts.nix", - "rev": "aba9944f6606a69ebedf7bfb723316139eec3f72", + "rev": "f8dad87c2cb956695d18c1f36360322d8a0b7d63", "type": "github" }, "original": { @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1762276996, - "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", + "lastModified": 1773506317, + "narHash": "sha256-qWKbLUJpavIpvOdX1fhHYm0WGerytFHRoh9lVck6Bh0=", "owner": "nix-community", "repo": "disko", - "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", + "rev": "878ec37d6a8f52c6c801d0e2a2ad554c75b9353c", "type": "github" }, "original": { @@ -74,11 +74,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1763483321, - "narHash": "sha256-HWDUa79LkobXkOWRxY4La8+msU09FijWsvTvjNEHqOc=", + "lastModified": 1773827727, + "narHash": "sha256-ju4C3oAyUWeEItQKvLvl0ME9FUsHsAJKFo2BJ9i36Jw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4bb6bffa29ffe387076109ea60abeb32667c79c7", + "rev": "73dcf114c2bab0f2bbd8b922beb1c6dafee6846c", "type": "github" }, "original": { @@ -90,11 +90,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -131,15 +131,16 @@ ] }, "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", + "lastModified": 1773681845, + "narHash": "sha256-o8hrZrigP0JYcwnglCp8Zi8jQafWsxbDtRRPzuVwFxY=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", + "rev": "0759e0e137305bc9d0c52c204c6d8dffe6f601a6", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -150,11 +151,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1763385941, - "narHash": "sha256-99CBNgyMvg3Zu/hxqixtShevrF4Kfr/qjtizQ6oseVI=", + "lastModified": 1773603777, + "narHash": "sha256-oXSEbMR/IuHYk9nvrbRhaYBxVK5s63DH2UGOZT2ok48=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "cc6483354b236c2fc95cc1d4ba1f0f40b7345e69", + "rev": "0efe7af73d6e4a8d447a22936c5526d73822b0a7", "type": "github" }, "original": { @@ -166,11 +167,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -182,27 +183,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1763334038, - "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", + "lastModified": 1773705440, + "narHash": "sha256-xB30bbAp0e7ogSEYyc126mAJMt4FRFh8wtm6ADE1xuM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", + "rev": "48652e9d5aea46e555b3df87354280d4f29cd3a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "type": "github" }, "original": { @@ -246,11 +247,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1773282481, + "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127", "type": "github" }, "original": { @@ -262,27 +263,27 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1763334038, - "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", + "lastModified": 1773705440, + "narHash": "sha256-xB30bbAp0e7ogSEYyc126mAJMt4FRFh8wtm6ADE1xuM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", + "rev": "48652e9d5aea46e555b3df87354280d4f29cd3a3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "type": "github" }, "original": { @@ -298,11 +299,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1763487813, - "narHash": "sha256-vrPM5WDjHd28iL7MZOzO503LmMPBpo21uUfUJuccI0I=", + "lastModified": 1773831707, + "narHash": "sha256-By+BDtmJTKpvZYEQndmIdvDvpk2fjW1/eG5cj8bT0J4=", "owner": "nix-community", "repo": "nur", - "rev": "5acd474dc96cb5ef48a82eb239a91df542600c75", + "rev": "afc57b7040ac8dde32ce922c8da264809f55fb43", "type": "github" }, "original": { @@ -381,7 +382,7 @@ "sf-compact": { "flake": false, "locked": { - "narHash": "sha256-WeqT80cdK/XzTLSaJs5DHodzxoeAzwL/xTgdq0YwQbM=", + "narHash": "sha256-oLhkN4HYkU1Xjxk+xdmyxJmROSzo1qd/tafdxw7icxs=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" }, @@ -429,7 +430,7 @@ "sf-pro": { "flake": false, "locked": { - "narHash": "sha256-vprahHpCUf9O8RualBrEuLEfuLfzI/2d8AQmwlCGPPk=", + "narHash": "sha256-s42hsaUe0Vkaw5yw8G7G3W3AYJb2TPqSlMqPyY0e5WU=", "type": "file", "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" }, diff --git a/flake.nix b/flake.nix index 873b38d..9501ddd 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; disko = { diff --git a/home/common.nix b/home/common.nix index 3f0203d..de4602c 100644 --- a/home/common.nix +++ b/home/common.nix @@ -19,7 +19,7 @@ in { fonts.fontconfig.enable = true; home = { - stateVersion = "25.05"; + stateVersion = "25.11"; homeDirectory = "/home/${user.username}"; username = user.username; diff --git a/home/rofi.nix b/home/rofi.nix index 257aa0a..4609e7f 100644 --- a/home/rofi.nix +++ b/home/rofi.nix @@ -237,7 +237,7 @@ configuration { ''; programs.rofi = { enable = true; - package = pkgs.rofi-wayland; + package = pkgs.rofi; terminal = "{pkgs.alacritty}/bin/alacritty"; theme = "spotlight.rasi"; diff --git a/home/sway.nix b/home/sway.nix index d34bd5c..3e66e3e 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -15,7 +15,7 @@ in { wmctrl alsa-utils wireplumber - rofi-wayland + rofi alacritty diff --git a/pkgs/nordvpn.nix b/pkgs/nordvpn.nix index 37fb7e0..40a32ab 100644 --- a/pkgs/nordvpn.nix +++ b/pkgs/nordvpn.nix @@ -13,6 +13,7 @@ cacert, libxml2, libidn2, + sqlite, libnl, libcap, libcap_ng, @@ -24,20 +25,20 @@ let buildEnv = if builtins.typeOf buildFHSEnvChroot == "set" then buildFHSEnvChroot else buildFHSUserEnv; pname = "nordvpn"; - version = "4.0.0"; + version = "4.4.0"; janis-bhm = { name = "Janis B."; email = "janis@nirgendwo.xyz"; github = "janis-bhm"; }; - libxml2_13 = libxml2.overrideAttrs rec { - version = "2.13.8"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; - }; - }; +# libxml2_13 = libxml2.overrideAttrs rec { +# version = "2.13.8"; +# src = fetchurl { +# url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; +# hash = "sha256-J3KUyzMRmrcbK8gfL0Rem8lDW4k60VuyzSsOhZoO6Eo="; +# }; +# }; nordvpnd = buildEnv { name = "nordvpnd"; @@ -66,15 +67,16 @@ ln -s ${nordvpn}/lib/nordvpn $out/usr/lib/nordvpn src = fetchurl { url = "https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/n/nordvpn/nordvpn_${version}_amd64.deb"; - hash = "sha256-elKREKiFrx2TgJPJl1ARtEebsv4PNG9fMq2mrV9xngs="; + hash = "sha256-rePBEVe6o49If5dYvIUW361E7nFqngzd+XkiOeehY7w="; }; buildInputs = [ - libxml2_13 + libxml2 libidn2 libnl libcap libcap_ng + sqlite ]; nativeBuildInputs = [ diff --git a/system/fonts.nix b/system/fonts.nix index 5fb2b62..f55ffae 100644 --- a/system/fonts.nix +++ b/system/fonts.nix @@ -4,7 +4,7 @@ packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji liberation_ttf roboto roboto-mono diff --git a/user/greetd.nix b/user/greetd.nix index 69f4bb4..0a37148 100644 --- a/user/greetd.nix +++ b/user/greetd.nix @@ -3,7 +3,7 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd 'dbus-run-session sway'"; + command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd 'dbus-run-session sway'"; user = "greeter"; }; };