From fb814ed301b2ca4873844316038a80602d87846e Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Sun, 13 Jul 2025 05:19:29 -0700 Subject: [PATCH] feat: big fixups --- home/environments/hyprland/catppuccin.nix | 6 -- home/environments/i3/catppuccin.nix | 1 - home/environments/niri/mako.nix | 1 - home/profiles/graphical/discord.nix | 5 - .../graphical/{floorp => firefox}/config.nix | 0 .../{floorp => firefox}/containers.nix | 5 +- .../graphical/{floorp => firefox}/main.nix | 0 .../graphical/{floorp => firefox}/mtab.nix | 0 .../graphical/{floorp => firefox}/tst.nix | 0 .../graphical/{floorp => firefox}/ublock.nix | 0 home/profiles/shell/zsh.nix | 1 - nixos/profiles/graphical/sound.nix | 96 ++++++++++--------- shells/repo.nix | 7 -- 13 files changed, 52 insertions(+), 70 deletions(-) delete mode 100644 home/environments/hyprland/catppuccin.nix rename home/profiles/graphical/{floorp => firefox}/config.nix (100%) rename home/profiles/graphical/{floorp => firefox}/containers.nix (96%) rename home/profiles/graphical/{floorp => firefox}/main.nix (100%) rename home/profiles/graphical/{floorp => firefox}/mtab.nix (100%) rename home/profiles/graphical/{floorp => firefox}/tst.nix (100%) rename home/profiles/graphical/{floorp => firefox}/ublock.nix (100%) diff --git a/home/environments/hyprland/catppuccin.nix b/home/environments/hyprland/catppuccin.nix deleted file mode 100644 index 215c13bc..00000000 --- a/home/environments/hyprland/catppuccin.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - config, - lib, - ... -}: { -} diff --git a/home/environments/i3/catppuccin.nix b/home/environments/i3/catppuccin.nix index 33ff4c86..bc136a53 100644 --- a/home/environments/i3/catppuccin.nix +++ b/home/environments/i3/catppuccin.nix @@ -1,6 +1,5 @@ { config, - lib, ... }: let inherit (config.catppuccin) sources; diff --git a/home/environments/niri/mako.nix b/home/environments/niri/mako.nix index a41211b9..bafd4c7c 100644 --- a/home/environments/niri/mako.nix +++ b/home/environments/niri/mako.nix @@ -1,7 +1,6 @@ { config, pkgs, - lib, ... }: let inherit (config.base16) palette; diff --git a/home/profiles/graphical/discord.nix b/home/profiles/graphical/discord.nix index c691334e..f05ee7e6 100644 --- a/home/profiles/graphical/discord.nix +++ b/home/profiles/graphical/discord.nix @@ -1,17 +1,12 @@ { pkgs, - lib, ... }: { home.packages = with pkgs; [ (discord-krisp.override { withOpenASAR = true; withMoonlight = true; - withVencord = false; # can do this here too }) - legcord - #dorion - #betterdiscordctl ]; programs.moonlight-mod = { diff --git a/home/profiles/graphical/floorp/config.nix b/home/profiles/graphical/firefox/config.nix similarity index 100% rename from home/profiles/graphical/floorp/config.nix rename to home/profiles/graphical/firefox/config.nix diff --git a/home/profiles/graphical/floorp/containers.nix b/home/profiles/graphical/firefox/containers.nix similarity index 96% rename from home/profiles/graphical/floorp/containers.nix rename to home/profiles/graphical/firefox/containers.nix index 73bef399..29bb08db 100644 --- a/home/profiles/graphical/floorp/containers.nix +++ b/home/profiles/graphical/firefox/containers.nix @@ -1,7 +1,4 @@ -{ - lib, - ... -}: { +_: { programs.firefox.profiles.main = { containersForce = true; containers = { diff --git a/home/profiles/graphical/floorp/main.nix b/home/profiles/graphical/firefox/main.nix similarity index 100% rename from home/profiles/graphical/floorp/main.nix rename to home/profiles/graphical/firefox/main.nix diff --git a/home/profiles/graphical/floorp/mtab.nix b/home/profiles/graphical/firefox/mtab.nix similarity index 100% rename from home/profiles/graphical/floorp/mtab.nix rename to home/profiles/graphical/firefox/mtab.nix diff --git a/home/profiles/graphical/floorp/tst.nix b/home/profiles/graphical/firefox/tst.nix similarity index 100% rename from home/profiles/graphical/floorp/tst.nix rename to home/profiles/graphical/firefox/tst.nix diff --git a/home/profiles/graphical/floorp/ublock.nix b/home/profiles/graphical/firefox/ublock.nix similarity index 100% rename from home/profiles/graphical/floorp/ublock.nix rename to home/profiles/graphical/firefox/ublock.nix diff --git a/home/profiles/shell/zsh.nix b/home/profiles/shell/zsh.nix index d0095715..1d45fbcf 100644 --- a/home/profiles/shell/zsh.nix +++ b/home/profiles/shell/zsh.nix @@ -1,5 +1,4 @@ { - self, config, lib, std, diff --git a/nixos/profiles/graphical/sound.nix b/nixos/profiles/graphical/sound.nix index 69f219f3..a8a322da 100644 --- a/nixos/profiles/graphical/sound.nix +++ b/nixos/profiles/graphical/sound.nix @@ -1,52 +1,58 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [pulsemixer pwvucontrol easyeffects]; - services.pulseaudio.enable = false; - services.pipewire.extraConfig.pipewire."92-low-latency" = { - "context.properties" = { - "default.clock.rate" = 48000; - "default.clock.quantum" = 256; - "default.clock.min-quantum" = 256; - "default.clock.max-quantum" = 256; - }; - }; - services.pipewire.extraConfig.pipewire-pulse."92-low-latency" = { - "context.properties" = [ - { - name = "libpipewire-module-protocol-pulse"; - args = {}; - } - ]; - "pulse.properties" = { - "pulse.min.req" = "512/48000"; - "pulse.default.req" = "512/48000"; - "pulse.max.req" = "512/48000"; - "pulse.min.quantum" = "512/48000"; - "pulse.max.quantum" = "512/48000"; - }; - "stream.properties" = { - "node.latency" = "256/48000"; - "resample.quality" = 1; + services = { + pulseaudio.enable = false; + pipewire = { + enable = true; + pulse.enable = true; + alsa.support32Bit = true; + jack.enable = true; + alsa.enable = true; + extraConfig = { + pipewire."92-low-latency" = { + "context.properties" = { + "default.clock.rate" = 48000; + "default.clock.quantum" = 256; + "default.clock.min-quantum" = 256; + "default.clock.max-quantum" = 256; + }; + }; + pipewire-pulse = { + "91-discord-latency" = { + pulse.rules = [ + { + matches = [{"application.process.binary" = "Discord";}]; + actions = { + update-props = { + "pulse.min.quantum" = "1024/48000"; + }; + }; + } + ]; + }; + "92-low-latency" = { + "context.properties" = [ + { + name = "libpipewire-module-protocol-pulse"; + args = {}; + } + ]; + "pulse.properties" = { + "pulse.min.req" = "512/48000"; + "pulse.default.req" = "512/48000"; + "pulse.max.req" = "512/48000"; + "pulse.min.quantum" = "512/48000"; + "pulse.max.quantum" = "512/48000"; + }; + "stream.properties" = { + "node.latency" = "256/48000"; + "resample.quality" = 1; + }; + }; + }; + }; }; }; security.rtkit.enable = true; - services.pipewire.extraConfig.pipewire-pulse."91-discord-latency" = { - pulse.rules = [ - { - matches = [{"application.process.binary" = "Discord";}]; - actions = { - update-props = { - "pulse.min.quantum" = "1024/48000"; - }; - }; - } - ]; - }; - services.pipewire = { - enable = true; - pulse.enable = true; - alsa.support32Bit = true; - jack.enable = true; - alsa.enable = true; - }; } diff --git a/shells/repo.nix b/shells/repo.nix index 18a4df14..0f3e3582 100644 --- a/shells/repo.nix +++ b/shells/repo.nix @@ -27,14 +27,7 @@ with pkgs; let repo.darwinConfigurations); shellHook = '' export CI_PLATFORM="impure" - sops echo -e "\e[39m\e[1m$USER@$REPO_HOSTNAME - \e[35m''$(realpath --relative-to=../ ./nixos/)\e[0m" - echo -e "\e[35mRunning alejandra\e[0m" - alejandra -cq $(fd -e nix) - echo -e "\e[35mRunning statix\e[0m" - statix check - echo -e "\e[35mRunning deadnix\e[0m" - deadnix ''; }; in