From 84437c193354830b30497d67c74399d36b3fff0c Mon Sep 17 00:00:00 2001 From: Simon Cornet Date: Tue, 4 Jun 2024 17:04:19 +0200 Subject: [PATCH] [nix] feat: upgrade to 24.05 --- flake.lock | 22 +++++++++++----------- flake.nix | 4 ++-- nix/home/theme/qt.nix | 6 +++--- nix/home/zsh/zsh.nix | 2 +- nix/systems/desktop.nix | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index d3b9336..030f287 100644 --- a/flake.lock +++ b/flake.lock @@ -7,43 +7,43 @@ ] }, "locked": { - "lastModified": 1715381426, - "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1715668745, - "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", + "lastModified": 1717281328, + "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843", + "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1715897893, - "narHash": "sha256-OrvqfRNUTKNg25z7+mCLV2PAnAjvdj/Z7HeS1g5OB7E=", + "lastModified": 1717399147, + "narHash": "sha256-eCWaE/q1VItpFAxxLVt171MdtDcjEnwi6QB/yuF73JU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ea77cefecb0ab07e61d6bde3e24c7ae6820b96d5", + "rev": "4a4ecb0ab415c9fccfb005567a215e6a9564cdf5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5ceb928..7f523c2 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,10 @@ # inputs inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/nix/home/theme/qt.nix b/nix/home/theme/qt.nix index f102548..a0e0415 100644 --- a/nix/home/theme/qt.nix +++ b/nix/home/theme/qt.nix @@ -2,8 +2,8 @@ # qt qt = { - enable = true; - style.name = "adwaita-dark"; - platformTheme = "gnome"; + enable = true; + style.name = "adwaita-dark"; + platformTheme.name = "adwaita"; }; } diff --git a/nix/home/zsh/zsh.nix b/nix/home/zsh/zsh.nix index 1dfb84a..132254a 100644 --- a/nix/home/zsh/zsh.nix +++ b/nix/home/zsh/zsh.nix @@ -16,7 +16,7 @@ # settings enableCompletion = true; - enableAutosuggestions = true; + autosuggestion.enable = true; syntaxHighlighting.enable = true; # oh-my-zsh diff --git a/nix/systems/desktop.nix b/nix/systems/desktop.nix index 7421ee0..367f855 100644 --- a/nix/systems/desktop.nix +++ b/nix/systems/desktop.nix @@ -2,9 +2,9 @@ # x11 services.xserver = { - enable = true; - layout = "us"; - xkbVariant = ""; + enable = true; + xkb.layout = "us"; + xkb.variant = ""; }; # xdg portals