Update to 22.05

This commit is contained in:
Bad 2022-06-06 18:14:56 +02:00
parent 5b79ea1e60
commit 036a279ba1
7 changed files with 30 additions and 37 deletions

View file

@ -163,11 +163,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1654151426, "lastModified": 1654496848,
"narHash": "sha256-8KHHvaduwvobK0rEvy4eM0uEQFu+NbE3BJ9qhgEkm/w=", "narHash": "sha256-EbJVZtV0zvMtLt7RaIvu22S4qITlnDDoTCDQzNwvrBQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "b2ba32f32e5238b4c6b49f81ff3d82e4dbe7f728", "rev": "54bbc3b0994a16ab97795e11ac6bb91d96b1b601",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -294,11 +294,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1654113406, "lastModified": 1654422613,
"narHash": "sha256-70esZvhal+FsyU89mJRcAb+cDGHKt0sgZ6MlRr9Cplg=", "narHash": "sha256-ZxkMM13AnrMwYOV99ohzcqeTkAOqD9Q2SBdZ9WoFE9Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "684e85d01d333be91c4875baebb05b93c7d2ffaa", "rev": "20703892473d01c70fb10248442231fe94f4ceb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -310,11 +310,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1653931853, "lastModified": 1654230545,
"narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=", "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457", "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -346,16 +346,16 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1653996475, "lastModified": 1654360807,
"narHash": "sha256-r/UA7h3Dfgf4dlOCkakpqejf1Tagfb+6T+9OdT0qBgU=", "narHash": "sha256-wYG86PUkPZ1P/oHsCpepTkb/U26poaEPPp1XFjRsgdA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3", "rev": "d9794b04bffb468b886c553557489977ae5f4c65",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-21.11", "ref": "nixos-22.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -377,10 +377,10 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1653830209, "lastModified": 1653996475,
"narHash": "sha256-V+HnLKJzvk2HZcLUKt9z2puZ46vLo74chOakxbLfXek=", "narHash": "sha256-r/UA7h3Dfgf4dlOCkakpqejf1Tagfb+6T+9OdT0qBgU=",
"path": "/nix/store/19j4q1k2fzz4axq9abqhp02s23w2p27v-source", "path": "/nix/store/1qw0ck830swiwrqkw90cxy2bm4svgjz6-source",
"rev": "cc257c49c495b2d0d7d40c5753a452d0abc8adf3", "rev": "ec6eaba9dfcfdd11547d75a193e91e26701bf7e3",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -390,11 +390,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1654126564, "lastModified": 1654398695,
"narHash": "sha256-sgDXDKGmUG4h7OPDOHyQggFQ08ZqVzUIPi8351yhugY=", "narHash": "sha256-Kw/KeoFXszNsF5mORP45mrxCP+k9Aq03hWcuWCL9sdI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1c9c23aad972787f00f175651e4cb0d7c7fd5ea", "rev": "c5d810f4c74c824ae0fb788103003c6c9d366a08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -406,11 +406,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1653931853, "lastModified": 1654230545,
"narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=", "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1c167688a6f81f4a51ab542e5f476c8c595e457", "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,11 +463,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1654111402, "lastModified": 1654453799,
"narHash": "sha256-bPLg3p6gJ23uSC4IaYtIWj/fG6uUNHPM3xG9k2vtcZE=", "narHash": "sha256-wYxRnGvTvIDk9OPbXXM9j6AYtPcLHaW/SodiDy0RYYA=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "6f7c5589abfc93fbdfc071cc2716d1ea7b527e2e", "rev": "ad6810e90bf89a4ef0ae21349d077050bc2a4fa2",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -4,7 +4,7 @@
nixConfig.extra-experimental-features = "nix-command flakes"; nixConfig.extra-experimental-features = "nix-command flakes";
inputs = inputs =
{ {
nixos.url = "github:nixos/nixpkgs/nixos-21.11"; nixos.url = "github:nixos/nixpkgs/nixos-22.05";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";

View file

@ -10,7 +10,6 @@
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "20.09"; # Did you read the comment? system.stateVersion = "20.09"; # Did you read the comment?
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];

View file

@ -29,6 +29,7 @@ in
cargo-crev cargo-crev
cargo-fuzz cargo-fuzz
tdesktop tdesktop
vimPlugins
neovim-unwrapped; neovim-unwrapped;
latest = latest; latest = latest;

View file

@ -11,10 +11,6 @@
# If you want to use JACK applications, uncomment this # If you want to use JACK applications, uncomment this
#jack.enable = true; #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 #bluetooth config
media-session.config.bluez-monitor.rules = [ media-session.config.bluez-monitor.rules = [
{ {

View file

@ -14,8 +14,7 @@
services.redshift = { services.redshift = {
enable = true; 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.gammastep;
package = pkgs.redshift-wlr;
brightness.night = "0.75"; brightness.night = "0.75";
}; };
@ -39,7 +38,6 @@
liberation_ttf liberation_ttf
fira-code fira-code
fira-code-symbols fira-code-symbols
mplus-outline-fonts
dina-font dina-font
proggyfonts proggyfonts
(nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })

View file

@ -3,7 +3,6 @@
pavucontrol pavucontrol
signal-desktop signal-desktop
tdesktop tdesktop
nheko
firefox-wayland firefox-wayland
chromium chromium
nomacs nomacs
@ -18,7 +17,7 @@
cmus cmus
cmusfm cmusfm
]; ];
services.dbus.packages = with pkgs; [ gnome3.dconf ]; services.dbus.packages = with pkgs; [ dconf ];
services.gvfs.enable = true; services.gvfs.enable = true;
services.udisks2.enable = true; services.udisks2.enable = true;
services.devmon.enable = true; services.devmon.enable = true;