diff --git a/.config/qutebrowser/greasemonkey/redirect.js b/.config/qutebrowser/greasemonkey/redirect.js index 101cd0f..9b711dc 100644 --- a/.config/qutebrowser/greasemonkey/redirect.js +++ b/.config/qutebrowser/greasemonkey/redirect.js @@ -253,14 +253,14 @@ const Instances = { ], libreddit: [ // "redditor.fly.dev", - "libreddit.kavin.rocks", + // "libreddit.kavin.rocks", // "libreddit.northboot.xyz", // "libreddit.kylrth.com", - "libreddit.privacy.com", + // "libreddit.privacy.com", // "l.opnxng.com", - "libreddit.projectsegfau.lt", + // "libreddit.projectsegfau.lt", "safereddit.com", - "libreddit.privacydev.net", + // "libreddit.privacydev.net", // "libreddit.freedit.eu", // "libreddit.mha.fi", // "lr.artemislena.eu", @@ -1201,7 +1201,7 @@ switch (urlHostname) { break; case urlHostname.includes("reddit.com") ? urlHostname : 0: - redirectReddit(); + // redirectReddit(); break; case urlHostname.includes("medium.com") ? urlHostname : 0: diff --git a/home/home.nix b/home/home.nix index 1e20525..acc2b38 100644 --- a/home/home.nix +++ b/home/home.nix @@ -45,7 +45,7 @@ in { enable = true; config = { common = { - default = [ pkgs.kdePackages.xdg-desktop-portal-kde pkgs.xdg-desktop-portal-cosmic ]; + default = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; "org.freedesktop.impl.portal.FileChooser" = [ "kde" ]; }; hyprland = { @@ -53,7 +53,7 @@ in { "org.freedesktop.impl.portal.FileChooser" = [ "kde" ]; }; }; - extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde pkgs.xdg-desktop-portal-cosmic ]; + extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; }; mimeApps = { enable = true; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index dafbc47..9a2e7af 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -109,7 +109,7 @@ in "special,monitor:DP-1,1,default:true" ]; input = { - repeat_rate = 140; + repeat_rate = 180; repeat_delay = 180; natural_scroll = 0; @@ -221,6 +221,7 @@ in mouse_move_enables_dpms = true; key_press_enables_dpms = true; disable_hyprland_logo = true; + anr_missed_pings = 10; }; # example window rules @@ -269,6 +270,7 @@ in ]; # example binds + binds.scroll_event_delay = 10; bind = [ "SUPER,RETURN,exec,alacritty" "SUPER,C,killactive," @@ -281,12 +283,15 @@ in "SUPER,v,exec,cliphist list | rofi -p '󱃔 ' -dmenu | cliphist decode | wl-copy" "SUPER,B,exec,/home/chris/bin/qblof" "SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer" - "SUPERCTRL,i,exec,alacritty --class btop -e btop" + "SUPER,i,exec,alacritty --class btop -e btop" "SUPERSHIFT,p,exec,${pkgs.hyprshot}/bin/hyprshot -m region" "SUPERALT,p,exec,${pkgs.hyprshot}/bin/hyprshot -m window" "SUPERCTRL,p,exec,${pkgs.hyprshot}/bin/hyprshot -m active" "SUPERSHIFT,mouse_down,exec,zoomin in" "SUPERSHIFT,mouse_up,exec,zoomin out" + "SUPER, mouse_down, exec, hyprctl -q keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor | awk '/^float.*/ {print $2 * 1.1}')" + "SUPER, mouse_up, exec, hyprctl -q keyword cursor:zoom_factor $(hyprctl getoption cursor:zoom_factor | awk '/^float.*/ {print $2 * 0.9}')" + "SUPERALT,r,exec,zoomin in" "SUPERALT,m,exec,zoomin out" "SUPERALT,f,exec,hyprctl keyword cursor:zoom_factor 1.0" @@ -341,7 +346,6 @@ in "SUPER,o,movewindow,mon:l" "SUPER,y,togglespecialworkspace" - "SUPER,i,movewindow,left" "SUPERSHIFT,p,pin" "SUPER,n,movetoworkspace,special" "SUPERALT,a,movetoworkspace,special:agenda" diff --git a/modules/desktop.nix b/modules/desktop.nix index 8d4cffc..72d9a73 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -33,7 +33,7 @@ in boot.supportedFilesystems = [ "ntfs" ]; services = { - desktopManager.cosmic.enable = true; + desktopManager.cosmic.enable = false; }; programs.nix-ld.enable = true; @@ -75,30 +75,34 @@ in }; services.displayManager.cosmic-greeter = { - enable = true; + enable = false; }; services.greetd = { enable = true; - # settings = rec { - # initial_session = { - # command = "dbus-run-session Hyprland"; - # # command = "dbus-run-session startplasma-wayland"; - # user = "chris"; - # }; - # default_session = { - # command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session Hyprland' -s /etc/greetd/environments"; - # user = "greeter"; - # }; - # plasma_session = { - # command = "dbus-run-session startplasma-wayland"; - # user = "chris"; - # }; - # hyprland_session = { - # command = "Hyprland"; - # user = "chris"; - # }; - # }; + settings = rec { + initial_session = { + command = "if uwsm check may-start; then + exec uwsm start hyprland-uwsm.desktop +fi"; + # command = "dbus-run-session startplasma-wayland"; + user = "chris"; + }; + default_session = { + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'if uwsm check may-start; then + exec uwsm start hyprland-uwsm.desktop +fi' -s /etc/greetd/environments"; + user = "greeter"; + }; + plasma_session = { + command = "dbus-run-session startplasma-wayland"; + user = "chris"; + }; + hyprland_session = { + command = "Hyprland"; + user = "chris"; + }; + }; }; programs.regreet = { enable = true; }; diff --git a/scripts/transcode-video.sh b/scripts/transcode-video.sh index 2de94e0..ae1ec40 100755 --- a/scripts/transcode-video.sh +++ b/scripts/transcode-video.sh @@ -1,6 +1,6 @@ #!/bin/sh for filename in *.mov; do - ffmpeg -hwaccel vaapi -hwaccel_output_format vaapi -hwaccel_device /dev/dri/renderD128 -i "${filename}" -vf 'format=nv12,hwupload' -c:v hevc_vaapi -c:a aac -crf 22 "${filename%.*}".mp4 + ffmpeg -init_hw_device vaapi=va:/dev/dri/renderD128 -filter_hw_device va -i "${filename}" -vf 'format=nv12,hwupload' -c:v h264_vaapi -c:a aac -crf 28 "${filename%.*}".mp4 rm $filename done