diff options
| -rw-r--r-- | flake.lock | 60 | ||||
| -rw-r--r-- | hm/env/niri/binds.nix | 11 | ||||
| -rw-r--r-- | hm/env/niri/niri.nix | 2 | ||||
| -rw-r--r-- | hm/env/swaylock.nix | 32 | ||||
| -rw-r--r-- | hm/soft/mpv.nix | 5 | ||||
| -rw-r--r-- | hm/soft/nixcord.nix | 5 | ||||
| -rw-r--r-- | hosts/desktop/configuration.nix | 20 | ||||
| -rw-r--r-- | os/core/fonts.nix | 1 | ||||
| -rw-r--r-- | os/core/security.nix | 1 |
9 files changed, 99 insertions, 38 deletions
@@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -232,11 +232,11 @@ ] }, "locked": { - "lastModified": 1767556355, - "narHash": "sha256-RDTUBDQBi9D4eD9iJQWtUDN/13MDLX+KmE+TwwNUp2s=", + "lastModified": 1767733722, + "narHash": "sha256-R0CZ0BiOaUqFLMDZKv7+I0sdeyzjlc40QmRR7zSwvkM=", "owner": "nix-community", "repo": "home-manager", - "rev": "f894bc4ffde179d178d8deb374fcf9855d1a82b7", + "rev": "6e94d8157c941d4dd6fc39866592699043b73668", "type": "github" }, "original": { @@ -277,11 +277,11 @@ ] }, "locked": { - "lastModified": 1767571560, - "narHash": "sha256-YVSqPQ9m7sr/SJRGW/lwJ0HsKIhmDryF/GdKiOF6/FA=", + "lastModified": 1767657911, + "narHash": "sha256-nQOe84JaJN45rPHEK7+4mxPH7ZXnUFRoKB5vTIMjOZw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "966191072e64eb98c74befc6a623798d3d20efc3", + "rev": "604d6efcf77db13aca9e618f3d914c29d5923c9f", "type": "github" }, "original": { @@ -293,11 +293,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1767568020, - "narHash": "sha256-vOTmVi6QXdHxvOEnzcSuGZebD1bDpr/K4efIq8yEQd0=", + "lastModified": 1767655057, + "narHash": "sha256-RwUtdcoSeiuNH2FfXrCfwtI4QX65oUXSkxtf5HO9urc=", "owner": "neovim", "repo": "neovim", - "rev": "efa6d91132c71d6efca1b813b0129b1085389a48", + "rev": "e38c9f734a262e3e7595434ca009f961afcccef2", "type": "github" }, "original": { @@ -318,11 +318,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1767544157, - "narHash": "sha256-DVTMOUd4uHkDcZXWAqOS+Pa0M9a27G1Ya3B7SFG6BQs=", + "lastModified": 1767721577, + "narHash": "sha256-Q+dtentC9LrpHLOBC6nYSap4BUH0FFmAtAkvsVGiCiM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d0e2c4bebf9d0b879410736f7abce628976bfb92", + "rev": "3c7bdf49e4ed7c9f1bf2a4209052b4352e260b6a", "type": "github" }, "original": { @@ -351,11 +351,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1767530622, - "narHash": "sha256-ywnL1cc0A6fni7m859ImiBYA8DlXXJ+5OXIlcBqJ2B0=", + "lastModified": 1767598098, + "narHash": "sha256-IyH3zaCT2JZ6fdY4vKlUz2RbDdxaryvSZWUVixKYrKM=", "owner": "YaLTeR", "repo": "niri", - "rev": "54c2e2ab476629d17fdba861895f58e7cdac32ab", + "rev": "b7eb8a635b7f75705808eaed85c016f02ae4fd2d", "type": "github" }, "original": { @@ -396,11 +396,11 @@ ] }, "locked": { - "lastModified": 1767573258, - "narHash": "sha256-X59Wae/94E1vFg2/a/dX+vCBCm2brTcMuUPDyVpZ4HE=", + "lastModified": 1767715368, + "narHash": "sha256-3JkfCB4MwVMLlC8N/ATth3saUF9kD1WQiIF/quDpvNo=", "owner": "KaylorBen", "repo": "nixcord", - "rev": "9c7cf5c05529c566f71315b1c8593ac5a39221e8", + "rev": "f391c270ad2c74a94d99cbc9ad6a57478111c6de", "type": "github" }, "original": { @@ -474,11 +474,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1767640445, + "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", "type": "github" }, "original": { @@ -513,11 +513,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1767553127, - "narHash": "sha256-H6JzPMmvBYlGjIBgrHIS2dFXh05h4bwMJTZTn3IGVtc=", + "lastModified": 1767608728, + "narHash": "sha256-kmSJCTgrx+BxgqQOTPHAOkohvO+lbRsPWqu+PSPcz3I=", "owner": "nix-community", "repo": "nixvim", - "rev": "3d7bcda3d163c1c38e231f81e0e90155b7b9e9bf", + "rev": "851399eebd0fb383d2fd76269d859f16021dc7a8", "type": "github" }, "original": { @@ -775,11 +775,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1767501306, - "narHash": "sha256-dNDwlMM+k20c2Lnm+hqUvzu5l3Ip9GeP+nnj4WlDVdw=", + "lastModified": 1767671748, + "narHash": "sha256-tZpnam3sKHg5jDt39npl8wCFTt5+jtgjDf3pmjYhhKQ=", "owner": "sxyazi", "repo": "yazi", - "rev": "3c39a326abaacb37d9ff15af7668756d60624dfa", + "rev": "c9327ca85180afddf365d4bbcab329ae9a10ff96", "type": "github" }, "original": { diff --git a/hm/env/niri/binds.nix b/hm/env/niri/binds.nix index f2b8540..45caece 100644 --- a/hm/env/niri/binds.nix +++ b/hm/env/niri/binds.nix @@ -14,9 +14,13 @@ in # Audio XF86AudioRaiseVolume.action = playerctl "volume" "0.02+"; XF86AudioLowerVolume.action = playerctl "volume" "0.02-"; - XF86AudioMute.action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; - XF86AudioMicMute.action = spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; - + XF86AudioMute = { + allow-when-locked = true; + action = spawn "sh" "-c" '' + wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && \ + wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle + ''; + }; # Media keys XF86AudioPlay.action = playerctl "play-pause"; XF86AudioPrev.action = playerctl "previous"; @@ -61,6 +65,7 @@ in "Mod+C".action = spawn "qalculate-gtk"; "Mod+BracketLeft".action = consume-or-expel-window-left; "Mod+BracketRight".action = consume-or-expel-window-right; + "Super+L".action = spawn "swaylock"; "Mod+R".action = switch-preset-column-width; "Mod+Shift+R".action = reset-window-height; diff --git a/hm/env/niri/niri.nix b/hm/env/niri/niri.nix index 02e7472..fbbb5f2 100644 --- a/hm/env/niri/niri.nix +++ b/hm/env/niri/niri.nix @@ -17,6 +17,7 @@ in debug.disable-cursor-plane = []; binds = import ./binds.nix { inherit config lib pkgs; }; + # animations.enable = false; prefer-no-csd = true; hotkey-overlay.skip-at-startup = true; input = { @@ -90,6 +91,7 @@ in }; home.packages = with pkgs; [ qalculate-gtk + gavin-bc ]; }; } diff --git a/hm/env/swaylock.nix b/hm/env/swaylock.nix index afde020..bbc4483 100644 --- a/hm/env/swaylock.nix +++ b/hm/env/swaylock.nix @@ -8,6 +8,38 @@ in programs.swaylock = { enable = true; package = pkgs.swaylock-effects; + settings = { + color = "000000"; + indicator-idle-visible = true; + indicator-radius = 150; + indicator-thickness = 0; + clock = true; + timestr = "%H:%M"; + datestr = ""; + bs-hl-color = "000000"; + caps-lock-bs-hl-color = "000000"; + caps-lock-key-hl-color = "000000"; + font = "Terminus"; + font-size = 48; + # this is so ass + inside-color = "000000"; + inside-clear-color = "000000"; + inside-caps-lock-color = "000000"; + inside-ver-color = "000000"; + inside-wrong-color = "000000"; + key-hl-color = "000000"; + line-uses-ring = true; + ring-color = "000000"; + ring-clear-color = "000000"; + ring-caps-lock-color = "000000"; + ring-ver-color = "000000"; + ring-wrong-color = "000000"; + text-color = "ffffff"; + text-clear-color = "ffffff"; + text-caps-lock-color = "ff0000"; + text-ver-color = "ffffff"; + text-wrong-color = "ff0000"; + }; }; }; } diff --git a/hm/soft/mpv.nix b/hm/soft/mpv.nix index 08f97e6..4e4d08e 100644 --- a/hm/soft/mpv.nix +++ b/hm/soft/mpv.nix @@ -39,7 +39,10 @@ in profile = "gpu-hq"; gpu-api = "vulkan"; vo = "gpu-next"; - hwdec = "vaapi-copy"; + + hwdec = "vaapi"; + gpu-hwdec-interop = "vaapi"; + hwdec-codecs = "all"; scale = "ewa_lanczossharp"; cscale = "ewa_lanczos"; diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix index 8c2f002..2f12aca 100644 --- a/hm/soft/nixcord.nix +++ b/hm/soft/nixcord.nix @@ -1,4 +1,4 @@ -{ inputs, config, lib, pkgs, ... }: +{ inputs, config, lib, ... }: let cfg = config.hm.soft.nixcord; in @@ -11,7 +11,6 @@ in enable = true; discord = { enable = true; - package = pkgs.discord-krisp; autoscroll.enable = true; vencord.enable = false; @@ -25,7 +24,7 @@ in frameless = true; plugins = { ClearURLs.enable = true; - NoRPC.enable = true; + RPCEditor.enable = true; OnePingPerDM.enable = true; PinDMs = { enable = true; canCollapseDmSection = true; }; SaveFavoriteGIFs.enable = true; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index a80cb60..7da98ae 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -1,4 +1,4 @@ -{ config, inputs, username, ... }: +{ config, inputs, pkgs, username, ... }: { system.stateVersion = "25.05"; @@ -75,4 +75,22 @@ config.boot.kernelPackages.nct6687d ]; }; + services.pipewire.wireplumber.extraConfig."99-disable-useless-devices"."monitor.alsa.rules" = [{ + matches = [ + { "device.name" = "~alsa_card.pci-0000_03_00.1*"; } + { "device.description" = "~USB Audio*"; } + ]; + actions.update-props = { "device.disabled" = true; }; + }]; + + systemd.user.services.zzz-presence = { + description = "Zenless Zone Zero Discord Rich Presence"; + wantedBy = [ "default.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.python3.withPackages (ps: [ ps.pypresence ])}/bin/python3 /etc/nixos/hosts/desktop/resources/zzz.py"; + Restart = "always"; + RestartSec = "10"; + }; + }; } diff --git a/os/core/fonts.nix b/os/core/fonts.nix index 85f8256..dac0ee7 100644 --- a/os/core/fonts.nix +++ b/os/core/fonts.nix @@ -14,6 +14,7 @@ in }; fonts.packages = with pkgs; [ + terminus_font nerd-fonts.jetbrains-mono nerd-fonts.fira-mono nerd-fonts.fira-code diff --git a/os/core/security.nix b/os/core/security.nix index 839010b..e8c541c 100644 --- a/os/core/security.nix +++ b/os/core/security.nix @@ -8,6 +8,7 @@ in services.gnome.gnome-keyring.enable = true; security = { + pam.services.swaylock = {}; polkit.enable = true; rtkit.enable = true; }; |