From 3c245ad72a683b1f600d205dca5339c076cc2bfc Mon Sep 17 00:00:00 2001 From: LordGrimmauld Date: Wed, 14 Feb 2024 22:40:13 +0100 Subject: [PATCH] wooting keyboard and other misc fixes --- .require_update | 0 flake.lock | 60 ++++++++++++++++++------------------- flake.nix | 2 +- modules/localisation.nix | 4 +-- modules/network.nix | 2 ++ modules/system-packages.nix | 9 +++++- modules/toolchains.nix | 4 +++ modules/tui.nix | 9 ++++++ modules/users.nix | 12 ++++++++ 9 files changed, 68 insertions(+), 34 deletions(-) create mode 100644 .require_update create mode 100644 modules/tui.nix diff --git a/.require_update b/.require_update new file mode 100644 index 0000000..e69de29 diff --git a/flake.lock b/flake.lock index 0070936..fdb187d 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1703433843, - "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", + "lastModified": 1707830867, + "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "owner": "ryantm", "repo": "agenix", - "rev": "417caa847f9383e111d1397039c9d4337d024bf0", + "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "type": "github" }, "original": { @@ -80,11 +80,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -160,11 +160,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1706750085, - "narHash": "sha256-y/+t2ctdeUD/b0DLWS96UgGUs/srj7vbWef709DPxW4=", + "lastModified": 1707614138, + "narHash": "sha256-xdmNhDnlDF5H/yT1wLGqwVyphjj03lmA/e3SGXyC3DU=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "63fa64659760172fef0e4d674c6661b7ad53b16b", + "rev": "a5de885438ecce695b4b7a110974c33f0eb507e3", "type": "github" }, "original": { @@ -192,11 +192,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1706367331, - "narHash": "sha256-AqgkGHRrI6h/8FWuVbnkfFmXr4Bqsr4fV23aISqj/xg=", + "lastModified": 1707451808, + "narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "160b762eda6d139ac10ae081f8f78d640dd523eb", + "rev": "442d407992384ed9c0e6d352de75b69079904e4e", "type": "github" }, "original": { @@ -241,27 +241,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", - "type": "github" + "lastModified": 1707934190, + "narHash": "sha256-pheFtJ6eB80oGeehOU8lXkxr6dXWmlggS0sNt/ZOFWs=", + "ref": "nixos-unstable", + "rev": "fd93f45f542133d046ddeaeba13860d2e4a3eef2", + "revCount": 583448, + "type": "git", + "url": "file:///home/grimmauld/nixpkgs" }, "original": { - "owner": "NixOS", "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "git", + "url": "file:///home/grimmauld/nixpkgs" } }, "nixpkgs_4": { "locked": { - "lastModified": 1706672657, - "narHash": "sha256-API05c0SDZrmzz1wpqt/K3iCwlaOqDeDfZGp0YGQnek=", + "lastModified": 1706812040, + "narHash": "sha256-pxgWZApBfqHi4I6Hz7nL/rSt0vGE62HvBwvuVXFXeOk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "632751bf0ceeefc74af7a9d2335ea923ad9c831a", + "rev": "5c5bca5a97c0982ea37a2fcf6d3860349b9f9a35", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1706731447, - "narHash": "sha256-VbsFKQZwtFH6+k4U/YjgF20Byhz4Z21kmoLcG5dV2M8=", + "lastModified": 1707218112, + "narHash": "sha256-GXwhrTyeIj38aBi8t6fxasuJ3h2AhvxDypAxQjKrrTY=", "owner": "nix-community", "repo": "kde2nix", - "rev": "e7aded2df9d79e3c23c953bd6011b66ba2b87d98", + "rev": "285ae35495f7a39aacf91598ecf154035bc5d2e8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index aa2ca32..9e88747 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs = { - url = "github:NixOS/nixpkgs/nixos-unstable"; + url = "git+file:///home/grimmauld/nixpkgs?ref=nixos-unstable"; }; agenix.url = "github:ryantm/agenix"; swayfx = { diff --git a/modules/localisation.nix b/modules/localisation.nix index e945414..1ad7e81 100644 --- a/modules/localisation.nix +++ b/modules/localisation.nix @@ -18,8 +18,8 @@ console.keyMap = "de"; - services.xserver = { + services.xserver.xkb = { layout = "de"; - xkbVariant = ""; + variant = ""; }; } diff --git a/modules/network.nix b/modules/network.nix index 4759021..0aa807c 100644 --- a/modules/network.nix +++ b/modules/network.nix @@ -18,6 +18,8 @@ # Enable networking networking.networkmanager.enable = true; + networking.firewall.allowedTCPPorts = [ 5900 ]; + # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; diff --git a/modules/system-packages.nix b/modules/system-packages.nix index 938ac82..57e1aab 100644 --- a/modules/system-packages.nix +++ b/modules/system-packages.nix @@ -27,6 +27,7 @@ lm_sensors oci-cli xcb-util-cursor + krfb imagemagick pypy3 @@ -35,7 +36,13 @@ matplotlib numpy scipy -])) + ])) + + libsForQt5.audiocd-kio +# libsForQt5.libkcompactdisc +# libsForQt5.kio-extras +# libsForQt5.phonon +# libsForQt5.qt5.qtmultimedia (writeShellScriptBin "primerun" '' export __NV_PRIME_RENDER_OFFLOAD=1 diff --git a/modules/toolchains.nix b/modules/toolchains.nix index 3b8fef4..aec4a5b 100644 --- a/modules/toolchains.nix +++ b/modules/toolchains.nix @@ -26,6 +26,9 @@ in { #keyMode = "vi"; }; + virtualisation.docker.enable = true; + + programs.neovim = { enable = true; viAlias = true; @@ -34,6 +37,7 @@ in { customRC = '' set number set hidden + set fileencodings=utf-8 set nocompatible ''; packages.myVimPackage = with pkgs.vimPlugins; { diff --git a/modules/tui.nix b/modules/tui.nix new file mode 100644 index 0000000..0fd2cab --- /dev/null +++ b/modules/tui.nix @@ -0,0 +1,9 @@ +{pkgs, }: { + environment.systemPackages = with pkgs; [ + fbcat + gomuks + bluetuith + spotify-tui + ranger + ]; +} diff --git a/modules/users.nix b/modules/users.nix index 81cae7f..8026200 100644 --- a/modules/users.nix +++ b/modules/users.nix @@ -26,6 +26,18 @@ blender gomuks fbcat + wootility +# osu-lazer-bin + (pkgs.symlinkJoin { + name = "osu"; + paths = [ + (pkgs.writeShellScriptBin "osu!" '' + exec nice -n -19 gamemoderun primerun ${pkgs.osu-lazer-bin}/bin/'osu!' + '') + pkgs.osu-lazer-bin + ]; +}) ]; }; + services.udev.packages = [ pkgs.wooting-udev-rules ]; }