diff --git a/home/common/optional/desktop/hyprland/hyprland.nix b/home/common/optional/desktop/hyprland/hyprland.nix index 234c324..14afeb0 100644 --- a/home/common/optional/desktop/hyprland/hyprland.nix +++ b/home/common/optional/desktop/hyprland/hyprland.nix @@ -39,6 +39,7 @@ "$fileManager" = "${pkgs.uwsm}/bin/uwsm-app -- ${pkgs.pcmanfm}/bin/pcmanfm"; "$browser" = "${pkgs.uwsm}/bin/uwsm-app -- zen-beta"; "$menu" = "${pkgs.walker}/bin/walker"; + "$player" = "${pkgs.playerctl}/bin/playerctl --player=mpd,%any"; monitor = [ "eDP-1,preferred,1721x1080,auto" @@ -197,6 +198,7 @@ "$mainMod, M, exec, $terminal -e ${pkgs-unstable.gurk-rs}/bin/gurk" "$mainMod, P, exec, $terminal -e ${pkgs.ncmpcpp}/bin/ncmpcpp" + "$mainMod SHIFT, B, exec, $terminal -e \"$EDITOR\" /home/max/bible.txt -R" # "$mainMod, V, togglefloating," "$mainMod, space, exec, $menu" @@ -279,10 +281,10 @@ bindl = [ # Requires playerctl - ", XF86AudioNext, exec, playerctl next" - ", XF86AudioPause, exec, playerctl play-pause" - ", XF86AudioPlay, exec, playerctl play-pause" - ", XF86AudioPrev, exec, playerctl previous" + ", XF86AudioNext, exec, $player next" + ", XF86AudioPause, exec, $player play-pause" + ", XF86AudioPlay, exec, $player play-pause" + ", XF86AudioPrev, exec, $player previous" ]; bindd = [ diff --git a/home/common/optional/desktop/hyprland/waybar/config.jsonc b/home/common/optional/desktop/hyprland/waybar/config.jsonc index e0df961..790f800 100644 --- a/home/common/optional/desktop/hyprland/waybar/config.jsonc +++ b/home/common/optional/desktop/hyprland/waybar/config.jsonc @@ -5,7 +5,7 @@ "spacing": 0, "height": 26, "modules-left": ["custom/logo", "hyprland/workspaces"], - "modules-center": ["clock", "custom/update", "custom/screenrecording-indicator"], + "modules-center": ["clock", "custom/screenrecording-indicator"], "modules-right": [ "group/tray-expander", "custom/countdown", diff --git a/host/common/optional/font.nix b/host/common/optional/font.nix index d129000..2784aa5 100644 --- a/host/common/optional/font.nix +++ b/host/common/optional/font.nix @@ -4,6 +4,7 @@ sansSerif = [ "SF Pro" ]; serif = [ "SF Pro" ]; monospace = [ "JetBrainsMono Nerd Font" ]; + emoji = [ "Apple Color Emoji" ]; }; packages = with pkgs; [ diff --git a/host/common/optional/syncthing.nix b/host/common/optional/syncthing.nix new file mode 100644 index 0000000..6f4ef7b --- /dev/null +++ b/host/common/optional/syncthing.nix @@ -0,0 +1,20 @@ +{ ... }: +{ + services.syncthing = { + enable = true; + openDefaultPorts = true; + + settings = { + devices = { + "phone" = { id = "DBTMZ3P-VONFNYH-LDDNIO3-ZZ2TKO5-QFVV5D4-W4FMV67-HUTIJQB-UHNF3QM"; }; + }; + + folders = { + "Music" = { + path = "/home/max/media/music"; + devices = [ "phone" ]; + }; + }; + }; + }; +} diff --git a/host/max/default.nix b/host/max/default.nix index 0d24e03..5f5dcda 100644 --- a/host/max/default.nix +++ b/host/max/default.nix @@ -14,6 +14,7 @@ ../common/optional/locale.nix ../common/optional/email.nix ../common/optional/proton.nix + ../common/optional/syncthing.nix ]; # Use the systemd-boot EFI boot loader. diff --git a/host/max/home/browser.nix b/host/max/home/browser.nix index 1adf2ac..5699bea 100644 --- a/host/max/home/browser.nix +++ b/host/max/home/browser.nix @@ -51,6 +51,15 @@ Cryptomining = true; Fingerprinting = true; }; + + ExtensionSettings = { + # The default behaviour of ctrl+click, shift+click, cmd+click (on macOS) and middle-click when clicking on links is to open the link in a new tab (or new window in the case of shift). + # This behaviour is sometimes broken by silly developers. + "{18b670e2-67df-4b26-b9b0-34835d1f062a}" = { + install_url = "https://addons.mozilla.org/firefox/downloads/latest/link-fixer/latest.xpi"; + installation_mode = "force_installed"; + }; + }; }; profiles.default = let diff --git a/host/max/home/music.nix b/host/max/home/music.nix index 2bcff96..e31a149 100644 --- a/host/max/home/music.nix +++ b/host/max/home/music.nix @@ -7,6 +7,13 @@ services.mpd = { enable = true; musicDirectory = "/home/max/media/music"; + + extraConfig = '' + audio_output { + type "pipewire" + name "pipewire" + } + ''; }; services.mpd-mpris.enable = true; @@ -16,6 +23,9 @@ bindings = [ { key = "j"; command = "scroll_down"; } { key = "k"; command = "scroll_up"; } + { key = "h"; command = "previous_column"; } + { key = "l"; command = "next_column"; } + { key = "J"; command = [ "select_item" "scroll_down" ]; } { key = "K"; command = [ "select_item" "scroll_up" ]; } ];