From 697683aa5345070273051ad66a3307363af0f650 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 11 Aug 2024 21:22:49 -0400 Subject: [PATCH] wheel --- flake.lock | 70 ++++++++++---------- home-manager/vscode.nix | 4 ++ modules/common-desktop/launch-rl/default.nix | 2 +- modules/common-desktop/packages.nix | 1 + modules/common-desktop/wheel.nix | 14 ++++ stylix.nix | 2 +- 6 files changed, 56 insertions(+), 37 deletions(-) create mode 100644 modules/common-desktop/wheel.nix diff --git a/flake.lock b/flake.lock index a4e2dbf..3febadb 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1721276923, - "narHash": "sha256-HJKuwVvi+yGv+8n9Ez4EwaJA0B79JRss9J30vpgy/GI=", + "lastModified": 1723137499, + "narHash": "sha256-MOE9NeU2i6Ws1GhGmppMnjOHkNLl2MQMJmGhaMzdoJM=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "cc70ec20e2775df7cd2bccdd20dcdecc3e0a733b", + "rev": "fb5b578a4f49ae8705e5fea0419242ed1b8dba70", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -202,11 +202,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1722119539, - "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -242,11 +242,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1722043237, - "narHash": "sha256-Z7Z0OvshgHKr3CGHxgumwRR06YphjTXPf1mMsYsvESw=", + "lastModified": 1723339533, + "narHash": "sha256-WDjDc/5ghWcuD72Wm7UzR9YMe2wi2LCuU5vVFg183nY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "dc966ed468b9112dfef5c9129a7d5c5e68a491c6", + "rev": "e8ef080c3f3f307fd94c1e699be66abfcf6677f8", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721562059, - "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -273,23 +273,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, "nixpkgs_2": { "locked": { - "lastModified": 1721466660, - "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", + "lastModified": 1723221148, + "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100", + "rev": "154bcb95ad51bc257c2ce4043a725de6ca700ef6", "type": "github" }, "original": { @@ -301,11 +301,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1722062969, - "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -339,11 +339,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1722123746, - "narHash": "sha256-Nrk6b9WL7s5GSHWYf/UPL4FZKUdK7omqMNGzh7agBLs=", + "lastModified": 1723368756, + "narHash": "sha256-/lzyHVVY1E6jx5Sh5gijdOTYz+29ce8bH8YtUKaVaaI=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "034c7af1c6b580cdfffba3e52b7ee2c09330cf43", + "rev": "584d481a3f03d5e11d40e648946b1a72077a3f12", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1721989207, - "narHash": "sha256-APKQeMMdh1O1W3OnxEvNfHNBiE4eRvEN6rosFr2dLHE=", + "lastModified": 1722946882, + "narHash": "sha256-mxtnMye8gs82tdQbVC+g6v3aPOZlH150f9WyntHIkTg=", "owner": "danth", "repo": "stylix", - "rev": "b9de20c76e8d5c13cf2304d23cf589803c311670", + "rev": "5853f1a8bd072f2ebabfc3de3973084353cf6f1e", "type": "github" }, "original": { @@ -400,11 +400,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1721455769, - "narHash": "sha256-u95jjeLWk1S65fxIP+Y0iFR0WYVYwfg+PZNr6ZECiS8=", + "lastModified": 1723319758, + "narHash": "sha256-4WYwxNzH/95Vj0IqR2xh4gyiSn8H9bGnBECFWy4vjIk=", "ref": "refs/heads/main", - "rev": "abbdeed18f1dc6b51a636e544e697a88d21a0ad5", - "revCount": 678, + "rev": "74656e9da4008f75f3b1d136dbaf1172bf6c232f", + "revCount": 697, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix index 5458d6c..68baa9c 100755 --- a/home-manager/vscode.nix +++ b/home-manager/vscode.nix @@ -35,6 +35,7 @@ ]; userSettings = lib.mkForce { + "redhat.telemetry.enabled" = false; "editor.guides.bracketPairs" = "active"; "window.dialogStyle" = "custom"; "editor.inlineSuggest.enabled" = true; @@ -69,6 +70,9 @@ "[astro]" = { "editor.defaultFormatter" = "astro-build.astro-vscode"; }; + "[yaml]" = { + "editor.defaultFormatter" = "redhat.vscode-yaml"; + }; "editor.minimap.enabled" = false; "diffEditor.ignoreTrimWhitespace" = false; "editor.unicodeHighlight.nonBasicASCII" = false; diff --git a/modules/common-desktop/launch-rl/default.nix b/modules/common-desktop/launch-rl/default.nix index c1545e8..54c45c6 100644 --- a/modules/common-desktop/launch-rl/default.nix +++ b/modules/common-desktop/launch-rl/default.nix @@ -1 +1 @@ -{environment.etc."launch-rl.bat".source = ./launch-rl.bat;} \ No newline at end of file +{environment.etc."launch-rl.bat".source = ./launch-rl.bat;} diff --git a/modules/common-desktop/packages.nix b/modules/common-desktop/packages.nix index 9448034..33ed792 100644 --- a/modules/common-desktop/packages.nix +++ b/modules/common-desktop/packages.nix @@ -9,6 +9,7 @@ tldr tuba gimp + dart heroic aspell muzika diff --git a/modules/common-desktop/wheel.nix b/modules/common-desktop/wheel.nix new file mode 100644 index 0000000..a724099 --- /dev/null +++ b/modules/common-desktop/wheel.nix @@ -0,0 +1,14 @@ +{pkgs, ...}: { + boot.extraModulePackages = [ + (pkgs.linuxKernel.packages.linux_zen.hid-tmff2.overrideAttrs + (prev: { + src = pkgs.fetchFromGitHub { + owner = "Henry-Hiles"; + repo = "hid-tmff2"; + rev = "5fee95681a0091e42ecd60731db7b797fcde9d81"; + hash = "sha256-KD+NG/GR/K1PkBUkhUrob5KrHDM6IHBFmcNbByBW57g="; + fetchSubmodules = true; + }; + })) + ]; +} diff --git a/stylix.nix b/stylix.nix index 73d97b7..ebaf1cb 100755 --- a/stylix.nix +++ b/stylix.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { stylix = { - enable = true; + enable = true; polarity = "dark"; image = ./background.jpg; base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";