From d7f1ae19f854f8c678e1a8bc39145292e2e31e31 Mon Sep 17 00:00:00 2001 From: Jakob Lechner Date: Wed, 8 Jun 2022 08:03:53 +0000 Subject: [PATCH] Bump to nixos release 22.05 --- flake.lock | 43 ++++++++----------- flake.nix | 6 +-- home-manager/modules/direnv.nix | 1 - home-manager/modules/neovim.nix | 2 +- .../modules/sway/move-to-output/default.nix | 2 +- home-manager/users/jal.nix | 6 +-- home-manager/users/jalr.nix | 7 ++- machines/cadmium/configuration.nix | 1 - machines/hafnium/configuration.nix | 1 - modules/sway.nix | 2 +- pkgs/mute-indicator/default.nix | 6 +-- 11 files changed, 33 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 436dd5d..f890cea 100644 --- a/flake.lock +++ b/flake.lock @@ -22,16 +22,16 @@ ] }, "locked": { - "lastModified": 1651519540, - "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=", + "lastModified": 1654113405, + "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0", + "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-21.11", + "ref": "release-22.05", "repo": "home-manager", "type": "github" } @@ -41,9 +41,7 @@ "flake-utils": [ "flake-utils" ], - "nixpkgs": [ - "nixpkgs-unstable" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1652714503, @@ -62,18 +60,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1654346688, - "narHash": "sha256-Y7QtZkfdxTvACCvWmDjpN6qOf4OKkZATufHcJP2VMKM=", + "lastModified": 1645655918, + "narHash": "sha256-ZfbEFRW7o237+A1P7eTKhXje435FCAoe0blj2n20Was=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2de556c4cd46a59e8ce2f85ee4dd400983213d45", + "rev": "77a7a4197740213879b9a1d2e1788c6c8ade4274", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-21.11", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-21_11": { @@ -108,29 +104,29 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs_2": { "locked": { - "lastModified": 1654230545, - "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", + "lastModified": 1654540670, + "narHash": "sha256-qNg3cUyDWvkC5AUZZEQ9WWb49Y/BT4HQ10e/8wfvcgY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", + "rev": "f05e7d39a48db1cd5bcdc7775e171779d7b4a8a6", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1654488445, - "narHash": "sha256-S22XCa7raOBV1wchfRZOYYNTOcmOfZW71OecXIs/w6s=", + "lastModified": 1654663271, + "narHash": "sha256-pxQ65qQg1n1IzXV6Tkq7cpkfsyxon21Yf+LINGOA5W8=", "owner": "nix-community", "repo": "NUR", - "rev": "7f336d5794060691d93225b2159549a32c59e687", + "rev": "59897b55e6391d99c50d86dc297babd007a74a09", "type": "github" }, "original": { @@ -144,8 +140,7 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "nix-pre-commit-hooks": "nix-pre-commit-hooks", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs": "nixpkgs_2", "nur": "nur", "sops-nix": "sops-nix" } diff --git a/flake.nix b/flake.nix index a8a8c14..9bef14a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,20 +1,18 @@ { inputs = { flake-utils.url = "github:numtide/flake-utils"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-22.05"; nur.url = "github:nix-community/NUR"; home-manager = { - url = "github:nix-community/home-manager/release-21.11"; + url = "github:nix-community/home-manager/release-22.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-pre-commit-hooks = { url = "github:cachix/pre-commit-hooks.nix/master"; inputs.flake-utils.follows = "flake-utils"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; }; sops-nix = { diff --git a/home-manager/modules/direnv.nix b/home-manager/modules/direnv.nix index d345e2d..67ff211 100644 --- a/home-manager/modules/direnv.nix +++ b/home-manager/modules/direnv.nix @@ -3,7 +3,6 @@ enable = true; nix-direnv = { enable = true; - enableFlakes = true; }; }; } diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix index e00f1c6..097c01d 100644 --- a/home-manager/modules/neovim.nix +++ b/home-manager/modules/neovim.nix @@ -102,7 +102,7 @@ -- Python lsp.pylsp.setup { on_attach = on_attach, - cmd = { "${pkgs.python38Packages.python-lsp-server}/bin/pylsp" }, + cmd = { "${pkgs.python310Packages.python-lsp-server}/bin/pylsp" }, settings = { -- https://github.com/python-lsp/python-lsp-server/blob/develop/CONFIGURATION.md pylsp = { diff --git a/home-manager/modules/sway/move-to-output/default.nix b/home-manager/modules/sway/move-to-output/default.nix index fb50d8c..a85a425 100644 --- a/home-manager/modules/sway/move-to-output/default.nix +++ b/home-manager/modules/sway/move-to-output/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/move-to-output ''; script = '' - #!${pkgs.python39}/bin/python + #!${pkgs.python310}/bin/python import sys import json import subprocess diff --git a/home-manager/users/jal.nix b/home-manager/users/jal.nix index 7f21984..d1e903c 100644 --- a/home-manager/users/jal.nix +++ b/home-manager/users/jal.nix @@ -73,9 +73,9 @@ pinentry-gnome psutils pwgen - python39 - python39Packages.virtualenv - python39Packages.ipython + python310 + python310Packages.virtualenv + python310Packages.ipython qtpass ripgrep screen diff --git a/home-manager/users/jalr.nix b/home-manager/users/jalr.nix index e398152..3669bc7 100644 --- a/home-manager/users/jalr.nix +++ b/home-manager/users/jalr.nix @@ -42,7 +42,6 @@ home.packages = with pkgs; [ audacity - axoloti claws-mail cutecom ghostscript @@ -93,9 +92,9 @@ pinentry-gnome psutils pwgen - python39 - python39Packages.virtualenv - python39Packages.ipython + python310 + python310Packages.virtualenv + python310Packages.ipython qtpass ripgrep screen diff --git a/machines/cadmium/configuration.nix b/machines/cadmium/configuration.nix index 667a557..a348040 100644 --- a/machines/cadmium/configuration.nix +++ b/machines/cadmium/configuration.nix @@ -32,7 +32,6 @@ git gnome3.adwaita-icon-theme htop - ike jq neovim openconnect diff --git a/machines/hafnium/configuration.nix b/machines/hafnium/configuration.nix index 7c3ca28..6cfee58 100644 --- a/machines/hafnium/configuration.nix +++ b/machines/hafnium/configuration.nix @@ -38,7 +38,6 @@ git gnome3.adwaita-icon-theme htop - ike jq neovim openconnect diff --git a/modules/sway.nix b/modules/sway.nix index ce79456..dff050e 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -7,7 +7,7 @@ lib.mkIf config.myConfig.gui.enable { extraPackages = with pkgs; [ grim mako - redshift-wlr + gammastep slurp wl-clipboard xwayland diff --git a/pkgs/mute-indicator/default.nix b/pkgs/mute-indicator/default.nix index 0f44e4d..e80b205 100644 --- a/pkgs/mute-indicator/default.nix +++ b/pkgs/mute-indicator/default.nix @@ -1,12 +1,12 @@ -{ python39Packages }: +{ python310Packages }: -python39Packages.buildPythonApplication rec { +python310Packages.buildPythonApplication rec { pname = "mute-indicator"; version = "0.0.1"; src = ./.; - propagatedBuildInputs = with python39Packages; [ + propagatedBuildInputs = with python310Packages; [ python pulsectl pyserial