From ff91b3b5801b1090bdf2c9c1a9d89a4871f568b4 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Mon, 3 Jun 2024 00:08:07 +0300 Subject: [PATCH] flake.lock: update nixpkgs to 24.05 --- flake.lock | 136 ++++++++++-------- flake.nix | 5 +- .../hardware-configuration/default.nix | 2 +- modules/home-manager/shell.nix | 2 +- modules/nixos/configs/keyboard.nix | 8 +- .../nixos/configs/window-manager/hyprland.nix | 2 +- .../nixos/configs/window-manager/river.nix | 2 +- .../nixos/configs/window-manager/xmonad.nix | 13 +- .../nixos/services/vpn/wireguard/client.nix | 1 - 9 files changed, 93 insertions(+), 78 deletions(-) diff --git a/flake.lock b/flake.lock index 3dd9d8d..73c0cbb 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715290355, - "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1716431128, - "narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=", + "lastModified": 1717177033, + "narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=", "owner": "nix-community", "repo": "disko", - "rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606", + "rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c", "type": "github" }, "original": { @@ -50,11 +50,11 @@ }, "locked": { "dir": "repos/rycee/pkgs/firefox-addons", - "lastModified": 1713127732, - "narHash": "sha256-07prd+in1ZUcxETxPyWtFjl7xPKwlXzk9a47Q3RnHXU=", + "lastModified": 1717274801, + "narHash": "sha256-0SQNBxZYxVn6p7gV5QdoYfF1V3mYBf3p0lgvNBqOJro=", "owner": "nix-community", "repo": "nur-combined", - "rev": "6edb2a1a43dbd2f8b32876268a530ce82c64013f", + "rev": "ce8121e22717421b50b1a30b0b33bd3a589ece0b", "type": "github" }, "original": { @@ -99,12 +99,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -114,24 +117,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "inputs": { "systems": "systems_3" }, @@ -149,13 +134,31 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "hardware": { "locked": { - "lastModified": 1716173274, - "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", + "lastModified": 1717248095, + "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", + "rev": "7b49d3967613d9aacac5b340ef158d493906ba79", "type": "github" }, "original": { @@ -193,11 +196,11 @@ ] }, "locked": { - "lastModified": 1713818326, - "narHash": "sha256-aw3xbVPJauLk/bbrlakIYxKpeuMWzA2feGrkIpIuXd8=", + "lastModified": 1717097707, + "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", "owner": "nix-community", "repo": "home-manager", - "rev": "67de98ae6eed5ad6f91b1142356d71a87ba97f21", + "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", "type": "github" }, "original": { @@ -214,16 +217,16 @@ ] }, "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" } @@ -251,11 +254,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1713168888, - "narHash": "sha256-pNd6KbkLlZtXKQvHWYwQB/Wbqa7lQYVffpSq5uWJqzQ=", + "lastModified": 1716358004, + "narHash": "sha256-5j0+zAJeoIL2mKYwnOGqoXBwaPtTD45bfijj6F7wl78=", "owner": "feschber", "repo": "lan-mouse", - "rev": "36855a1a1767f4a777bad580d5a76fec1be5d9d1", + "rev": "5fd3b719d6f6c8b1778d6e25c03b73ff88f63ad2", "type": "github" }, "original": { @@ -275,11 +278,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1714571717, - "narHash": "sha256-o4tqlTzi9kcVub167kTGXgCac9jM3kW4+v9MH/ue4Hk=", + "lastModified": 1717086091, + "narHash": "sha256-GmsEQa4HZeMfec37LZnwG/Lt/XmqFLXsjv5QWojeNiM=", "owner": "oxalica", "repo": "nil", - "rev": "2f3ed6348bbf1440fcd1ab0411271497a0fbbfa4", + "rev": "ab3ddb8f063774cf7e22eb610f5ecfdb77309f3c", "type": "github" }, "original": { @@ -357,11 +360,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716128955, - "narHash": "sha256-3DNg/PV+X2V7yn8b/fUR2ppakw7D9N4sjVBGk6nDwII=", + "lastModified": 1717112898, + "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9256de8281f2ccd04985ac5c30d8f69aefadbe8", + "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0", "type": "github" }, "original": { @@ -373,16 +376,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716061101, - "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -430,11 +433,11 @@ ] }, "locked": { - "lastModified": 1710987136, - "narHash": "sha256-Q8GRdlAIKZ8tJUXrbcRO1pA33AdoPfTUirsSnmGQnOU=", + "lastModified": 1716257780, + "narHash": "sha256-R+NjvJzKEkTVCmdrKRfPE4liX/KMGVqGUwwS5H8ET8A=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "97596b54ac34ad8184ca1eef44b1ec2e5c2b5f9e", + "rev": "4e5e3d2c5c9b2721bd266f9e43c14e96811b89d2", "type": "github" }, "original": { @@ -455,11 +458,11 @@ ] }, "locked": { - "lastModified": 1714529851, - "narHash": "sha256-YMKJW880f7LHXVRzu93xa6Ek+QLECIu0IRQbXbzZe38=", + "lastModified": 1717035469, + "narHash": "sha256-MzH+yjKULH3HCRj9QCTwBvqq4LZkR0ZqRE/QfGOGC2E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9ca720fdcf7865385ae3b93ecdf65f1a64cb475e", + "rev": "095702e63a40e86f339d11864da9dc965b70a01e", "type": "github" }, "original": { @@ -532,6 +535,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "wired": { "inputs": { "flake-parts": "flake-parts", diff --git a/flake.nix b/flake.nix index f744bcc..0fe67a9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { flake-utils.url = "github:numtide/flake-utils"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; hardware.url = "github:NixOS/nixos-hardware/master"; impermanence.url = "github:nix-community/impermanence"; @@ -19,7 +19,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; home-manager-unstable = { @@ -170,7 +170,6 @@ ./modules/home-manager inputs.wired.homeManagerModules.default inputs.lan-mouse.homeManagerModules.default - "${inputs.home-manager-unstable}/modules/services/window-managers/river.nix" ]; } ]; diff --git a/hosts/asus-gl553vd/hardware-configuration/default.nix b/hosts/asus-gl553vd/hardware-configuration/default.nix index 4417a9f..f4c18bf 100644 --- a/hosts/asus-gl553vd/hardware-configuration/default.nix +++ b/hosts/asus-gl553vd/hardware-configuration/default.nix @@ -20,7 +20,7 @@ }; # configure mouse and touchpad - services.xserver.libinput = { + services.libinput = { enable = true; touchpad = { accelSpeed = "0.5"; diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix index 25eaef4..ab0c409 100644 --- a/modules/home-manager/shell.nix +++ b/modules/home-manager/shell.nix @@ -9,7 +9,7 @@ programs.zsh = { enable = true; - enableAutosuggestions = true; + autosuggestion.enable = true; enableCompletion = true; defaultKeymap = "viins"; dotDir = ".config/zsh"; diff --git a/modules/nixos/configs/keyboard.nix b/modules/nixos/configs/keyboard.nix index fe8e5c2..3a831b9 100644 --- a/modules/nixos/configs/keyboard.nix +++ b/modules/nixos/configs/keyboard.nix @@ -9,11 +9,11 @@ in }; config = lib.mkIf cfg.enable { - services.xserver = { - xkbModel = "pc105"; + services.xserver.xkb = { + model = "pc105"; layout = "us,us"; - xkbVariant = "dvorak,"; - xkbOptions = "grp:win_space_toggle"; + variant = "dvorak,"; + options = "grp:win_space_toggle"; }; console.useXkbConfig = true; diff --git a/modules/nixos/configs/window-manager/hyprland.nix b/modules/nixos/configs/window-manager/hyprland.nix index 1acbd08..de30243 100644 --- a/modules/nixos/configs/window-manager/hyprland.nix +++ b/modules/nixos/configs/window-manager/hyprland.nix @@ -14,7 +14,7 @@ in package = pkgs.unstable.hyprland; }; - programs.gnupg.agent.pinentryFlavor = "gtk2"; + programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2; local.lockscreen.waylock.enable = lib.mkDefault true; }; diff --git a/modules/nixos/configs/window-manager/river.nix b/modules/nixos/configs/window-manager/river.nix index c0f932a..3ad9e02 100644 --- a/modules/nixos/configs/window-manager/river.nix +++ b/modules/nixos/configs/window-manager/river.nix @@ -14,7 +14,7 @@ in package = pkgs.unstable.river; }; - programs.gnupg.agent.pinentryFlavor = "gtk2"; + programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2; local.lockscreen.waylock.enable = lib.mkDefault true; }; diff --git a/modules/nixos/configs/window-manager/xmonad.nix b/modules/nixos/configs/window-manager/xmonad.nix index 2addc36..98bb213 100644 --- a/modules/nixos/configs/window-manager/xmonad.nix +++ b/modules/nixos/configs/window-manager/xmonad.nix @@ -10,19 +10,18 @@ let cfg = config.local.window-manager.xmonad; in packages = [ pkgs.dconf ]; }; + services.displayManager.defaultSession = "none+xmonad"; + services.xserver = { enable = true; - displayManager = { - defaultSession = "none+xmonad"; - lightdm = { - enable = true; - # greeters.tiny.enable = true; - }; + displayManager.lightdm = { + enable = true; + # greeters.tiny.enable = true; }; windowManager.xmonad.enable = true; }; - programs.gnupg.agent.pinentryFlavor = "gtk2"; + programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2; local.lockscreen.i3lock.enable = lib.mkDefault true; }; diff --git a/modules/nixos/services/vpn/wireguard/client.nix b/modules/nixos/services/vpn/wireguard/client.nix index 5893f64..7274212 100644 --- a/modules/nixos/services/vpn/wireguard/client.nix +++ b/modules/nixos/services/vpn/wireguard/client.nix @@ -8,7 +8,6 @@ in enable = mkEnableOption "Enable wireguard vpn"; ip = mkOption { type = types.str; - description = "10.100.0./24"; example = "10.100.0.1/24"; }; privateKeyFile = mkOption {