Compare commits

...

4 Commits

Author SHA1 Message Date
Nathan McCarty 12c5c1dffe
Media teaks
Get the waybar item configured how I want it, and remove iris in favor
of ymuse
2023-06-17 16:12:02 -04:00
Nathan McCarty c7c47a2832
Bind media keys with playerctl 2023-06-17 15:27:58 -04:00
Nathan McCarty cddbc870af
minor tweaks 2023-06-17 13:37:03 -04:00
Nathan McCarty 75175725b8
tweak vmware shortcuts 2023-06-17 13:06:24 -04:00
6 changed files with 40 additions and 24 deletions

View File

@ -190,6 +190,8 @@ in with lib; {
bind = , xf86audiolowervolume, exec, swayosd --output-volume=lower
bind = SHIFT, xf86audiolowervolume, exec, swayosd --output-volume=-2
bind = , xf86audiomute, exec, swayosd --output-volume mute-toggle
bind = , xf86audioplay, exec, playerctl play-pause
bind = , xf86audionext, exec, playerctl next
# Screenshots
bind = , print, exec, grimblast --scale 1 copysave area ~/Pictures/Screenshots/$(date -Iseconds).png
@ -317,7 +319,9 @@ in with lib; {
programs.waybar = {
enable = true;
package =
inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waybar.overrideAttrs
(inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waybar.override {
withMediaPlayer = true;
}).overrideAttrs
(old: { mesonFlags = old.mesonFlags ++ [ "-Dexperimental=true" ]; });
systemd = { enable = false; };
settings = {
@ -334,7 +338,7 @@ in with lib; {
modules-center = [
"custom/launcher"
"wlr/workspaces"
"mpd"
"custom/media"
# "hyprland/window"
"idle_inhibitor"
"pulseaudio"
@ -398,19 +402,17 @@ in with lib; {
spacing = 10;
};
"clock" = { format = "{:%I:%M%p %Y-%m-%d}"; };
"mpd" = {
format =
"{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})";
format-disconnected = "Disconnected ";
format-stopped =
"{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ";
consume-icons = { on = "🍴"; };
random-icons = { on = "🔀"; };
repeat-icons = { on = "🔁"; };
state-icons = {
paused = "";
playing = "";
"custom/media" = {
format = "{icon} {}";
return-type = "json";
max-length = 50;
format-icons = {
spotify = " ";
default = " ";
};
escape = true;
exec = "waybar-mediaplayer.py 2> /dev/null";
on-click = "playerctl play-pause";
};
"custom/notification" = {
tooltip = false;
@ -628,6 +630,15 @@ in with lib; {
color: red;
}
#custom-media {
background-color: #8EC5FC;
background-image: linear-gradient(62deg, #8EC5FC 0%, #E0C3FC 100%);
color: black;
border-radius: 20px;
margin-right: 5px;
}
#custom-media {
background-color: #8EC5FC;
background-image: linear-gradient(62deg, #8EC5FC 0%, #E0C3FC 100%);

View File

@ -4,13 +4,6 @@ let
config = { allowUnfree = true; };
system = pkgs.system;
};
irisDesktopItem = pkgs.makeDesktopItem {
name = "iris";
desktopName = "Iris";
exec =
''${pkgs.chromium}/bin/chromium "--app=http://localhost:6680/iris/"'';
terminal = false;
};
in {
config = lib.mkMerge [
(lib.mkIf config.nathan.programs.media.enable {
@ -21,10 +14,11 @@ in {
unstable.jellyfin-media-player
unstable.obs-studio
nicotine-plus
irisDesktopItem
picard
mpc-cli
calibre
playerctl
ymuse
];
# Register haruna as the default video player
xdg.mimeApps.defaultApplications = {
@ -43,6 +37,7 @@ in {
mopidy-iris
mopidy-scrobbler
mopidy-local
mopidy-mpris
];
# extraConfigFiles = config.nathan.programs.media.mopidyExtraConfig;
settings = {
@ -52,6 +47,7 @@ in {
media_dir = "~/Music";
};
mpd = { enabled = true; };
mpris = { enabled = true; };
};
extraConfigFiles = [ nixosConfig.sops.secrets."last.fm".path ];
};

View File

@ -41,7 +41,7 @@
# disable 10 bit output for now as this breaks screenshots
monitor=DP-1,preferred,auto,1.4
input {
sensitivity = -0.3
sensitivity = -0.8
# accel_profile = flat
}
exec-once=hyprpaper

View File

@ -55,6 +55,8 @@ in with lib; {
pulseaudio
pavucontrol
noisetorch
alsa-utils
alsa-lib
];
# Add noisetorch for microphone noise canceling
programs.noisetorch = { enable = true; };

View File

@ -1,5 +1,6 @@
#!/usr/bin/env bash
hyprctl dispatch exec -- "[float;size 1829 1029] gamescope -W 2560 -w 2560 -H 1440 -h 1440 --scaler integer --force-windows-fullscreen -- vmware"
hyprctl dispatch exec -- "[float;size 1829 1029] gamescope -W 2560 -w 2560 \
-H 1440 -h 1440 --scaler integer --force-windows-fullscreen --rt -- vmware"
wait

6
shortcuts/vmware/fullscreen Executable file
View File

@ -0,0 +1,6 @@
#!/usr/bin/env bash
hyprctl dispatch exec -- "[float;size 1829 1029] gamescope --scaler integer \
--force-windows-fullscreen -f --rt -- vmware"
wait