From 548cf19a72802dcb86247b351a8f040a3e7bcee2 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Tue, 21 May 2024 22:40:10 +0200 Subject: [PATCH] chore(flake): Update flake inputs --- flake.lock | 84 +++++++++++++----------------------------- modules/nix-config.nix | 14 +++++-- modules/wm/x.nix | 26 ++++++++----- 3 files changed, 52 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index eab5ec0..7612a46 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1712079060, - "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", + "lastModified": 1715290355, + "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "owner": "ryantm", "repo": "agenix", - "rev": "1381a759b205dff7a6818733118d02253340fd5e", + "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "type": "github" }, "original": { @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1713406758, - "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=", + "lastModified": 1715872464, + "narHash": "sha256-mkZ3hrPG7d+qL7B6pQcrNfPh2mnQEJR3FHK93qCp6Uk=", "owner": "nix-community", "repo": "disko", - "rev": "1efd500e9805a9efbce401ed5999006d397b9f11", + "rev": "5f6dbcce99d60dd77f96dfc66d06bbea149a40e1", "type": "github" }, "original": { @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1713517520, - "narHash": "sha256-t59lpRo7EulX9J0/bc5/8cUEo7hl6z9YOYukzg54cyU=", + "lastModified": 1716109578, + "narHash": "sha256-6b6PG2h4p5KOGc/bFaet14kvrHaZ5kkI2fZRgdfiJX4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a8692d4e570e93061d2bbe10af4a1590afe82e15", + "rev": "999b048552f496803b01c445834a9ef70410a5cb", "type": "github" }, "original": { @@ -153,24 +153,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -220,11 +202,11 @@ ] }, "locked": { - "lastModified": 1713527814, - "narHash": "sha256-0NJLgMKvv+HluzeHei/m8vDhX3xovNLkMw/idwIJ218=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "0184c8180f5cbb8e3a54a239b874fe849d3073cb", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -305,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713297878, - "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", + "lastModified": 1715961556, + "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", + "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", "type": "github" }, "original": { @@ -353,11 +335,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1713344939, - "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=", + "lastModified": 1715948915, + "narHash": "sha256-dxMrggEogQuJQr6f02VAFtsSNtjEPkgxczeiyW7WOQc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd", + "rev": "bacb8503d3a51d9e9b52e52a1ba45e2c380ad07d", "type": "github" }, "original": { @@ -449,7 +431,6 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -457,11 +438,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "lastModified": 1715870890, + "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", "type": "github" }, "original": { @@ -491,11 +472,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1713012165, - "narHash": "sha256-z/soXKDnz+w4Nw0LkRaM73YqolhSmIYy6cpg1F2ps8I=", + "lastModified": 1714720456, + "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "9f6635a0351c190179dc6904545f950108a23dd8", + "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f", "type": "gitlab" }, "original": { @@ -550,21 +531,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "utils": { "locked": { "lastModified": 1659877975, @@ -582,7 +548,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1709126324, diff --git a/modules/nix-config.nix b/modules/nix-config.nix index 716d4e7..13ffe16 100644 --- a/modules/nix-config.nix +++ b/modules/nix-config.nix @@ -1,8 +1,13 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { nix = { - package = pkgs.nixUnstable; + package = pkgs.nixVersions.latest; gc = { automatic = true; dates = "weekly"; @@ -11,7 +16,10 @@ settings = { auto-optimise-store = true; - experimental-features = [ "nix-command" "flakes" "repl-flake" ]; + experimental-features = [ + "nix-command" + "flakes" + ]; warn-dirty = false; # avoid unwanted garbage collection when using direnv diff --git a/modules/wm/x.nix b/modules/wm/x.nix index cb669fb..d186430 100644 --- a/modules/wm/x.nix +++ b/modules/wm/x.nix @@ -1,9 +1,16 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { # Enable the X11 windowing system. services = { - dbus = { enable = true; }; + dbus = { + enable = true; + }; xserver = { enable = true; @@ -22,15 +29,14 @@ desktopManager.xfce.enable = true; desktopManager.gnome.enable = true; + }; - # Enable touchpad support (enabled default in most desktopManager). - libinput = { - enable = true; - touchpad.disableWhileTyping = true; - touchpad.tapping = false; - mouse.naturalScrolling = - config.services.xserver.libinput.touchpad.naturalScrolling; - }; + # Enable touchpad support (enabled default in most desktopManager). + libinput = { + enable = true; + touchpad.disableWhileTyping = true; + touchpad.tapping = false; + mouse.naturalScrolling = config.services.libinput.touchpad.naturalScrolling; }; }; }