diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 83f3a3f..2aadff0 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,214 +1,214 @@ - monitor=eDP-1,2256x1504@60,0x0,1.5 - workspace=eDP-1,1 - monitor=HDMI-A-1,preferred,0x0,1 - monitor=DP-1,preferred,2680x0,1.5 - monitor=DP-2,preferred,1600x0,1 - workspace=DP-2,2 - workspace=DP-1,1 - workspace=HDMI-A-1,3 - monitor=DP-2,transform,1 +monitor=eDP-1,2256x1504@60,0x0,1.5 +workspace=eDP-1,1 +monitor=HDMI-A-1,preferred,0x0,1 +monitor=DP-1,preferred,2680x0,1.5 +monitor=DP-2,preferred,1600x0,1 +workspace=DP-2,2 +workspace=DP-1,1 +workspace=HDMI-A-1,3 +monitor=DP-2,transform,1 - input { - # kb_layout= - # kb_variant= - # kb_model= - # kb_options= - # kb_rules= - repeat_rate=140 - repeat_delay=180 - natural_scroll=0 - sensitivity=0.75 - accel_profile=adaptive +input { + # kb_layout= + # kb_variant= + # kb_model= + # kb_options= + # kb_rules= + repeat_rate=140 + repeat_delay=180 + natural_scroll=0 + sensitivity=0.75 + accel_profile=adaptive - follow_mouse=2 + follow_mouse=2 - touchpad { - natural_scroll=1 - clickfinger_behavior=1 - } + touchpad { + natural_scroll=1 + clickfinger_behavior=1 } +} - general { - max_fps=60 # deprecated, unused - # main_mod=SUPER +general { + max_fps=60 # deprecated, unused + # main_mod=SUPER - gaps_in=15 - gaps_out=20 - border_size=0 - col.active_border=0x66ee1111 - col.inactive_border=0x66333333 + gaps_in=15 + gaps_out=20 + border_size=0 + col.active_border=0x66ee1111 + col.inactive_border=0x66333333 - #damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer - layout=master - } + #damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer + layout=master +} - gestures { - workspace_swipe=true - workspace_swipe_fingers=3 - } +gestures { + workspace_swipe=true + workspace_swipe_fingers=3 +} - decoration { - rounding=18 - multisample_edges=true - active_opacity=0.97 - inactive_opacity=0.75 - fullscreen_opacity=1.0 - blur=true - blur_new_optimizations=true - blur_size=10 # minimum 1 - blur_passes=3 # minimum 1, more passes = more resource intensive. - blur_ignore_opacity=false - # Your blur "amount" is blur_size * blur_passes, but high blur_size (over around 5-ish) will produce artifacts. - # if you want heavy blur, you need to up the blur_passes. - # the more passes, the more you can up the blur_size without noticing artifacts. +decoration { + rounding=18 + multisample_edges=true + active_opacity=0.97 + inactive_opacity=0.75 + fullscreen_opacity=1.0 + blur=true + blur_new_optimizations=true + blur_size=10 # minimum 1 + blur_passes=3 # minimum 1, more passes = more resource intensive. + blur_ignore_opacity=false + # Your blur "amount" is blur_size * blur_passes, but high blur_size (over around 5-ish) will produce artifacts. + # if you want heavy blur, you need to up the blur_passes. + # the more passes, the more you can up the blur_size without noticing artifacts. - drop_shadow=true - shadow_range=15 - shadow_offset=5 5 - shadow_scale=0.99 - shadow_render_power=1 - col.shadow = rgba(000000cc) - dim_inactive=true - dim_strength=0.2 - } + drop_shadow=true + shadow_range=15 + shadow_offset=5 5 + shadow_scale=0.99 + shadow_render_power=1 + col.shadow = rgba(000000cc) + dim_inactive=true + dim_strength=0.2 +} - bezier=snapslide,0.07,0.66,0.04,1.02 +bezier=snapslide,0.07,0.66,0.04,1.02 - animations { - enabled=1 - animation=windows,1,2,snapslide - # animation=borders,1,10,default - animation=fadeIn,1,2,snapslide - animation=workspaces,1,2,snapslide - animation=specialWorkspace,1,2,snapslide,slidevert - } +animations { + enabled=1 + animation=windows,1,2,snapslide + # animation=borders,1,10,default + animation=fadeIn,1,2,snapslide + animation=workspaces,1,2,snapslide + animation=specialWorkspace,1,2,snapslide,slidevert +} - dwindle { - pseudotile=0 # enable pseudotiling on dwindle - } +dwindle { + pseudotile=0 # enable pseudotiling on dwindle +} - master { - special_scale_factor=0.8 - mfact=0.65 - new_is_master=false - new_on_top=false - } +master { + special_scale_factor=0.8 + mfact=0.65 + new_is_master=false + new_on_top=false +} - # misc:disable_autoreload = true - misc { - focus_on_activate = true - } +# misc:disable_autoreload = true +misc { + focus_on_activate = true +} - # example window rules - # for windows named/classed as abc and xyz - windowrule=opaque,firefox - windowrule=float,dolphin - windowrule=size 60% 60%,dolphin - windowrule=float,mpv - windowrule=size 90% 76%,mpv - windowrule=center,mpv - windowrule=opaque,mpv - # windowrule=pin,mpv - windowrule=float,pulsemixer - windowrule=workspace 2,firefox - windowrule=workspace 1,emacs - windowrule=float,btop - windowrule=size 70% 70%,btop - windowrule=center,btop - windowrule=float,presenter - windowrule=size 80% 80%,presenter - windowrule=center,presenter - windowrule=workspace 1,title:presentation-window +# example window rules +# for windows named/classed as abc and xyz +windowrule=opaque,firefox +windowrule=float,dolphin +windowrule=size 60% 60%,dolphin +windowrule=float,mpv +windowrule=size 90% 76%,mpv +windowrule=center,mpv +windowrule=opaque,mpv +# windowrule=pin,mpv +windowrule=float,pulsemixer +windowrule=workspace 2,firefox +windowrule=workspace 1,emacs +windowrule=float,btop +windowrule=size 70% 70%,btop +windowrule=center,btop +windowrule=float,presenter +windowrule=size 80% 80%,presenter +windowrule=center,presenter +windowrule=workspace 1,title:presentation-window - # example binds - bind = SUPER,RETURN,exec,alacritty - bind = SUPER,C,killactive, - bind = SUPERSHIFT,Q,exit, - bind = SUPERSHIFT,D,exec,dolphin - bind = SUPERSHIFT,F,togglefloating, - bindr = SUPER,Super_L,exec,/home/chris/bin/launcher.sh - bindr = ALT,Alt_R,exec,/home/chris/bin/window.sh - bind = SUPER,w,exec,/home/chris/bin/window.sh - bind = SUPER,E,exec,/home/chris/bin/emacslof - bind = SUPER,d,exec,emacsclient -c -e '(dired-jump)' - bind = SUPER,v,exec,emacsclient -e '(chris/dired-open-videos)' - bind = SUPER,B,exec,/home/chris/bin/fflof - bind = SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer - bind = SUPERCTRL,i,exec,alacritty --class btop -e btop - bind = ,Print,exec,screenshot +# example binds +bind = SUPER,RETURN,exec,alacritty +bind = SUPER,C,killactive, +bind = SUPERSHIFT,Q,exit, +bind = SUPERSHIFT,D,exec,dolphin +bind = SUPERSHIFT,F,togglefloating, +bindr = SUPER,Super_L,exec,/home/chris/bin/launcher.sh +bindr = ALT,Alt_R,exec,/home/chris/bin/window.sh +bind = SUPER,w,exec,/home/chris/bin/window.sh +bind = SUPER,E,exec,/home/chris/bin/emacslof +bind = SUPER,d,exec,emacsclient -c -e '(dired-jump)' +bind = SUPER,v,exec,emacsclient -e '(chris/dired-open-videos)' +bind = SUPER,B,exec,/home/chris/bin/fflof +bind = SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer +bind = SUPERCTRL,i,exec,alacritty --class btop -e btop +bind = ,Print,exec,screenshot - bind = SUPER,P,exec,/home/chris/bin/rbw.sh - bind = SUPER,M,fullscreen,1 - bind = SUPER,F,fullscreen,0 +bind = SUPER,P,exec,/home/chris/bin/rbw.sh +bind = SUPER,M,fullscreen,1 +bind = SUPER,F,fullscreen,0 - bind = SUPER,h,movefocus,l - bind = SUPER,l,movefocus,r - bind = SUPER,k,layoutmsg,cycleprev - bind = SUPER,j,layoutmsg,cyclenext - bind = SUPERSHIFT,h,movewindow,l - bind = SUPERSHIFT,l,movewindow,r - bind = SUPERSHIFT,k,layoutmsg,swapprev - bind = SUPERSHIFT,j,layoutmsg,swapnext - bind = SUPERCTRL,l,splitratio,+0.05 - bind = SUPERCTRL,h,splitratio,-0.05 - bind = SUPERCTRL,c,centerwindow +bind = SUPER,h,movefocus,l +bind = SUPER,l,movefocus,r +bind = SUPER,k,layoutmsg,cycleprev +bind = SUPER,j,layoutmsg,cyclenext +bind = SUPERSHIFT,h,movewindow,l +bind = SUPERSHIFT,l,movewindow,r +bind = SUPERSHIFT,k,layoutmsg,swapprev +bind = SUPERSHIFT,j,layoutmsg,swapnext +bind = SUPERCTRL,l,splitratio,+0.05 +bind = SUPERCTRL,h,splitratio,-0.05 +bind = SUPERCTRL,c,centerwindow - bind = SUPER,1,workspace,1 - bind = SUPER,2,workspace,2 - bind = SUPER,3,workspace,3 - bind = SUPER,4,workspace,4 - bind = SUPER,5,workspace,5 - bind = SUPER,6,workspace,6 - bind = SUPER,7,workspace,7 - bind = SUPER,8,workspace,8 - bind = SUPER,9,workspace,9 - bind = SUPER,0,workspace,10 +bind = SUPER,1,workspace,1 +bind = SUPER,2,workspace,2 +bind = SUPER,3,workspace,3 +bind = SUPER,4,workspace,4 +bind = SUPER,5,workspace,5 +bind = SUPER,6,workspace,6 +bind = SUPER,7,workspace,7 +bind = SUPER,8,workspace,8 +bind = SUPER,9,workspace,9 +bind = SUPER,0,workspace,10 - bind = SUPERALT,l,workspace,m+1 - bind = SUPERALT,h,workspace,m-1 +bind = SUPERALT,l,workspace,m+1 +bind = SUPERALT,h,workspace,m-1 - bind = SUPERSHIFT,1,movetoworkspace,1 - bind = SUPERSHIFT,2,movetoworkspace,2 - bind = SUPERSHIFT,3,movetoworkspace,3 - bind = SUPERSHIFT,4,movetoworkspace,4 - bind = SUPERSHIFT,5,movetoworkspace,5 - bind = SUPERSHIFT,6,movetoworkspace,6 - bind = SUPERSHIFT,7,movetoworkspace,7 - bind = SUPERSHIFT,8,movetoworkspace,8 - bind = SUPERSHIFT,9,movetoworkspace,9 - bind = SUPERSHIFT,0,movetoworkspace,10 +bind = SUPERSHIFT,1,movetoworkspace,1 +bind = SUPERSHIFT,2,movetoworkspace,2 +bind = SUPERSHIFT,3,movetoworkspace,3 +bind = SUPERSHIFT,4,movetoworkspace,4 +bind = SUPERSHIFT,5,movetoworkspace,5 +bind = SUPERSHIFT,6,movetoworkspace,6 +bind = SUPERSHIFT,7,movetoworkspace,7 +bind = SUPERSHIFT,8,movetoworkspace,8 +bind = SUPERSHIFT,9,movetoworkspace,9 +bind = SUPERSHIFT,0,movetoworkspace,10 - bind = SUPER,o,movewindow,mon:l - bind = SUPER,y,togglespecialworkspace - bind = SUPER,i,movewindow,left - bind = SUPERSHIFT,p,pin - bind = SUPER,n,movetoworkspace,special +bind = SUPER,o,movewindow,mon:l +bind = SUPER,y,togglespecialworkspace +bind = SUPER,i,movewindow,left +bind = SUPERSHIFT,p,pin +bind = SUPER,n,movetoworkspace,special - binde = , XF86AudioMute, exec, pamixer -t - binde = , XF86AudioRaiseVolume, exec, /home/chris/bin/volup - binde = , XF86AudioLowerVolume, exec, /home/chris/bin/voldown - binde = ,F1, exec, pamixer -t - binde = ,F3, exec, /home/chris/bin/volup - binde = ,F2, exec, /home/chris/bin/voldown - binde = , XF86MonBrightnessUp, exec, brightnessctl s +10% - binde = , XF86MonBrightnessDown, exec, brightnessctl s 10%- +binde = , XF86AudioMute, exec, pamixer -t +binde = , XF86AudioRaiseVolume, exec, /home/chris/bin/volup +binde = , XF86AudioLowerVolume, exec, /home/chris/bin/voldown +binde = ,F1, exec, pamixer -t +binde = ,F3, exec, /home/chris/bin/volup +binde = ,F2, exec, /home/chris/bin/voldown +binde = , XF86MonBrightnessUp, exec, brightnessctl s +10% +binde = , XF86MonBrightnessDown, exec, brightnessctl s 10%- - bind=SUPERCTRL,b,exec,/home/chris/bin/wb-toggle - bind=SUPERALT,n,exec,eww update rightside=true +bind=SUPERCTRL,b,exec,/home/chris/bin/wb-toggle +bind=SUPERALT,n,exec,eww update rightside=true - bindm=SUPER,mouse:272,movewindow - bindm=SUPER,mouse:273,resizewindow +bindm=SUPER,mouse:272,movewindow +bindm=SUPER,mouse:273,resizewindow - # Blur waybar - # blurls=gtk-layer-shell - # blurls=notifications +# Blur waybar +# blurls=gtk-layer-shell +# blurls=notifications - exec-once = /home/chris/bin/startup.sh - exec-once = swww init - exec-once = swww img /home/chris/Pictures/wallpapers/nixorange.webp -t grow --transition-bezier .14,0,.14,.99 - exec-once = dunst - exec-once = hyprctl dispatch --batch "splitratio 1; splitration -0.35" - exec-once = dbus-update-activation-environment --all - exec-once = jellyfin-mpv-shim - exec-once = hyprctl setcursor phinger-cursors-light 24 - exec-once = swayidle -w timeout 300 'swaylock -S --effect-blur 20x3 --fade-in 1 --effect-vignette 0.5:1 --grace 60' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -S --effect-blur 20x3 --effect-vignette 0.5:1' +exec-once = /home/chris/bin/startup.sh +exec-once = swww init +exec-once = swww img /home/chris/pics/wallpapers/nixorange.webp -t grow --transition-bezier .14,0,.14,.99 +exec-once = dunst +exec-once = hyprctl dispatch --batch "splitratio 1; splitration -0.35" +exec-once = dbus-update-activation-environment --all +exec-once = jellyfin-mpv-shim +exec-once = hyprctl setcursor phinger-cursors-light 24 +exec-once = swayidle -w timeout 300 'swaylock -S --effect-blur 20x3 --fade-in 1 --effect-vignette 0.5:1 --grace 60' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -S --effect-blur 20x3 --effect-vignette 0.5:1' diff --git a/.config/mpv/scripts/chapters.js b/.config/mpv/scripts/chapters.js deleted file mode 100644 index c89b8c3..0000000 --- a/.config/mpv/scripts/chapters.js +++ /dev/null @@ -1,173 +0,0 @@ -"use strict"; - -//display chapter on osd and easily switch between chapters by click on title of chapter -mp.register_event("file-loaded", init); -mp.observe_property("chapter", "number", onChapterChange); -mp.observe_property("chapter-list/count", "number", init); -var options = { - font_size: 16, - font_color: "00FFFF", - border_size: 1.0, - border_color: "000000", - font_color_currentChapter: "C27F1B", -}; -var playinfo = { - chapters: [], //array - chaptercount: "", // int - assinterface: [], //array(deprecated, use single assdraw instead) - currentChapter: "", //int - loaded:false, -}; -var toggle_switch = false; -var assdraw = mp.create_osd_overlay("ass-events"); -var autohidedelay = mp.get_property_number("cursor-autohide"); -//function -function init() { - playinfo.chapters = getChapters(); - playinfo.chaptercount = playinfo.chapters.length; - if(playinfo.chaptercount == 0){ - return; - } - while (playinfo.chaptercount * options.font_size > 1000 / 1.5) { - options.font_size = options.font_size - 1; - } - drawChapterList(); - mp.msg.info("initiated"); - playinfo.loaded = true; -} -function getChapters() { - var chapterCount = mp.get_property("chapter-list/count"); - if (chapterCount === 0) { - return ["null"]; - } else { - var chaptersArray = []; - for (var index = 0; index < chapterCount; index++) { - var chapterTitle = mp.get_property_native( - "chapter-list/" + index + "/title" - ); - - if (chapterTitle != undefined) { - chaptersArray.push(chapterTitle); - } - } - return chaptersArray; - } -} - -function drawChapterList() { - var resY = 0; - var resX = 0; - var assdrawdata = ""; - function setPos(str, _X, _Y) { - str = str + "{\\pos(" + _X + ", " + _Y + ")}"; - return str; - } - function setborderSize(str) { - str = str + "{\\bord" + options.border_size + "}"; - return str; - } - function setborderColor(str) { - str = str + "{\\3c&H" + options.border_color + "&}"; - return str; - } - function setFontColor(str, index) { - var _color; - if (playinfo.currentChapter == index) { - _color = options.font_color_currentChapter; - } else { - _color = options.font_color; - } - str = str + "{\\c&H" + _color + "&}"; - return str; - } - function setFont(str) { - str = str + "{\\fs" + options.font_size + "}"; - return str; - } - function setEndofmodifiers(str) { - str = str + "{\\p0}"; - return str; - } - function setEndofLine(str) { - str = str + "\n"; - return str; - } - playinfo.chapters.forEach(function (element, index) { - assdrawdata = setPos(assdrawdata, resX, resY); - assdrawdata = setborderSize(assdrawdata); - assdrawdata = setborderColor(assdrawdata); - assdrawdata = setFontColor(assdrawdata, index); - assdrawdata = setFont(assdrawdata); - assdrawdata = setEndofmodifiers(assdrawdata); - assdrawdata = assdrawdata + element; - assdrawdata = setEndofLine(assdrawdata); - resY += options.font_size; - }); - assdraw.data = assdrawdata - -} - -function toggleOverlay() { - if(!playinfo.loaded){ - return; - } - if (!toggle_switch) { - drawChapterList(); - assdraw.update(); - mp.set_property("cursor-autohide", "no"); - toggle_switch = !toggle_switch; - } else { - assdraw.remove(); - mp.set_property("cursor-autohide", autohidedelay); - toggle_switch = !toggle_switch; - } -} - -function onChapterChange() { - playinfo.currentChapter = mp.get_property_native("chapter"); - if (playinfo.currentChapter != undefined) { - drawChapterList(); - } - - if ((playinfo.currentChapter != undefined) & toggle_switch) { - assdraw.update(); - } -} -function pos2chapter(x, y, overallscale) { - var vectical = y / (options.font_size * overallscale); - if(vectical > playinfo.chaptercount){ - return null; - } - var intVectical = Math.floor(vectical); - var lengthofTitleClicked = playinfo.chapters[intVectical].length; - var lengthofTitleClicked_px = - (lengthofTitleClicked * options.font_size) / overallscale; - if (x < lengthofTitleClicked_px) { - return intVectical; - } else { - return null; - } -} -function getOverallScale() { - return mp.get_osd_size().height / 720; -} -function onMBTN_LEFT() { - //get mouse position - if(!playinfo.loaded){ - return; - } - if (toggle_switch) { - var overallscale = getOverallScale(); - var pos = mp.get_mouse_pos(); - var chapterClicked = pos2chapter(pos.x, pos.y, overallscale); - if (chapterClicked != null) { - mp.set_property_native("chapter", chapterClicked); - } - } -} -mp.add_key_binding("TAB", "tab", function () { - toggleOverlay(); -}); -mp.add_key_binding("MBTN_LEFT", "mbtn_left", function () { - onMBTN_LEFT(); -}); diff --git a/.config/tridactyl/tridactylrc b/.config/tridactyl/tridactylrc index 54b49d8..df5978d 100644 --- a/.config/tridactyl/tridactylrc +++ b/.config/tridactyl/tridactylrc @@ -55,7 +55,7 @@ set quickmark od https://odysee.com/$/following command org-capture composite get_current_url | js -p tri.excmds.exclaim_quiet('org-capture ' + JS_ARG); " MPV -command mpv js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim_quiet('mpv --profile=fast ' + url)) +command mpv js -p tri.excmds.shellescape(JS_ARG).then(url => tri.excmds.exclaim('mpv --profile=fast ' + url)) "" Unbind this key to rebind it later unbind v diff --git a/guix/home.nix b/guix/home.nix index fba832f..121f285 100644 --- a/guix/home.nix +++ b/guix/home.nix @@ -6,7 +6,7 @@ home.stateVersion = "23.05"; programs.home-manager.enable = true; home.packages = with pkgs; [ - eww-wayland + # eww-wayland swww starship # The guix version of dolphin isn't built for wayland and can't find the icon theme diff --git a/guix/home.scm b/guix/home.scm index 1feae80..57e2432 100644 --- a/guix/home.scm +++ b/guix/home.scm @@ -272,6 +272,14 @@ marked files in a dired buffer via rsync.")))) (default '(("video/mp4" . "mpv.desktop") ("video/webm" . "mpv.desktop") ("video/x-matroska" . "mpv.destop") + ("video/mkv" . "mpv.destop") + ("video/quicktime" . "mpv.destop") + ("audio/opus" . "mpv-slow.desktop"))) + (added '(("video/mp4" . "mpv.desktop") + ("video/webm" . "mpv.desktop") + ("video/x-matroska" . "mpv.destop") + ("video/mkv" . "mpv.destop") + ("video/quicktime" . "mpv.destop") ("audio/opus" . "mpv-slow.desktop"))) (desktop-entries (list (xdg-desktop-entry diff --git a/scripts/dlaudio b/scripts/dlaudio index adb8122..8468a6f 100755 --- a/scripts/dlaudio +++ b/scripts/dlaudio @@ -1,4 +1,4 @@ #!/usr/bin/env bash notify-send "downloading  $1" -alacritty -e yt-dlp -x -o '/home/chris/Music/%(title)s.%(ext)s' $1 +alacritty -e yt-dlp -x -o '/home/chris/music/%(title)s.%(ext)s' $1 diff --git a/scripts/dlvideo b/scripts/dlvideo index 71f8abc..e0c0e87 100755 --- a/scripts/dlvideo +++ b/scripts/dlvideo @@ -1,4 +1,4 @@ #!/usr/bin/env bash notify-send "Downloading  $1" -alacritty -e yt-dlp -o '/home/chris/Videos/%(title)s.%(ext)s' $1 +alacritty -e yt-dlp -o '/home/chris/vids/%(title)s.%(ext)s' $1