Upgrade to 22.05

flake.lock

@@ -94,16 +94,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1651519540,
+        "lastModified": 1653518057,
-        "narHash": "sha256-3k6p8VsTwwRPQjE8rrMh+o2AZACZn/eeYJ7ivdQ/Iro=",
+        "narHash": "sha256-cam3Nfae5ADeEs6mRPzr0jXB7+DhyMIXz0/0Q13r/yk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d93d56ab8c1c6aa575854a79b9d2f69d491db7d0",
+        "rev": "64831f938bd413cefde0b0cf871febc494afaa4f",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-21.11",
+        "ref": "release-22.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -195,11 +195,11 @@
     },
     "nixpkgs-nixos-unstable": {
       "locked": {
-        "lastModified": 1653060744,
+        "lastModified": 1653581809,
-        "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
+        "narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
+        "rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
         "type": "github"
       },
       "original": {
@@ -211,16 +211,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1653229824,
+        "lastModified": 1653504306,
-        "narHash": "sha256-klSCYMpR4TqWYoTD/xZ2qM9UIPRFC6pK+S/kJuVLbFw=",
+        "narHash": "sha256-bqjEskV+/tqOQqSEaCu4e6uWZ0F7ekBiMR16xpn4V0k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "06db2e2197401b74fcf82d4e84be15b0b5851c7b",
+        "rev": "6efc186e6079ff3f328a2497ff3d36741ac60f6e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-21.11",
+        "ref": "nixos-22.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -259,11 +259,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1653509679,
+        "lastModified": 1653724318,
-        "narHash": "sha256-6jaji0bRfGpdxSipQ1rkstKa1OYAh349/Bv6o6SZetQ=",
+        "narHash": "sha256-4J2d/fc7huLrYsU7VRiquSNOcQoqQQQGNweR48zFEc4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "a4f00d7d3beb4e8e3f7c9b252008b93b42feaf62",
+        "rev": "7a8313c6322856a5adbf9217e289733e67020652",
         "type": "github"
       },
       "original": {

flake.nix

@@ -169,7 +169,7 @@
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
-      ref = "nixos-21.11";
+      ref = "nixos-22.05";
     };
 
     nixos-hardware = {
@@ -188,8 +188,8 @@
       type = "github";
       owner = "nix-community";
       repo = "home-manager";
-      ref = "release-21.11";
+      ref = "release-22.05";
-      inputs = { nixpkgs.follows = "nixpkgs-stable"; };
+      inputs.nixpkgs.follows = "nixpkgs-stable";
     };
 
     flake-utils = {

nixos/boxes/skinnyv/hardware-configuration.nix

@@ -28,7 +28,7 @@
   zramSwap = {
     enable = true;
     algorithm = "zstd";
-    memoryPercent = 25;
+    memoryPercent = 75;
   };
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";

nixos/common-hardware.nix

@@ -36,7 +36,7 @@
     enable = true;
     package = pkgs.pulseaudioFull;
     support32Bit = true;
-    extraModules = [ pkgs.pulseaudio-modules-bt ];
+    extraModules = [ ];
     daemon.config = {
       nice-level = -15;
       realtime-scheduling = "yes";

nixos/gui/default.nix

@@ -47,7 +47,7 @@ in {
         gimp
         glxinfo
         gnome-screenshot
-        gsettings-desktop-schemas
+        pkgs.gsettings-desktop-schemas
         inkscape
         libreoffice
         mindforger
@@ -61,14 +61,14 @@ in {
         qcad
         qemu
         remmina
-        shotwell
+        pkgs.shotwell
         signal-desktop
         simple-scan
         ssb-patchwork
         tlaplusToolbox
         tlaps
         vlc
-        wineFull
+        winePackages.full
         wireshark
         wsjtx
         xclip

nixos/home-manager/programs/emacs/emacs.nix

@@ -1,7 +1,7 @@
 { pkgs }:
 let
   myEmacs = pkgs.emacs-nox;
-  inherit ((pkgs.emacsPackagesGen myEmacs)) emacsWithPackages;
+  inherit ((pkgs.emacsPackagesFor myEmacs)) emacsWithPackages;
 in emacsWithPackages (epkgs:
   (with epkgs.melpaStablePackages; [ magit solarized-theme evil ])
   ++ (with epkgs.melpaPackages; [ xterm-color nix-mode ])

nixos/home-manager/programs/vim.nix

@@ -33,10 +33,6 @@
           };
         })
         ack-vim
-        coc-highlight
-        coc-nvim
-        coc-rust-analyzer
-        coc-yaml
         committia-vim
         ctrlp-vim
         editorconfig-vim

nixos/home-manager/programs/zsh.nix

@@ -65,10 +65,7 @@
   programs.direnv = {
     enable = true;
     enableZshIntegration = true;
-    nix-direnv = {
+    nix-direnv = { enable = true; };
-      enable = true;
-      enableFlakes = true;
-    };
   };
 
   home.file.".config/starship.toml".text = ''

nixos/i3/default.nix

@@ -1,6 +1,6 @@
 { config, pkgs, ... }: {
   imports = [ ./autorandr.nix ];
-  environment.systemPackages = with pkgs; [ gnome3.dconf ];
+  environment.systemPackages = with pkgs; [ dconf ];
   programs.dconf.enable = true;
 
   security.sudo.extraRules = [
@@ -26,7 +26,7 @@
       allowAnyUser = true;
     };
 
-    dbus = { packages = with pkgs; [ gnome2.GConf gnome3.dconf ]; };
+    dbus = { packages = with pkgs; [ gnome2.GConf dconf ]; };
 
     fractalart.enable = true;
     colord.enable = true;

nixos/i3/i3.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 let mod = "Mod4";
 in {
-  home.packages = with pkgs; [ font-awesome-ttf intel-gpu-tools ];
+  home.packages = with pkgs; [ font-awesome intel-gpu-tools ];
 
   xsession.windowManager.i3 = {
     enable = true;