From 6fb9b88db02e30e008a5a1e3e50462f2a11a9549 Mon Sep 17 00:00:00 2001 From: macronova Date: Sat, 16 Mar 2024 00:01:42 -0700 Subject: [PATCH] Update flake --- flake.lock | 108 +++++++++++++++++--------------------- linux/blitzar/audio.nix | 16 ------ linux/blitzar/default.nix | 1 - linux/blitzar/device.nix | 20 ++++++- linux/blitzar/gui.nix | 3 +- 5 files changed, 68 insertions(+), 80 deletions(-) delete mode 100644 linux/blitzar/audio.nix diff --git a/flake.lock b/flake.lock index 9586c9e..d098909 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1710379155, - "narHash": "sha256-zdHEsOOnfBTO1ymL6gd9etR+iNS6HowbJM4Llqxy+Uc=", + "lastModified": 1710427903, + "narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=", "owner": "nix-community", "repo": "disko", - "rev": "cc69c2340b59e290982ec7e6238471d470c839d0", + "rev": "21d89b333ca300bef82c928c856d48b94a9f997c", "type": "github" }, "original": { @@ -37,11 +37,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -52,7 +52,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -88,11 +88,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1710349883, - "narHash": "sha256-bjbdS2mC76xNJwt1d/uZa+JdHR8CCyYbF4Ey/NgOJus=", + "lastModified": 1710532761, + "narHash": "sha256-SUXGZNrXX05YA9G6EmgupxhOr3swI1gcxLUeDMUhrEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f0db7d418e781354d8a3c50e611e3b1cd413087", + "rev": "206f457fffdb9a73596a4cb2211a471bd305243d", "type": "github" }, "original": { @@ -107,11 +107,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1710025765, - "narHash": "sha256-CnNH3E1xB/xfif+KotTfvSGLLqOZ0OvUcUrDsFMwN6Q=", + "lastModified": 1710404304, + "narHash": "sha256-tYsUAsZgt9TT7d+r1KRYHWyBRWedJ39SXNBVSCQVsGQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2e8c168044e86ee1344c18bde5caeffe205292f2", + "rev": "ffa51458aec4d53aac85b6dee1ee2ec29f4e953f", "type": "github" }, "original": { @@ -125,16 +125,14 @@ "blobs": "blobs", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs_4", - "nixpkgs-23_05": "nixpkgs-23_05", - "nixpkgs-23_11": "nixpkgs-23_11", "utils": "utils" }, "locked": { - "lastModified": 1709905972, - "narHash": "sha256-18OF2/ypr0n4Lp6Fk5SLHPu12ok6jM+Hv3sC0PCim0Q=", + "lastModified": 1710449465, + "narHash": "sha256-2orO8nfplp6uQJBFqKkj1iyNMC6TysmwbWwbb4osTag=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "572c1b4d69deea1093ac231c37927cfa8ccad477", + "rev": "79c8cfcd5873a85559da6201b116fb38b490d030", "type": "gitlab" }, "original": { @@ -222,36 +220,6 @@ "type": "github" } }, - "nixpkgs-23_05": { - "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, - "nixpkgs-23_11": { - "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.11", - "type": "indirect" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1710033658, @@ -302,11 +270,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1705856552, - "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", + "lastModified": 1709703039, + "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", + "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "type": "github" }, "original": { @@ -349,11 +317,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1710451336, + "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "d691274a972b3165335d261cc4671335f5c67de9", "type": "github" }, "original": { @@ -398,11 +366,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1710195194, - "narHash": "sha256-KFxCJp0T6TJOz1IOKlpRdpsCr9xsvlVuWY/VCiAFnTE=", + "lastModified": 1710433464, + "narHash": "sha256-IXlPoWgIRovZ32mYvqqdBgOQln71LouE/HBhbKc1wcw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e52d8117b330f690382f1d16d81ae43daeb4b880", + "rev": "6c32d3b9c7593f4b466ec5404e59fc09a803a090", "type": "github" }, "original": { @@ -426,13 +394,31 @@ "type": "github" } }, - "utils": { + "systems_2": { "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { diff --git a/linux/blitzar/audio.nix b/linux/blitzar/audio.nix deleted file mode 100644 index 166c572..0000000 --- a/linux/blitzar/audio.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ ... }: - -{ - security.rtkit.enable = true; - - services.pipewire = { - enable = true; - alsa = { - enable = true; - support32Bit = true; - }; - pulse.enable = true; - }; - - programs.noisetorch.enable = true; -} diff --git a/linux/blitzar/default.nix b/linux/blitzar/default.nix index d8032aa..f860f71 100644 --- a/linux/blitzar/default.nix +++ b/linux/blitzar/default.nix @@ -5,7 +5,6 @@ disko.nixosModules.default hardware.nixosModules.asus-zephyrus-ga402 ../../common - ./audio.nix ./configuration.nix ./device.nix ./disko.nix diff --git a/linux/blitzar/device.nix b/linux/blitzar/device.nix index d729724..5d64cd8 100644 --- a/linux/blitzar/device.nix +++ b/linux/blitzar/device.nix @@ -1,5 +1,8 @@ { config, pkgs, ... }: +let + usr = config.constants.userName; +in { hardware = { bluetooth.enable = true; @@ -10,13 +13,20 @@ libvdpau-va-gl ]; }; + openrazer = { + enable = true; + users = [ usr ]; + }; }; programs = { adb.enable = true; kdeconnect.enable = true; + noisetorch.enable = true; }; + security.rtkit.enable = true; + services = { automatic-timezoned.enable = true; avahi = { @@ -25,8 +35,16 @@ openFirewall = true; }; fwupd.enable = true; + pipewire = { + enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + pulse.enable = true; + }; printing.enable = true; }; - users.users.${config.constants.userName}.extraGroups = [ "adbusers" ]; + users.users.${usr}.extraGroups = [ "adbusers" ]; } diff --git a/linux/blitzar/gui.nix b/linux/blitzar/gui.nix index 10ef72d..f032bf4 100644 --- a/linux/blitzar/gui.nix +++ b/linux/blitzar/gui.nix @@ -19,6 +19,7 @@ let usr = config.constants.userName; in { nvtop-amd picard qbittorrent + razergenie sweet-nova tauon telegram-desktop @@ -91,7 +92,7 @@ let usr = config.constants.userName; in { easyeffects.enable = true; gpg-agent = { enable = true; - pinentryFlavor = "qt"; + pinentryPackage = pkgs.pinentry-qt; }; }; };