Merge branch 'master' of gitlab.com:chriscochrun/dotfiles
This commit is contained in:
commit
6f25e400a9
|
@ -42,6 +42,8 @@
|
|||
:text (tostring err)})
|
||||
(set in_error false)))))
|
||||
|
||||
|
||||
|
||||
;; Variable definitions
|
||||
;; Themes define colours, icons, font and wallpapers.
|
||||
(beautiful.init "/home/chris/.config/awesome/theme.lua")
|
||||
|
@ -72,7 +74,7 @@
|
|||
(if (= "syl\n" stdout)
|
||||
(global laptop true)
|
||||
(global laptop false))))
|
||||
(local laptop true)
|
||||
(local laptop false)
|
||||
|
||||
;; Table of layouts to cover with awful.layout.inc, order matters.
|
||||
(set awful.layout.layouts [
|
||||
|
@ -649,7 +651,7 @@
|
|||
(awful.client.focus.byidx 1)
|
||||
|
||||
;; Rounded windows done right
|
||||
(when (not c.fullscreen)
|
||||
(when (and (not c.fullscreen) (not (= c.name "Display Window")))
|
||||
(set c.shape (fn [cr w h]
|
||||
(gears.shape.rounded_rect cr w h (dpi 15)))))
|
||||
|
||||
|
@ -693,7 +695,7 @@
|
|||
(awful.spawn "bluetoothctl power on")
|
||||
(awful.spawn "nextcloud --background")
|
||||
(awful.spawn "rbw-agent")
|
||||
;; (awful.spawn "jellyfin-mpv-shim")
|
||||
(awful.spawn "jellyfin-mpv-shim")
|
||||
(awful.spawn "xset r rate 220 90")
|
||||
|
||||
(awful.spawn "autorandr -c")
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
(local gears (require "gears"))
|
||||
(local beautiful (require "beautiful"))
|
||||
(local hotkeys_popup (require "awful.hotkeys_popup"))
|
||||
(local xresources (require "beautiful.xresources"))
|
||||
(local dpi xresources.apply_dpi)
|
||||
|
||||
(local bling (require "bling"))
|
||||
;; (local awestore (require "awestore"))
|
||||
|
@ -16,7 +18,7 @@
|
|||
;; (local anim-y (awestore.tweened 1100 { :duration 200 :easing awestore.easing.cubic_in_out }))
|
||||
;; (local anim-x (awestore.tweened 1920 { :duration 200 :easing awestore.easing.cubic_in_out }))
|
||||
|
||||
|
||||
;; (local xcenter (screen.primary.width))
|
||||
|
||||
(local agenda-scratch (bling.module.scratchpad {
|
||||
:command "emacsclient -e '(chris/org-agenda)'"
|
||||
|
@ -24,7 +26,7 @@
|
|||
:sticky true
|
||||
:autoclose true
|
||||
:floating true
|
||||
:geometry {:height 1300 :width 1500 :x 377 :y 73}
|
||||
:geometry {:height (dpi 950) :width (dpi 900) :x (dpi 560) :y (dpi 73)}
|
||||
:reapply true
|
||||
:dont_focus_before_close true
|
||||
;; :awestore {:x anim-x :y anim-y}
|
||||
|
@ -169,7 +171,7 @@
|
|||
{:description "select pass" :group "apps" })
|
||||
(awful.key [ modkey shift ] "w" (fn [] (awful.spawn "libreoffice --writer"))
|
||||
{:description "Open Writer" :group "apps" })
|
||||
(awful.key [modkey] "b" (fn [] (awful.spawn "qblof"))
|
||||
(awful.key [modkey] "b" (fn [] (awful.spawn "nyxt"))
|
||||
{:description "launch browser" :group "apps"})
|
||||
;; rofi
|
||||
(awful.key [] "Menu" (fn [] (awful.spawn "/home/chris/.config/rofi/launchers-git/launcher.sh"))
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
:raise true
|
||||
:height (dpi 800)
|
||||
:screen (screen.count)
|
||||
:sticky true
|
||||
:placement (+ awful.placement.no_offscreen awful.placement.centered)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -95,7 +95,7 @@ the close button is positioned to the far right */
|
|||
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: -30px !important;
|
||||
margin-top: -31px !important;
|
||||
max-height: 20px !important;
|
||||
font-size: 13px !important;
|
||||
z-index: 10;
|
||||
|
@ -181,7 +181,7 @@ the close button is positioned to the far right */
|
|||
/*visibility: visible !important;*/
|
||||
min-height: 32px !important;
|
||||
max-height: 32px !important;
|
||||
margin-top: 14px !important;
|
||||
margin-top: 10px !important;
|
||||
margin-bottom: -38px !important;
|
||||
transition: all 200ms ease 0s !important;
|
||||
z-index: 5 !important;
|
||||
|
@ -191,7 +191,7 @@ the close button is positioned to the far right */
|
|||
|
||||
/* make urlbar rounded */
|
||||
#urlbar{
|
||||
margin-top: 35px !important;
|
||||
margin-top: 31px !important;
|
||||
padding-right: 10px !important;
|
||||
padding-left: 10px !important;
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@ set -U fish_user_paths $HOME/.local/bin $HOME/scripts $HOME/.doom-emacs/bin $HOM
|
|||
set TERM "xterm-256color"
|
||||
set EDITOR "emacsclient -c -a"
|
||||
set VISUAL "emacsclient -c -a emacs"
|
||||
set QT_QPA_PLATFORMTHEME "qt5ct"
|
||||
# set QT_QPA_PLATFORMTHEME "qt5ct"
|
||||
set KWIN_DRM_USE_EGL_STREAMS 1
|
||||
set -Ux ANDROID_SDK_ROOT /opt/android-sdk
|
||||
set -Ux JAVA_HOME /usr/lib/jvm/default
|
||||
|
|
|
@ -24,6 +24,9 @@
|
|||
((default-modes (append '(vi-insert-mode
|
||||
) %slot-default%))))
|
||||
|
||||
(define-configuration browser
|
||||
((external-editor-program '("/usr/bin/emacsclient"))))
|
||||
|
||||
;; Create a function to launch mpv with given url
|
||||
(defun mpv (url)
|
||||
"MPV launches with given url using the fast profile."
|
||||
|
@ -106,7 +109,7 @@
|
|||
:color "#e2e4e5"
|
||||
:line-height "1fr")
|
||||
("#container"
|
||||
:grid-template-columns "2fr 0px 0px")
|
||||
:grid-template-columns "0px 4fr 0px 2fr 0px 0px")
|
||||
("#controls"
|
||||
:background-color "#282a36"
|
||||
:color "#f3f99d"
|
||||
|
@ -211,3 +214,22 @@
|
|||
(.button
|
||||
:color "#e2e4e5")))))))
|
||||
|
||||
|
||||
|
||||
(in-package #:nyxt-user) ; While implicit, this allows SLY to know which package we are in.
|
||||
|
||||
(load "~/quicklisp/setup.lisp")
|
||||
(ql:quickload :slynk)
|
||||
|
||||
(define-command-global start-slynk (&optional (slynk-port *swank-port*))
|
||||
"Start a Slynk server that can be connected to, for instance, in
|
||||
Emacs via SLY.
|
||||
|
||||
Warning: This allows Nyxt to be controlled remotely, that is, to execute
|
||||
arbitrary code with the privileges of the user running Nyxt. Make sure
|
||||
you understand the security risks associated with this before running
|
||||
this command."
|
||||
(slynk:create-server :port slynk-port :dont-close t)
|
||||
(echo "Slynk server started at port ~a" slynk-port))
|
||||
|
||||
(start-slynk)
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
(define-command start-slynk (&optional (slynk-port *swank-port*))
|
||||
(in-package #:nyxt-user) ; While implicit, this allows SLY to know which package we are in.
|
||||
|
||||
(load "~/quicklisp/setup.lisp")
|
||||
(ql:quickload :slynk)
|
||||
|
||||
(define-command-global start-slynk (&optional (slynk-port *swank-port*))
|
||||
"Start a Slynk server that can be connected to, for instance, in
|
||||
Emacs via SLY.
|
||||
|
||||
|
@ -9,3 +14,4 @@ this command."
|
|||
(slynk:create-server :port slynk-port :dont-close t)
|
||||
(echo "Slynk server started at port ~a" slynk-port))
|
||||
|
||||
(start-slynk)
|
||||
|
|
19
picom.conf
19
picom.conf
|
@ -24,7 +24,7 @@ shadow = true;
|
|||
shadow-radius = 38;
|
||||
|
||||
# The opacity of shadows. (0.0 - 1.0, defaults to 0.75)
|
||||
shadow-opacity = .99;
|
||||
shadow-opacity = 1.0;
|
||||
|
||||
# The left offset for shadows, in pixels. (defaults to -15)
|
||||
shadow-offset-x = -20;
|
||||
|
@ -68,6 +68,8 @@ shadow-offset-y = -20;
|
|||
# shadow-exclude = []
|
||||
shadow-exclude = [
|
||||
"name = 'Notification'",
|
||||
"name = 'Projection Window'",
|
||||
"name = 'Video'",
|
||||
"class_g = 'Conky'",
|
||||
# "class_g = 'firefox'",
|
||||
# "class_g = 'Alacritty'",
|
||||
|
@ -107,6 +109,8 @@ fade-out-step = 0.08;
|
|||
# Specify a list of conditions of windows that should not be faded.
|
||||
# don't need this, we disable fading for all normal windows with wintypes: {}
|
||||
fade-exclude = [
|
||||
"name = 'Projection Window'",
|
||||
"name = 'Video'",
|
||||
"class_g = 'slop'" # maim
|
||||
]
|
||||
|
||||
|
@ -124,7 +128,7 @@ fade-exclude = [
|
|||
|
||||
# Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0)
|
||||
# inactive-opacity = 1
|
||||
inactive-opacity = 0.75;
|
||||
inactive-opacity = 0.55;
|
||||
|
||||
# Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default)
|
||||
# frame-opacity = 1.0
|
||||
|
@ -141,14 +145,17 @@ inactive-opacity-override = false;
|
|||
active-opacity = 0.75;
|
||||
|
||||
# Dim inactive windows. (0.0 - 1.0, defaults to 0.0)
|
||||
# inactive-dim = 0.0
|
||||
inactive-dim = 0.4
|
||||
|
||||
# Specify a list of conditions of windows that should always be considered focused.
|
||||
# focus-exclude = []
|
||||
focus-exclude = [
|
||||
"class_g = 'Cairo-clock'",
|
||||
"class_g = 'Bar'", # lemonbar
|
||||
"class_g = 'slop'" # maim
|
||||
"name = 'Projection Window'",
|
||||
"class_g = 'slop'", # maim
|
||||
"name = 'Video'",
|
||||
"class_g = 'mpv'"
|
||||
];
|
||||
|
||||
# Use fixed inactive dim value, instead of adjusting according to window opacity.
|
||||
|
@ -180,6 +187,8 @@ opacity-rule = [
|
|||
# "100:class_g = 'dolphin'",
|
||||
"100:class_g = 'mpv'",
|
||||
"100:class_g = 'libreoffice'",
|
||||
"100:name = 'Projection Window'",
|
||||
"100:name = 'Video'",
|
||||
"100:_NET_WM_STATE@[0]:32a *= '_NET_WM_STATE_FULLSCREEN'",
|
||||
"0:_NET_WM_STATE@[0]:32a *= '_NET_WM_STATE_HIDDEN'",
|
||||
"0:_NET_WM_STATE@[1]:32a *= '_NET_WM_STATE_HIDDEN'",
|
||||
|
@ -252,6 +261,8 @@ blur-background-exclude = [
|
|||
"_GTK_FRAME_EXTENTS@:c",
|
||||
"class_g = 'soffice'",
|
||||
"name = 'Display Window'",
|
||||
"name = 'Video'",
|
||||
"name = 'Projection Window'",
|
||||
# "window_type = '_NET_WM_WINDOW_TYPE_NOTIFICATION'"
|
||||
"window_type = 'notification'"
|
||||
];
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[FileDialog]
|
||||
history=file:///home/chris, file:///home/chris/nextcloud/tfc/Documents, file:///home/chris/Videos, file:///home/chris/Downloads
|
||||
lastVisited=file:///home/chris/Downloads
|
||||
history=file:///home/chris, file:///home/chris/nextcloud/tfc/Documents, file:///home/chris/Downloads, file:///home/chris/Pictures
|
||||
lastVisited=file:///home/chris/Pictures
|
||||
qtVersion=5.15.2
|
||||
shortcuts=file:, file:///home/chris, file:///home/chris/storage/tfc
|
||||
sidebarWidth=116
|
||||
|
|
12
scripts/autorun.sh
Executable file
12
scripts/autorun.sh
Executable file
|
@ -0,0 +1,12 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
export QT_QPA_PLATFORMTHEME='qt5ct'
|
||||
|
||||
function run {
|
||||
if ! pgrep -f $1 ;
|
||||
then
|
||||
$@&
|
||||
fi
|
||||
}
|
||||
|
||||
run jellyfin-mpv-shim
|
Loading…
Reference in a new issue