diff --git a/flake.lock b/flake.lock index 4034175..18c7866 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1718251401, - "narHash": "sha256-enzmGqA0Cjwoh3ptVvbFh+ZUxwavM0awYJPK/KnLH3E=", + "lastModified": 1719388037, + "narHash": "sha256-AcOvEYNewKPXvEu8x9JlsM82oNoehYlWKA+Q3+G6oXY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "89accb69b1fd641dbafba9619a30b50af318820b", + "rev": "b2d901e08677c84157d59b9b87f60f93282deefd", "type": "gitlab" }, "original": { @@ -45,16 +45,16 @@ ] }, "locked": { - "lastModified": 1717476296, - "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1717181720, - "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", + "lastModified": 1718450675, + "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", + "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", "type": "github" }, "original": { @@ -101,11 +101,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1718273282, - "narHash": "sha256-loI4wyTNGv1v6xr/FfbikS+DdB1CN6/3yAaDoNhfK14=", + "lastModified": 1719350558, + "narHash": "sha256-xZqPfxOvvBWPTfJnxoyUVewVQjQssxETYbxZ+fySFhg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e6d10539af1fdca33b10bc3c1dfac16f1cdfe1c8", + "rev": "e4d09aa3a9de9a9e71c10bf4b6800585b3db9a4c", "type": "github" }, "original": { @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1718111105, - "narHash": "sha256-sLGohaz+8pCce4+wehXSlwOu7c7+We4Zc1ToXGCJYfs=", + "lastModified": 1719318037, + "narHash": "sha256-TnlAcO5K2gkab0mpKurP5Co6eWRycP/KbFqWNS2rsMA=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "151102b7d7c4f61ff42f275e72008d28318dac96", + "rev": "3ae670253a5a3ae1e3a3104fb732a8c990a31487", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1717881334, - "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", + "lastModified": 1719316102, + "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", + "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085", "type": "github" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1717784906, - "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", + "lastModified": 1719067853, + "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", + "rev": "914f083741e694092ee60a39d31f693d0a6dc734", "type": "github" }, "original": { @@ -252,11 +252,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1718265846, - "narHash": "sha256-h4MnTID6ciFxtTvtl+ibXMKaG6iLMezCtUvKIfFG7r0=", + "lastModified": 1719391814, + "narHash": "sha256-zlRvpIUQrxMSOi+1lVFuJNvIJt9LB93c05tYQ1KSdRg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d75003136c0fc94ee60e51806c2801ff572d06a6", + "rev": "aab67495e34365045f9dfbe58725cc6fa03607b7", "type": "github" }, "original": { @@ -268,27 +268,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718060059, - "narHash": "sha256-9XKFni8VMXo81RTq9XygCyaO3I/7UKpwIlM/yn0MdcM=", + "lastModified": 1719253556, + "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3c8d64ba846725f040582b2d3b875466d2115bd", + "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1717880976, - "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", + "lastModified": 1719099622, + "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", + "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -324,11 +324,11 @@ ] }, "locked": { - "lastModified": 1718268835, - "narHash": "sha256-+RcwrOnwSwWeXGpXNpNJxDqOnRp2vj5qylP/m3z3pfE=", + "lastModified": 1719340029, + "narHash": "sha256-j++6RRMNvw+aYwI9qC2svfRwNj/2EEnaty552VIAFX0=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b12a9715f8fb9303a6fa1b65a8a7488592f0e46b", + "rev": "004923027388062be53d5b489be51c59c114d857", "type": "github" }, "original": { @@ -358,11 +358,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1718137936, - "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=", + "lastModified": 1719268571, + "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6", + "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "type": "github" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1717918856, - "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", + "lastModified": 1718619174, + "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "72907822c19afc0983c69d59d299204381623725", + "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1b543b4..afe871f 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "Nixos config flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { diff --git a/home/jonas/home.nix b/home/jonas/home.nix index a9159db..44e5638 100644 --- a/home/jonas/home.nix +++ b/home/jonas/home.nix @@ -56,7 +56,7 @@ # You should not change this value, even if you update Home Manager. If you do # want to update the value, then make sure to first check the Home Manager # release notes. - home.stateVersion = "23.11"; # Please read the comment before changing. + home.stateVersion = "24.05"; # Please read the comment before changing. # The home.packages option allows you to install Nix packages into your # environment. diff --git a/home/jonas/mqtt-explorer/mqtt-explorer.nix b/home/jonas/mqtt-explorer/mqtt-explorer.nix index 28a0c83..9f11deb 100644 --- a/home/jonas/mqtt-explorer/mqtt-explorer.nix +++ b/home/jonas/mqtt-explorer/mqtt-explorer.nix @@ -3,7 +3,7 @@ lib, fetchurl, appimageTools, - electron_25, + electron_27, makeWrapper, }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -m 444 -D resources/app.asar $out/libexec/app.asar install -m 444 -D mqtt-explorer.png $out/share/icons/mqtt-explorer.png install -m 444 -D mqtt-explorer.desktop $out/share/applications/mqtt-explorer.desktop - makeWrapper ${electron_25}/bin/electron $out/bin/mqtt-explorer --add-flags $out/libexec/app.asar + makeWrapper ${electron_27}/bin/electron $out/bin/mqtt-explorer --add-flags $out/libexec/app.asar ''; meta = with lib; { description = "A comprehensive and easy-to-use MQTT Client"; @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { url = "https://spdx.org/licenses/CC-BY-ND-4.0.html"; }; maintainers = [maintainers.yorickvp]; - inherit (electron_25.meta) platforms; + inherit (electron_27.meta) platforms; }; } diff --git a/home/jonas/yubikey.nix b/home/jonas/yubikey.nix index a0ed340..cfbc02b 100644 --- a/home/jonas/yubikey.nix +++ b/home/jonas/yubikey.nix @@ -1,4 +1,4 @@ -{config, ...}: { +{config, pkgs, ...}: { programs.gpg = { enable = true; mutableKeys = false; @@ -14,7 +14,7 @@ enable = true; enableSshSupport = true; enableZshIntegration = true; - pinentryFlavor = "qt"; + pinentryPackage = pkgs.pinentry.qt; extraConfig = '' allow-emacs-pinentry ''; diff --git a/hosts/comfy-station/configuration.nix b/hosts/comfy-station/configuration.nix index 0d6d0a6..d3cdcd8 100644 --- a/hosts/comfy-station/configuration.nix +++ b/hosts/comfy-station/configuration.nix @@ -90,7 +90,7 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? # boot boot.loader.systemd-boot.enable = true; diff --git a/hosts/vm/configuration.nix b/hosts/vm/configuration.nix index 3470ed0..c5167e5 100644 --- a/hosts/vm/configuration.nix +++ b/hosts/vm/configuration.nix @@ -74,7 +74,7 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? # boot boot.loader.systemd-boot.enable = true;