From 036a279ba11ccf1aa80fc7c2596cf05a1068df6c Mon Sep 17 00:00:00 2001 From: Bad Date: Mon, 6 Jun 2022 18:14:56 +0200 Subject: [PATCH] Update to 22.05 --- flake.lock | 52 ++++++++++++++++---------------- flake.nix | 2 +- hosts/teapot.nix | 1 - overlays/overrides.nix | 1 + profiles/pipewire/default.nix | 4 --- profiles/sway/default.nix | 4 +-- profiles/workstation/default.nix | 3 +- 7 files changed, 30 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 808a5ce..4b68a04 100644 --- a/flake.lock +++ b/flake.lock @@ -163,11 +163,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1654151426, - "narHash": "sha256-8KHHvaduwvobK0rEvy4eM0uEQFu+NbE3BJ9qhgEkm/w=", + "lastModified": 1654496848, + "narHash": "sha256-EbJVZtV0zvMtLt7RaIvu22S4qITlnDDoTCDQzNwvrBQ=", "owner": "nix-community", "repo": "fenix", - "rev": "b2ba32f32e5238b4c6b49f81ff3d82e4dbe7f728", + "rev": "54bbc3b0994a16ab97795e11ac6bb91d96b1b601", "type": "github" }, "original": { @@ -294,11 +294,11 @@ ] }, "locked": { - "lastModified": 1654113406, - "narHash": "sha256-70esZvhal+FsyU89mJRcAb+cDGHKt0sgZ6MlRr9Cplg=", + "lastModified": 1654422613, + "narHash": "sha256-ZxkMM13AnrMwYOV99ohzcqeTkAOqD9Q2SBdZ9WoFE9Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "684e85d01d333be91c4875baebb05b93c7d2ffaa", + "rev": "20703892473d01c70fb10248442231fe94f4ceb4", "type": "github" }, "original": { @@ -310,11 +310,11 @@ }, "latest": { "locked": { - "lastModified": 1653931853, - "narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=", + "lastModified": 1654230545, + "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457", + "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", "type": "github" }, "original": { @@ -346,16 +346,16 @@ }, "nixos": { "locked": { - "lastModified": 1653996475, - "narHash": "sha256-r/UA7h3Dfgf4dlOCkakpqejf1Tagfb+6T+9OdT0qBgU=", + "lastModified": 1654360807, + "narHash": "sha256-wYG86PUkPZ1P/oHsCpepTkb/U26poaEPPp1XFjRsgdA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3", + "rev": "d9794b04bffb468b886c553557489977ae5f4c65", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-21.11", + "ref": "nixos-22.05", "repo": "nixpkgs", "type": "github" } @@ -377,10 +377,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653830209, - "narHash": "sha256-V+HnLKJzvk2HZcLUKt9z2puZ46vLo74chOakxbLfXek=", - "path": "/nix/store/19j4q1k2fzz4axq9abqhp02s23w2p27v-source", - "rev": "cc257c49c495b2d0d7d40c5753a452d0abc8adf3", + "lastModified": 1653996475, + "narHash": "sha256-r/UA7h3Dfgf4dlOCkakpqejf1Tagfb+6T+9OdT0qBgU=", + "path": "/nix/store/1qw0ck830swiwrqkw90cxy2bm4svgjz6-source", + "rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3", "type": "path" }, "original": { @@ -390,11 +390,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1654126564, - "narHash": "sha256-sgDXDKGmUG4h7OPDOHyQggFQ08ZqVzUIPi8351yhugY=", + "lastModified": 1654398695, + "narHash": "sha256-Kw/KeoFXszNsF5mORP45mrxCP+k9Aq03hWcuWCL9sdI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1c9c23aad972787f00f175651e4cb0d7c7fd5ea", + "rev": "c5d810f4c74c824ae0fb788103003c6c9d366a08", "type": "github" }, "original": { @@ -406,11 +406,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1653931853, - "narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=", + "lastModified": 1654230545, + "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457", + "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", "type": "github" }, "original": { @@ -463,11 +463,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1654111402, - "narHash": "sha256-bPLg3p6gJ23uSC4IaYtIWj/fG6uUNHPM3xG9k2vtcZE=", + "lastModified": 1654453799, + "narHash": "sha256-wYxRnGvTvIDk9OPbXXM9j6AYtPcLHaW/SodiDy0RYYA=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "6f7c5589abfc93fbdfc071cc2716d1ea7b527e2e", + "rev": "ad6810e90bf89a4ef0ae21349d077050bc2a4fa2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 07712ae..c943a95 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ nixConfig.extra-experimental-features = "nix-command flakes"; inputs = { - nixos.url = "github:nixos/nixpkgs/nixos-21.11"; + nixos.url = "github:nixos/nixpkgs/nixos-22.05"; latest.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; diff --git a/hosts/teapot.nix b/hosts/teapot.nix index 09ce1c2..bf1a72b 100644 --- a/hosts/teapot.nix +++ b/hosts/teapot.nix @@ -10,7 +10,6 @@ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "20.09"; # Did you read the comment? - boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 7773f82..e71e59d 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -29,6 +29,7 @@ in cargo-crev cargo-fuzz tdesktop + vimPlugins neovim-unwrapped; latest = latest; diff --git a/profiles/pipewire/default.nix b/profiles/pipewire/default.nix index 7124ca5..1548f13 100644 --- a/profiles/pipewire/default.nix +++ b/profiles/pipewire/default.nix @@ -11,10 +11,6 @@ # If you want to use JACK applications, uncomment this #jack.enable = true; - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - media-session.enable = true; - #bluetooth config media-session.config.bluez-monitor.rules = [ { diff --git a/profiles/sway/default.nix b/profiles/sway/default.nix index 1145870..c3b6087 100644 --- a/profiles/sway/default.nix +++ b/profiles/sway/default.nix @@ -14,8 +14,7 @@ services.redshift = { enable = true; - # Redshift with wayland support isn't present in nixos-19.09 atm. You have to cherry-pick the commit from https://github.com/NixOS/nixpkgs/pull/68285 to do that. - package = pkgs.redshift-wlr; + package = pkgs.gammastep; brightness.night = "0.75"; }; @@ -39,7 +38,6 @@ liberation_ttf fira-code fira-code-symbols - mplus-outline-fonts dina-font proggyfonts (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) diff --git a/profiles/workstation/default.nix b/profiles/workstation/default.nix index cde60de..fe6b279 100644 --- a/profiles/workstation/default.nix +++ b/profiles/workstation/default.nix @@ -3,7 +3,6 @@ pavucontrol signal-desktop tdesktop - nheko firefox-wayland chromium nomacs @@ -18,7 +17,7 @@ cmus cmusfm ]; - services.dbus.packages = with pkgs; [ gnome3.dconf ]; + services.dbus.packages = with pkgs; [ dconf ]; services.gvfs.enable = true; services.udisks2.enable = true; services.devmon.enable = true;