M nix/flake.lock → nix/flake.lock

@@ -81,11 +81,11 @@ "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1653518057,
-        "narHash": "sha256-cam3Nfae5ADeEs6mRPzr0jXB7+DhyMIXz0/0Q13r/yk=",
+        "lastModified": 1654113405,
+        "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "64831f938bd413cefde0b0cf871febc494afaa4f",
+        "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@ "neovim-flake": "neovim-flake",
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1653466138,
-        "narHash": "sha256-fMWq/my9Yk4pIuI1VTgBcT1NSFzdnkUFQJ39pgIdxes=",
+        "lastModified": 1656058113,
+        "narHash": "sha256-xJgKKXrz/r63/YMB/yke3g/yduX7tXE5xJBPfgqV+rM=",
         "owner": "icyphox",
         "repo": "neovim-nightly-overlay",
-        "rev": "6c093653ccdc4825b3aefd2a9c4934c3633c4f2d",
+        "rev": "0acd78711280c2cc066e7ab6599b448c10e8d3ec",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@ ]
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1653434172,
-        "narHash": "sha256-hCm9+5ehYeWHzU/n3T7QKi5n+k1JuOZeETvKg/YDpic=",
+        "lastModified": 1656032696,
+        "narHash": "sha256-GFGsaJqnmtCdfmB1ptJ9jJJ7Ro2yS2NYYHapGHZZMQM=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "af2899aee0b27e27d658c5f9053b83f439210cea",
+        "rev": "3a4fa22badc5595afc0a994ead965ff32ccf6c76",
         "type": "github"
       },
       "original": {
@@ -141,11 +141,11 @@ }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1653463224,
-        "narHash": "sha256-bUxKhqZhki2vPzFTl8HOo1m7pagF7WzY1MZiso8U5ws=",
+        "lastModified": 1655789751,
+        "narHash": "sha256-DbL2gn7YwkuX10OdlWfZ/A7zEJztwHh9NMeau1JMTdk=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "39a7bfc496d2ddfce73fe9542af1f2029ba4fe39",
+        "rev": "f9d8dff4e621f2d7f2b84d9e84bc6359715f971c",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@ }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653060744,
-        "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
+        "lastModified": 1655895887,
+        "narHash": "sha256-AbihSVmPKFcQmaVgzNSLQ8sLAaVTTELPSzZ+/gRVfyk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
+        "rev": "e1e08fe28bf0588a41cd556eac40b98d2793da99",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@ }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1653407748,
-        "narHash": "sha256-g9puJaILRTb9ttlLQ7IehpV7Wcy0n+vs8LOFu6ylQcM=",
+        "lastModified": 1655983783,
+        "narHash": "sha256-0h1FzkYWei24IdKNpCX93onkF/FMiXQG8SdEbTc0r8A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5ce6597eca7d7b518c03ecda57d45f9404b5e060",
+        "rev": "6141b8932a5cf376fe18fcd368cecd9ad946cb68",
         "type": "github"
       },
       "original": {
@@ -197,7 +197,7 @@ },
       "locked": {
         "lastModified": 1643513342,
         "narHash": "sha256-t819RkW5NiURx4lJlGMfHW3IuAMJtK29jUpAqUixKeg=",
-        "ref": "master",
+        "ref": "refs/heads/master",
         "rev": "8b1dd1f5609447f5d862e330a75a4b2a0dfc3929",
         "revCount": 3,
         "type": "git",

M nix/home.nix → nix/home.nix

@@ -15,7 +15,7 @@ ./x
     ./mail.nix
   ];
 
-  home.stateVersion = "21.05";
+  home.stateVersion = "22.05";
   home.username = "icy";
   home.homeDirectory = "/home/icy";
   home.extraOutputsToInstall = [ "man" ];
@@ -37,7 +37,7 @@ mpv
     w3m
     noto-fonts-emoji
     jq
-    yq
+    yq-go
     sxiv
     feh
     st

M nix/hosts/wyndle/configuration.nix → nix/hosts/wyndle/configuration.nix

@@ -25,6 +25,7 @@ HZ 300
       '';
     }];
     resumeDevice = "/dev/nvme0n1p2";
+    kernelPackages = pkgs.linuxPackages_latest;
   };
 
   networking = {
@@ -135,6 +136,10 @@ offload.enable = true;
       amdgpuBusId = "PCI:8:0:0";
       nvidiaBusId = "PCI:1:0:0";
     };
+    logitech.wireless = {
+      enable = true;
+      enableGraphical = true;
+    };
   };
 
   services = {
@@ -150,7 +155,6 @@ xserver = {
       enable = true;
       layout = "us";
       displayManager.startx.enable = true;
-      libinput.enable = true;
       dpi = 192;
       videoDrivers = [ "nvidia" ];
       screenSection = ''
@@ -158,6 +162,13 @@ Option         "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}"
         Option         "AllowIndirectGLXProtocol" "off"
         Option         "TripleBuffer" "on"
       '';
+      libinput = {
+        enable = true;
+        mouse = {
+          scrollButton = 8;
+          scrollMethod = "button";
+        };
+      };
     };
     tailscale.enable = true;
     auto-cpufreq.enable = true;