From 619364df894e5d2bc6bdf0915af06f5fdeae67a0 Mon Sep 17 00:00:00 2001 From: William Date: Mon, 4 Dec 2023 18:05:40 -0300 Subject: [PATCH] I don't remember what I changed... --- flake.lock | 166 ++--------------------------- hosts/desktops/common/hardware.nix | 1 + hosts/desktops/common/packages.nix | 1 + hosts/desktops/common/users.nix | 1 + hosts/desktops/rotterdam.nix | 7 +- 5 files changed, 15 insertions(+), 161 deletions(-) diff --git a/flake.lock b/flake.lock index d23138a..84859be 100644 --- a/flake.lock +++ b/flake.lock @@ -116,44 +116,10 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -168,9 +134,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1689068808, @@ -186,28 +152,6 @@ "type": "github" } }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "kde2nix", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -266,30 +210,10 @@ "type": "github" } }, - "kde2nix": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1701465184, - "narHash": "sha256-mdIqUFiGaTFHa038h4t7HGBHY111BbrEOeV9qKlDXUQ=", - "owner": "nix-community", - "repo": "kde2nix", - "rev": "05fb91de6a36056ff7bb1ad4a9b64c98885b89b9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "kde2nix", - "type": "github" - } - }, "nix-minecraft": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -361,22 +285,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1701362232, "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=", @@ -393,22 +301,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1701438246, - "narHash": "sha256-KTKHui8KIk+KkavqG55fFMaVEZawq5cBgFQZ3LNhCIU=", - "owner": "K900", - "repo": "nixpkgs", - "rev": "c7305922fadf8511ee1e046afe347dc6ccadb02d", - "type": "github" - }, - "original": { - "owner": "K900", - "ref": "qt6ening", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1701253981, "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", @@ -424,34 +316,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": [ - "kde2nix", - "flake-utils" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "kde2nix", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1700922917, - "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -459,11 +323,10 @@ "deploy-rs": "deploy-rs", "home-manager": "home-manager_2", "homepage": "homepage", - "kde2nix": "kde2nix", "nix-minecraft": "nix-minecraft", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable", "yousable": "yousable" } }, @@ -497,21 +360,6 @@ "type": "github" } }, - "systems_3": { - "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": 1667395993, @@ -529,7 +377,7 @@ }, "yousable": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] diff --git a/hosts/desktops/common/hardware.nix b/hosts/desktops/common/hardware.nix index 146b580..996545c 100644 --- a/hosts/desktops/common/hardware.nix +++ b/hosts/desktops/common/hardware.nix @@ -7,6 +7,7 @@ pulseaudio.enable = false; # Use pipewire instead steam-hardware.enable = true; # Allow steam client to manage controllers opengl.driSupport32Bit = true; # For OpenGL games + i2c.enable = true; }; sound.enable = true; diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix index 3859934..35204a0 100644 --- a/hosts/desktops/common/packages.nix +++ b/hosts/desktops/common/packages.nix @@ -35,6 +35,7 @@ nextcloud-client nix-init obs-studio + onlyoffice-bin_7_5 p7zip platformio prismlauncher-qt5 diff --git a/hosts/desktops/common/users.nix b/hosts/desktops/common/users.nix index f1b476a..957f402 100644 --- a/hosts/desktops/common/users.nix +++ b/hosts/desktops/common/users.nix @@ -16,6 +16,7 @@ "libvirt" "libvirtd" "adbusers" + "i2c" ]; }; } diff --git a/hosts/desktops/rotterdam.nix b/hosts/desktops/rotterdam.nix index 73f6494..35ac826 100644 --- a/hosts/desktops/rotterdam.nix +++ b/hosts/desktops/rotterdam.nix @@ -17,9 +17,12 @@ keyd = { enable = true; keyboards.main = { - ids = [ "1ea7:0907" ]; + ids = [ "*" ]; settings = { - main = { capslock = "overload(meta, esc)"; }; + main = { + capslock = "overload(meta, esc)"; + esc = "overload(meta, esc)"; + }; shift = { leftshift = "capslock"; rightshift = "capslock";