Compare commits

..

No commits in common. "12c5c1dffe5a71cd3e90946ff859888863ed3e52" and "aefc1a93ad5ed65688bfe4afda5f132e8c496274" have entirely different histories.

6 changed files with 24 additions and 40 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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