From b6acd4601be7a8bdc3922e5cba185c7cc0483d05 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Thu, 29 Feb 2024 18:24:12 +0100 Subject: [PATCH 1/3] Commented out bluez config for wireplumber bc of some weird perms error --- flake.lock | 54 ++++++++++++++++++++-------------------- hosts/lilith/default.nix | 20 +++++++-------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 22a26bd..9ed92b7 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1708661057, - "narHash": "sha256-2hKraBQB0n4znHHuT2f7TJ0DognzNFpnFPdKZjpnrSs=", + "lastModified": 1709093047, + "narHash": "sha256-6EeMX7P3dskhSQcQNmWpIDrMVTD0O8XMZPRzwhH2PAc=", "owner": "rycee", "repo": "nur-expressions", - "rev": "19101fae468c9773b99925eae619ebb24fc247da", + "rev": "3a46c7b2f01b933377e8a94293d151f6bc79697b", "type": "gitlab" }, "original": { @@ -135,11 +135,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1708591310, - "narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=", + "lastModified": 1708988456, + "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55", + "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", "type": "github" }, "original": { @@ -238,11 +238,11 @@ ] }, "locked": { - "lastModified": 1708558280, - "narHash": "sha256-w1ns8evB6N9VTrAojcdXLWenROtd77g3vyClrqeFdG8=", + "lastModified": 1708988456, + "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b69d574162cfa6eb7919d5614a48d0185550891", + "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", "type": "github" }, "original": { @@ -259,11 +259,11 @@ ] }, "locked": { - "lastModified": 1708231718, - "narHash": "sha256-IZdieFWvhBkxoOFMDejqLUYqD94WN6k0YSpw0DFy+4g=", + "lastModified": 1709001452, + "narHash": "sha256-FnZ54wkil54hKvr1irdKic1TE27lHQI9dKQmOJRrtlU=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0e6857fa1d632637488666c08e7b02c08e3178f8", + "rev": "6c06334f0843c7300d1678726bb607ce526f6b36", "type": "github" }, "original": { @@ -274,11 +274,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1708594753, - "narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=", + "lastModified": 1709110790, + "narHash": "sha256-qUk0G9vWX90beOKB1EtLFdeImXAujNi5SP5zTyIEATc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958", + "rev": "01467901ec51dd92774040f2b3dff4f21f4e1c45", "type": "github" }, "original": { @@ -306,11 +306,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1708720103, - "narHash": "sha256-aSjM8KMdNHTnaIcptpO3EZoq63VT/b4jYPc9VxIzo34=", + "lastModified": 1709136703, + "narHash": "sha256-ZUazt7E0Tau+pS32bGyg2Y6g30S9uAZ06HPhr9pGDRU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "899fe5550bd324dd8356c1ef652faf892cefb88e", + "rev": "da3244e41a2ab095bdc78ff4a4a50afc0a23b7cf", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1708984720, + "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", "type": "github" }, "original": { @@ -364,11 +364,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1708614940, - "narHash": "sha256-36muWApzetaV4WAEeqKsWxW4k2l0u3E841RI4sHPiz0=", + "lastModified": 1709118025, + "narHash": "sha256-IwzgIAKHJI+qcno0pExTOfhqKgHzA5vc++gfgJ0ZCok=", "owner": "nix-community", "repo": "nixvim", - "rev": "060a05138ca1a46fc0a0f79ef27f080cac57a59e", + "rev": "8bb460e261dd0fd8ac3f544f8a2a28ad64616cbe", "type": "github" }, "original": { diff --git a/hosts/lilith/default.nix b/hosts/lilith/default.nix index 498a203..8172d1a 100644 --- a/hosts/lilith/default.nix +++ b/hosts/lilith/default.nix @@ -107,16 +107,16 @@ # If you want to use JACK applications, uncomment this jack.enable = true; }; - environment.etc = { - "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' - bluez_monitor.properties = { - ["bluez5.enable-sbc-xq"] = true, - ["bluez5.enable-msbc"] = true, - ["bluez5.enable-hw-volume"] = true, - ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" - } - ''; - }; + #environment.etc = { + # "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' + # bluez_monitor.properties = { + # ["bluez5.enable-sbc-xq"] = true, + # ["bluez5.enable-msbc"] = true, + # ["bluez5.enable-hw-volume"] = true, + # ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" + # } + # ''; + #}; # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable = true; From 96407b6ed55ba9056414bd10ed3b21118f24faab Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Sun, 3 Mar 2024 12:34:10 +0100 Subject: [PATCH 2/3] Removing agenix for now --- flake.lock | 176 +++++++++++++++------------------------ flake.nix | 4 +- home/default.nix | 3 +- hosts/lilith/default.nix | 2 + modules/home-manager.nix | 3 +- 5 files changed, 76 insertions(+), 112 deletions(-) diff --git a/flake.lock b/flake.lock index 9ed92b7..2399be2 100644 --- a/flake.lock +++ b/flake.lock @@ -1,60 +1,39 @@ { "nodes": { - "agenix": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", - "owner": "ryantm", - "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, - "darwin": { + "devshell": { "inputs": { + "flake-utils": "flake-utils_3", "nixpkgs": [ - "agenix", + "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "lastModified": 1708939976, + "narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=", + "owner": "numtide", + "repo": "devshell", + "rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3", "type": "github" }, "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", + "owner": "numtide", + "repo": "devshell", "type": "github" } }, "firefox-addons": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1709093047, - "narHash": "sha256-6EeMX7P3dskhSQcQNmWpIDrMVTD0O8XMZPRzwhH2PAc=", + "lastModified": 1709352230, + "narHash": "sha256-7NfxOTEz15jHLxIRYS9WU4+PO0fypxJ/kkHC682Lhr0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "3a46c7b2f01b933377e8a94293d151f6bc79697b", + "rev": "c13d9ef669a370fd70e6732e295513cd7342b20d", "type": "gitlab" }, "original": { @@ -132,7 +111,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1709126324, @@ -149,6 +128,24 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "inputs": { "systems": "systems_3" }, @@ -191,36 +188,15 @@ "home-manager": { "inputs": { "nixpkgs": [ - "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1709204054, + "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708988456, - "narHash": "sha256-RCz7Xe64tN2zgWk+MVHkzg224znwqknJ1RnB7rVqUWw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "1d085ea4444d26aa52297758b333b449b2aa6fca", + "rev": "2f3367769a93b226c467551315e9e270c3f78b15", "type": "github" }, "original": { @@ -230,7 +206,7 @@ "type": "github" } }, - "home-manager_3": { + "home-manager_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -274,11 +250,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1709110790, - "narHash": "sha256-qUk0G9vWX90beOKB1EtLFdeImXAujNi5SP5zTyIEATc=", + "lastModified": 1709147990, + "narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "01467901ec51dd92774040f2b3dff4f21f4e1c45", + "rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159", "type": "github" }, "original": { @@ -289,38 +265,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-master": { - "locked": { - "lastModified": 1709136703, - "narHash": "sha256-ZUazt7E0Tau+pS32bGyg2Y6g30S9uAZ06HPhr9pGDRU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "da3244e41a2ab095bdc78ff4a4a50afc0a23b7cf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1627814220, "narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=", @@ -336,13 +280,29 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs-master": { "locked": { - "lastModified": 1708984720, - "narHash": "sha256-gJctErLbXx4QZBBbGp78PxtOOzsDaQ+yw1ylNQBuSUY=", + "lastModified": 1709403298, + "narHash": "sha256-1Y2ywhgZ73PeeAQB3ndhfbDbAhBSFtxln30QjP8tr4c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13aff9b34cc32e59d35c62ac9356e4a41198a538", + "rev": "80b928afb1055901afdfd4ebb0ede839ab1686bb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1709237383, + "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", "type": "github" }, "original": { @@ -354,9 +314,10 @@ }, "nixvim": { "inputs": { + "devshell": "devshell", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" @@ -364,11 +325,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1709118025, - "narHash": "sha256-IwzgIAKHJI+qcno0pExTOfhqKgHzA5vc++gfgJ0ZCok=", + "lastModified": 1709387460, + "narHash": "sha256-NTfi6gAsR5EReuvFGihuDUkBqb9DuQQqFviQcXVwX0c=", "owner": "nix-community", "repo": "nixvim", - "rev": "8bb460e261dd0fd8ac3f544f8a2a28ad64616cbe", + "rev": "274293fd691250ab96985aa4a04c653ab462876e", "type": "github" }, "original": { @@ -380,7 +341,7 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "gitignore": "gitignore", "nixpkgs": [ "nixvim", @@ -407,12 +368,11 @@ }, "root": { "inputs": { - "agenix": "agenix", "firefox-addons": "firefox-addons", "flake-utils": "flake-utils_2", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-master": "nixpkgs-master", "nixvim": "nixvim" } diff --git a/flake.nix b/flake.nix index 51a729b..de795bc 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - inputs.agenix.url = "github:ryantm/agenix"; + #inputs.agenix.url = "github:ryantm/agenix"; inputs.firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixos-hardware.url = "github:NixOS/nixos-hardware/master"; inputs.nixvim = { @@ -18,7 +18,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs @ {self, nixpkgs, nixpkgs-master, firefox-addons, home-manager, agenix, nixos-hardware, nixvim, ...}: let + outputs = inputs @ {self, nixpkgs, nixpkgs-master, firefox-addons, home-manager, nixos-hardware, nixvim, ...}: let lib = nixpkgs.lib; util = (import ./overlays/util.nix {} {}).util; system = "x86_64-linux"; diff --git a/home/default.nix b/home/default.nix index 10db627..a76bac3 100644 --- a/home/default.nix +++ b/home/default.nix @@ -4,7 +4,7 @@ imports = [ ./modules/nixvim.nix ./modules/firefox.nix - ./modules/ssh.nix + #./modules/ssh.nix ]; home.username = "xqtc"; home.homeDirectory = "/home/xqtc"; @@ -183,6 +183,7 @@ $character''; moodle-dl brightnessctl + pavucontrol bitwarden bitwarden-cli diff --git a/hosts/lilith/default.nix b/hosts/lilith/default.nix index 8172d1a..28bd875 100644 --- a/hosts/lilith/default.nix +++ b/hosts/lilith/default.nix @@ -152,6 +152,8 @@ wdisplays #qemu_full gnomeExtensions.blur-my-shell + surrealdb + zathura ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/modules/home-manager.nix b/modules/home-manager.nix index 18b9f3c..3465bb3 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -8,6 +8,7 @@ home-manager.users.xqtc = {...}: {imports = [ ../home inputs.nixvim.homeManagerModules.nixvim - inputs.agenix.homeManagerModules.default ]; }; + #inputs.agenix.homeManagerModules.default + ]; }; }; } From 0b85edb827a108047340c99b59c108235ecb9eb4 Mon Sep 17 00:00:00 2001 From: xqtc161 Date: Sun, 3 Mar 2024 14:27:47 +0100 Subject: [PATCH 3/3] Multi-battery support for waybar --- home/config-files/waybar-mocha.css | 1 + home/default.nix | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/home/config-files/waybar-mocha.css b/home/config-files/waybar-mocha.css index b01ca62..6426cfb 100644 --- a/home/config-files/waybar-mocha.css +++ b/home/config-files/waybar-mocha.css @@ -78,6 +78,7 @@ window#waybar { #clock, #battery, +#battery.bat2, #cpu, #memory, #temperature, diff --git a/home/default.nix b/home/default.nix index a76bac3..75df52f 100644 --- a/home/default.nix +++ b/home/default.nix @@ -138,7 +138,7 @@ $character''; height = 30; modules-left = [ "hyprland/workspaces" ]; #modules-center = [ "hyprland/window" ]; - modules-right = [ "tray" "network" "battery" "clock" ]; + modules-right = [ "tray" "network" "battery" "battery#bat2" "clock" ]; "tray" = { "icon-size" = 21; }; @@ -149,13 +149,24 @@ $character''; "max-length" = 50; }; "battery" = { - "bat" = "BAT1"; - "interval" = 60; + "bat" = "BAT0"; + "interval" = 10; "states" = { "warning" = 30; "critical" = 15; }; - "format" = " BAT: {capacity}%"; + "format" = " BAT IN: {capacity}%"; + #"format-icons" = ''["", "", "", "", ""]''; + "max-length" = 25; + }; + "battery#bat2" = { + "bat" = "BAT1"; + "interval" = 10; + "states" = { + "warning" = 30; + "critical" = 15; + }; + "format" = " BAT EX: {capacity}%"; #"format-icons" = ''["", "", "", "", ""]''; "max-length" = 25; };