diff --git a/awesome/init.fnl b/awesome/init.fnl index c93e32d..f989e01 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -654,6 +654,7 @@ (when (= c.class "mpv") (awful.placement.centered c)) (when (= c.class "imv") (awful.placement.centered c)) (when (= c.class "Sxiv") (awful.placement.centered c)) + (when (= c.name "Display Window") (set c.fullscreen true)) (awful.client.focus.byidx 1) ;; Rounded windows done right @@ -705,6 +706,7 @@ (awful.spawn.once "xset r rate 220 90") (awful.spawn.once "/usr/lib/kdeconnectd") (awful.spawn.once "autorandr -c") -;; (awful.spawn.once "nm-applet") +(awful.spawn.once "nm-applet") (awful.spawn.once "xcape -e 'Super_L=Super_L|Control_L|Escape'") +(awful.spawn.once "xcape -e 'Alt_L=Super_L|W'") ;; (awful.spawn.once "latte-dock") diff --git a/awesome/keybindings.fnl b/awesome/keybindings.fnl index d88663d..147b841 100644 --- a/awesome/keybindings.fnl +++ b/awesome/keybindings.fnl @@ -152,7 +152,7 @@ ;; Programs (awful.key [ modkey ] "d" (fn [] (awful.spawn "emacsclient -c -e '(dired-jump)'")) {:description "launch dired in new emacs frame" :group "apps" }) - (awful.key [ modkey shift ] "d" (fn [] (awful.spawn "env QT_QPA_PLATFORMTHEME='qt5ct' dolphin")) + (awful.key [ modkey shift ] "d" (fn [] (awful.spawn "env QT_QPA_PLATFORMTHEME=qt5ct dolphin")) {:description "launch dolphin file browser" :group "apps" }) (awful.key [ modkey ] "x" (fn [] (awful.spawn "emacsclient -c -e '(org-capture)'" {:floating true :placement awful.placement.centered :class "org-agenda" :instance "org-agenda"})) @@ -161,8 +161,6 @@ {:description "launch org-agenda in new emacs frame" :group "apps" }) (awful.key [ modkey alt ] "m" (fn [] (awful.spawn "emacsclient -c -e '(org-roam-capture)'")) {:description "launch org-roam-capture in new emacs frame" :group "apps" }) - (awful.key [ modkey shift ] "x" (fn [] (awful.spawn "emacsclient -c -e '(doom/switch-to-scratch-buffer)'")) - {:description "launch scratchpad in new emacs frame" :group "apps" }) (awful.key [ modkey ] "i" (fn [] (awful.spawn "emacsclient -c -e '(mu4e)'")) {:description "launch mu4e in new emacs frame" :group "apps" }) (awful.key [ modkey shift ] "Return" (fn [] (awful.spawn "emacsclient -c -e '(+eshell/frame)'")) diff --git a/awesome/rules.fnl b/awesome/rules.fnl index 5834e7c..cbf7bfe 100644 --- a/awesome/rules.fnl +++ b/awesome/rules.fnl @@ -95,7 +95,11 @@ :rule_any { :instance [ "emacs" + "scribus" ] + :class [ + "scribus" + ] } :properties { :size_hints_honor false diff --git a/bpytop/bpytop.conf b/bpytop/bpytop.conf index 56358f9..001f04a 100644 --- a/bpytop/bpytop.conf +++ b/bpytop/bpytop.conf @@ -22,7 +22,7 @@ proc_update_mult=2 #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu responsive", #* "cpu lazy" updates top process over time, "cpu responsive" updates top process directly. -proc_sorting="memory" +proc_sorting="cpu responsive" #* Reverse sorting order, True or False. proc_reversed=False diff --git a/firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css b/firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css index b8ba804..cdea769 100644 --- a/firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css +++ b/firefox/chrome/chrome/navbar_tabs_oneliner_tabs_on_left.css @@ -10,218 +10,218 @@ #urlbar-container{ min-width:unset !important } } -/* Transparent tabs */ -.toolbar-items:-moz-lwtheme-darktext, -.toolbar-items:-moz-lwtheme-brighttext { - background-color: transparent !important; - -moz-appearance: var(--bf-moz-appearance) !important; -} +/* /\* Transparent tabs *\/ */ +/* .toolbar-items:-moz-lwtheme-darktext, */ +/* .toolbar-items:-moz-lwtheme-brighttext { */ +/* background-color: transparent !important; */ +/* -moz-appearance: var(--bf-moz-appearance) !important; */ +/* } */ /* Stretch Tabs */ .tabbrowser-tab[fadein]:not([pinned]) { - max-width: none !important; + max-width: none !important; } -.tab-background:-moz-lwtheme-darktext, -.tab-background:-moz-lwtheme-brighttext { - background: transparent !important; - -moz-appearance: var(--bf-moz-appearance) !important; -} +/* .tab-background:-moz-lwtheme-darktext, */ +/* .tab-background:-moz-lwtheme-brighttext { */ +/* background: transparent !important; */ +/* -moz-appearance: var(--bf-moz-appearance) !important; */ +/* } */ -.tab-background[selected="true"] { - background: var(--bf-tab-selected-bg) !important; -} +/* .tab-background[selected="true"] { */ +/* background: var(--bf-tab-selected-bg) !important; */ +/* } */ -.tab-background:not[visuallyselected] { - background: var(--bf-tab-selected-bg) !important; - opacity: 0.5 !important; -} +/* .tab-background:not[visuallyselected] { */ +/* background: var(--bf-tab-selected-bg) !important; */ +/* opacity: 0.5 !important; */ +/* } */ -/* Style all the lines before and after selected tab */ -.tabbrowser-tab::after, -.tabbrowser-tab::before { - border-width: 1px !important; -} +/* /\* Style all the lines before and after selected tab *\/ */ +/* .tabbrowser-tab::after, */ +/* .tabbrowser-tab::before { */ +/* border-width: 1px !important; */ +/* } */ -.tabbrowser-arrowscrollbox { - margin-inline-start: 4px !important; - margin-inline-end: 0 !important; -} +/* .tabbrowser-arrowscrollbox { */ +/* margin-inline-start: 4px !important; */ +/* margin-inline-end: 0 !important; */ +/* } */ /* Center all content */ .tab-content { - justify-content: center; - align-items: center; - margin-top: -1px; - min-width: 100% !important; - padding: 0 10px !important; + display: flex; + justify-content: center; + align-items: center; + margin-top: -1px; + min-width: 100% !important; + padding: 0 10px !important; } -/* A way to center the label and icon while +/* A way to center the label and icon while the close button is positioned to the far right */ .tab-content::before{ - content: ""; - display: -moz-box; - -moz-box-flex: 1 + content: ""; + display: -moz-box; + -moz-box-flex: 1 } /* Tab close button */ .tab-close-button { - opacity: 1 !important; + opacity: 1 !important; } -/* If tab close button is not present, don't force favicon to the center */ -#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]) .tab-throbber, -#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]) .tab-throbber-fallback, -#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]):not([busy]) .tab-icon-image, -#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]):not([image]) .tab-label-container { - margin-left: 0 !important; -} +/* /\* If tab close button is not present, don't force favicon to the center *\/ */ +/* #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]) .tab-throbber, */ +/* #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]) .tab-throbber-fallback, */ +/* #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]):not([busy]) .tab-icon-image, */ +/* #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected="true"]):not([image]) .tab-label-container { */ +/* margin-left: 0 !important; */ +/* } */ -#toolbar-menubar{ height:initial !important; } -#toolbar-menubar[inactive] > #menubar-items{ opacity: 0; pointer-events: none; } -#toolbar-menubar[inactive]{ - margin-bottom: calc(0px - var(--uc-toolbar-height)); - margin-left: 0px; - height: calc(var(--uc-toolbar-height) - 5) !important; -} +/* #toolbar-menubar{ height:initial !important; } */ +/* #toolbar-menubar[inactive] > #menubar-items{ opacity: 0; pointer-events: none; } */ +/* #toolbar-menubar[inactive]{ */ +/* margin-bottom: calc(0px - var(--uc-toolbar-height)); */ +/* margin-left: 0px; */ +/* height: calc(var(--uc-toolbar-height) - 5) !important; */ +/* } */ #tabs-newtab-button { - visibility: hidden !important; + visibility: hidden !important; } #TabsToolbar{ - margin-right: calc(0px + var(--uc-navigationbar-width)); - /* Remove empty space above tabs so that tabs are clickable at very top of screen */ - margin-left: 10px; - margin-top: -31px !important; - max-height: 20px !important; - font-size: 13px !important; - z-index: 10; + margin-top: -44px !important; } -#toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container, -#tabbrowser-tabs, -.tabbrowser-tab[pinned]{ - margin-left: -10px; -} +/* .scrollbox-clip > scrollbox:nth-child(1){ */ +/* margin-top; -10px !important; */ +/* } */ -.tabbrowser-tab[selected]{ - min-width: 200px !important; - max-width: 2600px !important; - max-height: 20px !important; - height: 20px !important; - min-height: 20px !important; - box-shadow: 0px 0px 6px 3px #111; -} +/* #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container, */ +/* #tabbrowser-tabs, */ +/* .tabbrowser-tab[pinned]{ */ +/* margin-left: -10px; */ +/* margin-top: -42px !important; */ +/* } */ -.tabbrowser-tab[pinned]{ - max-width: 35px !important; - min-width: 0px !important; -} +/* .tabbrowser-tab[selected]{ */ +/* min-width: 200px !important; */ +/* max-width: 2600px !important; */ +/* max-height: 20px !important; */ +/* height: 20px !important; */ +/* min-height: 20px !important; */ +/* box-shadow: 0px 0px 6px 3px #111; */ +/* } */ -.tabbrowser-tab{ - max-width: 80px !important; - min-width: 10px !important; -} +/* .tabbrowser-tab[pinned]{ */ +/* max-width: 35px !important; */ +/* min-width: 0px !important; */ +/* } */ -.tab-background { - border-top: 0px !important; -} +/* .tabbrowser-tab{ */ +/* max-width: 80px !important; */ +/* min-width: 10px !important; */ +/* } */ -.tab-icon-pending, .tab-icon-image, .tab-sharing-icon-overlay .tab-icon-sound{ - max-height: 13px !important; - height: 13px !important; - min-height: 13px !important; - min-width: 13px !important; - max-width: 13px !important; - align-self: center !important; -} +/* .tab-background { */ +/* border-top: 0px !important; */ +/* } */ -.tab-throbber, .tab-throbber-tabslist { - max-height: 18px !important; - height: 18px !important; - min-height: 18px !important; - min-width: 16px !important; - max-width: 16px !important; - align-self: center !important; -} +/* .tab-icon-pending, .tab-icon-image, .tab-sharing-icon-overlay .tab-icon-sound{ */ +/* max-height: 13px !important; */ +/* height: 13px !important; */ +/* min-height: 13px !important; */ +/* min-width: 13px !important; */ +/* max-width: 13px !important; */ +/* align-self: center !important; */ +/* } */ -#nav-bar{ - margin-left: calc(100vw - var(--uc-navigationbar-width)); - margin-top: calc(0px - var(--uc-toolbar-height)); - padding-right: calc(3 * 46px + var(--window-drag-space-width)); +/* .tab-throbber, .tab-throbber-tabslist { */ +/* max-height: 18px !important; */ +/* height: 18px !important; */ +/* min-height: 18px !important; */ +/* min-width: 16px !important; */ +/* max-width: 16px !important; */ +/* align-self: center !important; */ +/* } */ -} +/* #nav-bar{ */ +/* margin-left: calc(100vw - var(--uc-navigationbar-width)); */ +/* margin-top: calc(0px - var(--uc-toolbar-height)); */ +/* padding-right: calc(3 * 46px + var(--window-drag-space-width)); */ + +/* } */ /* Hide dropdown placeholder */ -#urlbar-container:not(:hover) .urlbar-history-dropmarker{margin-inline-start: -28px;} +/* #urlbar-container:not(:hover) .urlbar-history-dropmarker{margin-inline-start: -28px;} */ /* Autohide Navbar */ #nav-bar:not([customizing="true"]):not([inFullscreen]) { - /*visibility: collapse !important;*/ - min-height: 0px !important; - max-height: 0px !important; - margin-top: -6px !important; - margin-bottom: 14px !important; - margin-right: 70px !important; - margin-left: 70px !important; - transition: all 300ms ease .5s !important; - z-index: -5 !important; - border-radius: 50px; - padding-left: 10px !important; - padding-right: 10px !important; + /*visibility: collapse !important;*/ + min-height: 0px !important; + max-height: 0px !important; + margin-top: -6px !important; + margin-bottom: 0px !important; + margin-right: 70px !important; + margin-left: 70px !important; + transition: all 300ms ease .5s !important; + z-index: -5 !important; + border-radius: 50px; + padding-left: 10px !important; + padding-right: 10px !important; } #navigator-toolbox:hover:not([inFullscreen]) :-moz-any(#nav-bar), #navigator-toolbox:focus-within :-moz-any(#nav-bar) { - /*visibility: visible !important;*/ - min-height: 32px !important; - max-height: 32px !important; - margin-top: 10px !important; - margin-bottom: -38px !important; - transition: all 200ms ease 0s !important; - z-index: 5 !important; - border: 0px !important; - box-shadow: 3px 3px 8px 2px #111 !important; - } + /*visibility: visible !important;*/ + min-height: 34px !important; + max-height: 34px !important; + margin-top: 10px !important; + margin-bottom: -48px !important; + transition: all 200ms ease 0s !important; + z-index: 5 !important; + border: 0px !important; + box-shadow: 3px 3px 8px 2px #111 !important; +} /* make urlbar rounded */ #urlbar{ - margin-top: 31px !important; - padding-right: 10px !important; - padding-left: 10px !important; + /* margin-top: 31px !important; */ + padding-right: 10px !important; + padding-left: 10px !important; } #urlbar-background{ - border-radius: 50px !important; + border-radius: 50px !important; } #urlbar[open] > #urlbar-background{ - animation-duration: 200ms !important; - border-radius: 15px !important; + animation-duration: 200ms !important; + border-radius: 15px !important; } -#urlbar[breakout][breakout-extend] { - margin-top: 20px !important; - top: 0px !important; -} +/* #urlbar[breakout][breakout-extend] { */ +/* margin-top: 20px !important; */ +/* top: 0px !important; */ +/* } */ -#urlbar[breakout][breakout-extend] > #urlbar-input-container { - height: calc(var(--uc-toolbar-height) + 12 * 2px) !important; - padding-block: calc(2px + (var(--uc-toolbar-height) - var(--urlbar-height)) / 2); - padding-inline: calc(5px + 2px); -} +/* #urlbar[breakout][breakout-extend] > #urlbar-input-container { */ +/* height: calc(var(--uc-toolbar-height) + 12 * 2px) !important; */ +/* padding-block: calc(2px + (var(--uc-toolbar-height) - var(--urlbar-height)) / 2); */ +/* padding-inline: calc(5px + 2px); */ +/* } */ #nav-bar-customization-target{ - margin-top: -20px; + margin-top: -4px; } #nav-bar-overflow-button{ - margin-top: -20px !important; + margin-top: -4px !important; } #PanelUI-button{ - margin-top: -20px !important; + margin-top: -4px !important; } diff --git a/fish/config.fish b/fish/config.fish index 148225d..50fbc35 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -211,6 +211,8 @@ alias ls "exa -l" alias la "exa -la" alias mpf "mpv --profile=fast" alias suspend "systemctl suspend" +alias ec "emacsclient -t" +alias ecc "emacsclient -c" ### Start X at login if status is-login diff --git a/kanshi/config b/kanshi/config index a2565ae..b009522 100644 --- a/kanshi/config +++ b/kanshi/config @@ -6,4 +6,10 @@ profile office { output eDP-1 mode 2256x1504 position 0,0 scale 1.5 output DP-4 mode 1366x768 position 1500,0 scale 1 exec notify-send 'office monitors setup' +} + +profile church { + output eDP-1 mode 2256x1504 position 0,0 scale 1.5 + output DP-3 mode 3840x2160 position 1500,0 scale 2 + exec notify-send 'office monitors setup' } \ No newline at end of file diff --git a/mpv/mpv.conf b/mpv/mpv.conf index bd22714..bc537f3 100644 --- a/mpv/mpv.conf +++ b/mpv/mpv.conf @@ -3,7 +3,7 @@ osc=no vo=gpu af=scaletempo2 autofit=80% -geometry=70%:70% +geometry=80%:80% # input-ipc-server="/tmp/mpvsocket" hwdec=auto rtsp-transport=udp diff --git a/qutebrowser/autoconfig.yml b/qutebrowser/autoconfig.yml index 5603814..bc54459 100644 --- a/qutebrowser/autoconfig.yml +++ b/qutebrowser/autoconfig.yml @@ -6,15 +6,19 @@ config_version: 2 settings: + colors.webpage.darkmode.enabled: + global: true content.desktop_capture: https://jitsi.tfcconnection.org: true content.geolocation: https://openweathermap.org: false + https://staff.tfcconnection.org: true content.media.audio_capture: https://jitsi.tfcconnection.org: true https://staff.tfcconnection.org: true content.media.audio_video_capture: global: ask + https://jitsi.riot.im: false https://jitsi.tfcconnection.org: true https://staff.tfcconnection.org: true content.media.video_capture: @@ -32,8 +36,10 @@ settings: https://www.websitebuilderexpert.com: false https://www.youtube.com: false content.register_protocol_handler: + https://calendar.google.com?cid=%25s: false https://outlook.live.com?mailtouri=%25s: false https://outlook.office.com?mailtouri=%25s: false + https://staff.tfcconnection.org: true tabs.show: global: always zoom.default: diff --git a/qutebrowser/bookmarks/urls b/qutebrowser/bookmarks/urls index d6250f3..cd74cf6 100644 --- a/qutebrowser/bookmarks/urls +++ b/qutebrowser/bookmarks/urls @@ -1,3 +1,4 @@ https://yewtu.be/feed/subscriptions Subscriptions - YewTube https://portal.azure.com/#@tfcconnection.org/dashboard/private/e5f3455d-3737-47d8-852b-1847a3b4801b Dashboard - Microsoft Azure https://asciiflow.com/#/ ASCIIFlow +https://photos.cochrun.xyz/people/new PhotoPrism: People diff --git a/qutebrowser/config.py b/qutebrowser/config.py index 8eb6a4f..fdf62c4 100644 --- a/qutebrowser/config.py +++ b/qutebrowser/config.py @@ -1059,7 +1059,7 @@ c.content.headers.do_not_track = True ## setting with a URL pattern instead. Local domains are always exempt ## from hostblocking. ## Type: List of UrlPattern -# c.content.host_blocking.whitelist = [] +c.content.blocking.whitelist = ['https://staff.tfcconnection.org'] ## Enable hyperlink auditing (``). ## Type: Bool @@ -2487,11 +2487,11 @@ config.bind("gv", "spawn --detach mpv --profile=fast --force-window yes --ytdl=b config.bind("gc", 'spawn org-capture "{url}"') config.bind( "gV", - "hint links spawn alacritty -e youtube-dl -o ~/Videos/%(title)s.%(ext)s {hint-url}", + "hint links spawn alacritty -e yt-dlp -o ~/Videos/%(title)s.%(ext)s {hint-url}", ) config.bind( "ga", - "hint links spawn alacritty -e youtube-dl -x --audio-format mp3 --audio-quality 0 --embed-thumbnail --add-metadata -o ~/Music/%(title)s.%(ext)s {hint-url}", + "hint links spawn alacritty -e yt-dlp -x --audio-format mp3 --audio-quality 0 --embed-thumbnail --add-metadata -o ~/Music/%(title)s.%(ext)s {hint-url}", ) diff --git a/qutebrowser/qsettings/QtProject.conf b/qutebrowser/qsettings/QtProject.conf index 07f76db..5ba7f39 100644 --- a/qutebrowser/qsettings/QtProject.conf +++ b/qutebrowser/qsettings/QtProject.conf @@ -1,6 +1,6 @@ [FileDialog] -history=file:///home/chris, file:///home/chris/nextcloud/tfc/Documents, file:///home/chris/Downloads, file:///home/chris/Pictures -lastVisited=file:///home/chris/Pictures +history=@Invalid() +lastVisited=file:///home/chris/ qtVersion=5.15.2 shortcuts=file:, file:///home/chris, file:///home/chris/storage/tfc sidebarWidth=116 diff --git a/qutebrowser/quickmarks b/qutebrowser/quickmarks index e1ff631..3ad2f01 100644 --- a/qutebrowser/quickmarks +++ b/qutebrowser/quickmarks @@ -24,3 +24,5 @@ nc https://nc.cochrun.xyz/apps/files/ oml https://outlook.live.com/mail/0/inbox stb https://table.tfcconnection.org/ tms https://teams.microsoft.com/_#/conversations/General +n8n https://n8n.tfcconnection.org/workflow +stbdocs https://api.seatable.io/#intro diff --git a/rofi/config.rasi b/rofi/config.rasi index 5a75e6e..9fa4915 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -57,7 +57,7 @@ window { transparency: "real"; border-radius: 16px; border: 0px; - width: 40%; + width: 60%; location: center; anchor: center; x-offset: 0; diff --git a/rofi/launchers-git/laptop-rbw-wayland.rasi b/rofi/launchers-git/laptop-rbw-wayland.rasi new file mode 100644 index 0000000..69e4aa2 --- /dev/null +++ b/rofi/launchers-git/laptop-rbw-wayland.rasi @@ -0,0 +1,12 @@ +/*-*- mode: css; -*-*/ + + +configuration { + font: "VictorMono Nerd Font 12.0"; + show-icons: false; +} +@import "/home/chris/.config/rofi/config.rasi" + +window { + background-color: @base00; +} diff --git a/rofi/launchers-git/laptop-rbw.rasi b/rofi/launchers-git/laptop-rbw.rasi index 65f5fe1..cbc6c3b 100644 --- a/rofi/launchers-git/laptop-rbw.rasi +++ b/rofi/launchers-git/laptop-rbw.rasi @@ -2,7 +2,11 @@ configuration { - font: "VictorMono Nerd Font 22.0"; + font: "VictorMono Nerd Font 24.0"; show-icons: false; } @import "/home/chris/.config/rofi/config.rasi" + +window { + background-color: @base00t; +} diff --git a/rofi/launchers-git/laptop-search-wayland.rasi b/rofi/launchers-git/laptop-search-wayland.rasi new file mode 100644 index 0000000..1edb979 --- /dev/null +++ b/rofi/launchers-git/laptop-search-wayland.rasi @@ -0,0 +1,14 @@ +/*-*- mode: css; -*-*/ + + +configuration { + font: "VictorMono Nerd Font 12.0"; + show-icons: false; +} +@import "/home/chris/.config/rofi/config.rasi" + + +window { + width: 70%; + background-color: @base00; +} diff --git a/rofi/launchers-git/laptop-search.rasi b/rofi/launchers-git/laptop-search.rasi index 585f5a1..ecbb7af 100644 --- a/rofi/launchers-git/laptop-search.rasi +++ b/rofi/launchers-git/laptop-search.rasi @@ -2,7 +2,7 @@ configuration { - font: "VictorMono Nerd Font 22.0"; + font: "VictorMono Nerd Font 24.0"; show-icons: false; } @import "/home/chris/.config/rofi/config.rasi" @@ -10,4 +10,5 @@ configuration { window { width: 70%; + background-color: @base00t; } diff --git a/rofi/launchers-git/laptop-wayland.rasi b/rofi/launchers-git/laptop-wayland.rasi new file mode 100644 index 0000000..4ac7207 --- /dev/null +++ b/rofi/launchers-git/laptop-wayland.rasi @@ -0,0 +1,13 @@ +/*-*- mode: css; -*-*/ + + +configuration { + font: "VictorMono Nerd Font 12.0"; + show-icons: true; +} +@import "/home/chris/.config/rofi/config.rasi" + + +window { + background-color: @base00; +} diff --git a/rofi/launchers-git/laptop.rasi b/rofi/launchers-git/laptop.rasi index 6b67a33..87766e2 100644 --- a/rofi/launchers-git/laptop.rasi +++ b/rofi/launchers-git/laptop.rasi @@ -2,7 +2,12 @@ configuration { - font: "VictorMono Nerd Font 22.0"; + font: "VictorMono Nerd Font 24.0"; show-icons: true; } @import "/home/chris/.config/rofi/config.rasi" + + +window { + background-color: @base00t; +} diff --git a/rofi/launchers-git/launcher.sh b/rofi/launchers-git/launcher.sh index 249226b..18e18c6 100755 --- a/rofi/launchers-git/launcher.sh +++ b/rofi/launchers-git/launcher.sh @@ -1,8 +1,12 @@ #!/usr/bin/env bash if [ $(hostname) = "syl" ]; then - style="laptop" - #echo "this is hidpi" + if [ $XDG_SESSION_TYPE = "x11" ]; then + style="laptop" + else + style="laptop-wayland" + #echo "this is hidpi" + fi else style="desktop" #echo "this is not hidpi" diff --git a/scripts/autorun.sh b/scripts/autorun.sh index 961e0e9..2068e03 100755 --- a/scripts/autorun.sh +++ b/scripts/autorun.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -export QT_QPA_PLATFORMTHEME='qt5ct' +# export QT_QPA_PLATFORMTHEME='qt5ct' function run { if ! pgrep -f $1 ; diff --git a/scripts/fflof b/scripts/fflof index f1f85af..4db94c9 100755 --- a/scripts/fflof +++ b/scripts/fflof @@ -1,7 +1,7 @@ #!/bin/sh # Check to see if firefox is running -if [ $(pgrep -c firefox) -gt 0 ]; then +if [ $(pgrep -c GeckoMain) -gt 0 ]; then if [ $XDG_SESSION_TYPE = "x11" ]; then #X11 diff --git a/scripts/filesearch b/scripts/filesearch index b1e9ed3..abd1b0d 100755 --- a/scripts/filesearch +++ b/scripts/filesearch @@ -1,13 +1,17 @@ #!/bin/sh if [ $(hostname) = "syl" ]; then - style="laptop" + if [ $XDG_SESSION_TYPE = "x11" ]; then + style="laptop-search" + else + style="laptop-search-wayland" + fi else - style="desktop" + style="desktop-search" #echo "this is not hidpi" fi -lolcate | rofi -dmenu -p "File Search:" -i -matching regex -theme ~/.config/rofi/launchers-git/$style-search.rasi | xargs -r0 xdg-open $@ & +lolcate | rofi -dmenu -p "File Search:" -i -matching regex -theme ~/.config/rofi/launchers-git/$style.rasi | xargs -r0 xdg-open $@ & c=0 while ! xprop -f _KDE_NET_WM_BLUR_BEHIND_REGION 32c -set _KDE_NET_WM_BLUR_BEHIND_REGION 0 -id $(xdotool search -class 'rofi') ; do sleep .1 diff --git a/scripts/kderofi-rbw b/scripts/kderofi-rbw index f466e3e..2fdc0fc 100755 --- a/scripts/kderofi-rbw +++ b/scripts/kderofi-rbw @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Very basic interface for rbw using rofi if [ $(hostname) = "syl" ]; then - style="laptop-rbw" + style="laptop-rbw-wayland" #echo "this is hidpi" else style="desktop-rbw" diff --git a/scripts/latte-restart b/scripts/latte-restart index 87e4df1..7a8f384 100755 --- a/scripts/latte-restart +++ b/scripts/latte-restart @@ -1,3 +1,4 @@ #!/bin/sh +killall mako killall latte-dock latte-dock & diff --git a/scripts/plasma-rofi-rbw.sh b/scripts/plasma-rofi-rbw.sh index 82244cd..4b97378 100755 --- a/scripts/plasma-rofi-rbw.sh +++ b/scripts/plasma-rofi-rbw.sh @@ -2,7 +2,7 @@ # Very basic interface for rbw using rofi if [ $(hostname) = "syl" ]; then - style="laptop-rbw" + style="laptop-rbw-wayland" #echo "this is hidpi" else style="desktop-rbw" diff --git a/scripts/rofi-rbw b/scripts/rofi-rbw index bf32613..c03fcf0 100755 --- a/scripts/rofi-rbw +++ b/scripts/rofi-rbw @@ -14,7 +14,7 @@ root=~/.password-store CACHE=~/.local/tmp/pass_rofi seat=seat0 -rbw sync +# rbw sync rbw list list_passwords() { diff --git a/scripts/stream-setup.sh b/scripts/stream-setup.sh new file mode 100755 index 0000000..2c67c64 --- /dev/null +++ b/scripts/stream-setup.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +# Let's setup the streaming service for LuctorCRC +peertubestreamkey=$(kdialog --password "What is the stream key for the website?") +facebookstreamkey=$(kdialog --password "What is the stream key for Facebook?") +echo $peertubestreamkey +echo $facebookstreamkey + + + +ssh chris@40.122.147.124 sudo sed -i -e "s#luctorcrc.org.*#luctorcrc.org/live/$peertubestreamkey\;#" nginx-restream/data/nginx.conf +ssh chris@40.122.147.124 sudo sed -i -e "s#/rtmp/.*#/rtmp/$facebookstreamkey\;#" /etc/nginx/nginx.conf +# ssh chris@40.122.147.124 'sudo systemctl restart nginx' +ssh chris@40.122.147.124 sudo docker-compose down && sudo docker-compose up -d diff --git a/scripts/surfingkeys-mpv.sh b/scripts/surfingkeys-mpv.sh new file mode 100755 index 0000000..ccb57d4 --- /dev/null +++ b/scripts/surfingkeys-mpv.sh @@ -0,0 +1,2 @@ +#!/bin/sh +mpv $wl-paste diff --git a/sway/config b/sway/config index 0d6a8cc..6b17048 100644 --- a/sway/config +++ b/sway/config @@ -12,7 +12,7 @@ set $term alacritty set $menu wofi --show drun | xargs swaymsg exec -- ### Output configuration -output * bg /usr/share/wallpapers/Flow/contents/images/5120x2880.jpg fill +output * bg /home/chris/Pictures/wallpapers/tech.jpg fill ###old ~/Pictures/wallpapers/RoyalKing.png @@ -239,7 +239,7 @@ bindsym $mod+o mode "$mode_launcher" bindsym $mod+Ctrl+m exec makoctl dismiss -a bindsym $mod+e exec emacslof -bindsym $mod+b exec nyxtlof +bindsym $mod+b exec qblof bindsym $mod+i exec emacsclient -e '(chris/org-agenda)' bindsym $mod+m exec emacsclient -c -e '(mu4e)' bindsym $mod+Shift+d exec dolphin @@ -265,7 +265,7 @@ for_window [app_id="__focused__"] opacity set 1 for_window [app_id="qutebrowser"] move container to workspace number 2, opacity set 1 for_window [app_id="nyxt"] move container to workspace number 2, opacity set 1 for_window [title="Display Window"] move window to workspace number 9, fullscreen enable -for_window [title="OpenLP"] move window to workspace number 9, floating enable +# for_window [title="OpenLP"] move window to workspace number 9, floating enable for_window [title="VLC media player"] move window to workspace number 9, fullscreen enable # for_window [app_id="emacs"] opacity set 0.90 diff --git a/systemd/user/mail.service b/systemd/user/mail.service index 82d1215..4b3fce1 100644 --- a/systemd/user/mail.service +++ b/systemd/user/mail.service @@ -2,7 +2,7 @@ Description=mbsync automated sync of mail [Service] -ExecStart=/home/chris/scripts/mailsync.sh +ExecStart=/home/chris/scripts/mailsync [Install] WantedBy=default.target diff --git a/systemd/user/mail.timer b/systemd/user/mail.timer index 3e6669b..69410cc 100644 --- a/systemd/user/mail.timer +++ b/systemd/user/mail.timer @@ -3,7 +3,7 @@ Description=timer for syncing mail [Timer] OnStartupSec=2min -OnUnitActiveSec=30min +OnUnitActiveSec=5min [Install] WantedBy=timers.target diff --git a/waybar/config b/waybar/config index 02d6707..3fd7d78 100644 --- a/waybar/config +++ b/waybar/config @@ -4,7 +4,7 @@ "height": 30, // Waybar height (to be removed for auto height) // "width": 1280, // Waybar width // Choose the order of the modules "custom/wintitle", - "modules-left": ["sway/workspaces", "river/tags", "custom/wintitle", "sway/mode", "sway/window"], + "modules-left": ["sway/workspaces", "river/tags", "sway/mode", "sway/window"], "modules-center": ["clock"], "modules-right": ["pulseaudio", "network", "memory", "cpu", "battery", "battery#bat2", "tray"], "margin-top": 0, diff --git a/wayfire/wayfire.ini b/wayfire/wayfire.ini index c59aca7..e63ae29 100644 --- a/wayfire/wayfire.ini +++ b/wayfire/wayfire.ini @@ -37,7 +37,7 @@ rotate_up = KEY_K [autostart] autostart_wf_shell = false bar = waybar -bg = swaybg -i /usr/share/wallpapers/Flow/contents/images/5120x2880.jpg -m fill +bg = swaybg -i /home/chris/Pictures/wallpapers/tech.jpg -m fill gamma = wlsunset notifications = mako outputs = kanshi @@ -87,7 +87,7 @@ binding_screenshot_interactive = KEY_PRINT binding_terminal = KEY_ENTER binding_pass = KEY_P command_agenda = emacsclient -e '(chris/org-agenda)' -command_browser = nyxtlof +command_browser = qblof command_dolphin = dolphin command_emacs = emacslof command_kanshi = kanshi @@ -446,7 +446,7 @@ rule_3 = on created if app_id is "emacs" then tile clip_shadow_inside = true enabled_views = all include_undecorated_views = true -shadow_color = \#1A1A1AE6 +shadow_color = \#000000E6 shadow_radius = 30 [winzoom]