diff --git a/buildfiles/x265/build.sh b/buildfiles/x265/build.sh index c0ff178..f2c2982 100755 --- a/buildfiles/x265/build.sh +++ b/buildfiles/x265/build.sh @@ -5,13 +5,9 @@ builddir="$(dirname "$0")" pushd "$builddir" -rm -rf ./build ./build-10 ./build-12 +rm -rf ./x265_git ./build ./build-10 ./build-12 -if [ -d "./x265_git" ]; then - git -C "./x265_git" pull -else - git clone --depth 1 --branch 3.4.1 "https://bitbucket.org/multicoreware/x265_git.git" -fi +git clone --depth 1 --branch 3.4.1 "https://bitbucket.org/multicoreware/x265_git.git" cmake -S x265_git/source -B build-12 \ -DCMAKE_INSTALL_PREFIX='/home/rudism/.local' \ diff --git a/conky/conkyrc b/conky/conkyrc index 1cc596f..6f2cac7 100644 --- a/conky/conkyrc +++ b/conky/conkyrc @@ -20,8 +20,8 @@ conky.config = { maximum_width = 260, border_inner_margin = 5, - border_outer_margin = 2, - border_width = 2, + border_outer_margin = 5, + border_width = 0, default_bar_width = 260, default_bar_height = 10, default_gauge_height = 25, @@ -31,7 +31,7 @@ conky.config = { default_color = '#C9CBFF', default_shade_color = '#000000', default_outline_color = '#000000', - draw_borders = true, + draw_borders = false, draw_graph_borders = false, draw_shades = false, draw_outline = false, diff --git a/fuzzel/fuzzel.ini b/fuzzel/fuzzel.ini index 90bfa77..369518a 100644 --- a/fuzzel/fuzzel.ini +++ b/fuzzel/fuzzel.ini @@ -1,3 +1,7 @@ +[main] +terminal=foot +#list-executables-in-path=yes + [colors] background=1e1e2edd text=cdd6f4ff diff --git a/nvim/lua/plugins-conf.lua b/nvim/lua/plugins-conf.lua index 097ed83..2305a0a 100644 --- a/nvim/lua/plugins-conf.lua +++ b/nvim/lua/plugins-conf.lua @@ -265,19 +265,3 @@ require('true-zen').setup { lualine = true } } - --- debug adapter protocol for .net core -local dap = require('dap') -dap.adapters.coreclr = { - type = 'executable', - command = '/home/rudism/.local/bin/netcoredbg', - args = {'--interpreter=vscode'}, -} -dap.configurations.cs = {{ - type = "coreclr", - name = "launch - netcoredbg", - request = "launch", - program = function() - return vim.fn.input('Path to dll', vim.fn.getcwd() .. '/bin/Debug/', 'file') - end, -}} diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 6098098..1f37a86 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -26,7 +26,6 @@ return require('packer').startup(function() {'hrsh7th/cmp-path'}, -- path autocompletes } } - use 'mfussenegger/nvim-dap' -- debug adapter protocol use { -- gitgutter replacement 'lewis6991/gitsigns.nvim', --requires = { {'nvim-lua/plenary.nvim', commit = '08e301982b9a057110ede7a735dd1b5285eb341f'} } diff --git a/scripts/startsway b/scripts/startsway deleted file mode 100755 index 8e87cc5..0000000 --- a/scripts/startsway +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env zsh -dbus-run-session sway --unsupported-gpu diff --git a/sway/config b/sway/config index 5a4624d..ecb89d8 100644 --- a/sway/config +++ b/sway/config @@ -3,9 +3,18 @@ set $term foot set $menu fuzzel set $wobpipe /run/user/1000/wobpipe +exec dbus-update-activation-environment \ + PATH LD_LIBRARY_PATH \ + DISPLAY WAYLAND_DISPLAY SWAYSOCK \ + XDG_CURRENT_DESKTOP=sway \ + MOZ_ENABLE_WAYLAND=1 \ + ELECTRON_OZONE_PLATFORM_HINT=wayland \ + QT_QPA_PLATFORMTHEME=qt6ct + exec mkfifo $wobpipe exec tail -f $wobpipe | wob +primary_selection disabled floating_modifier $mod normal include /home/rudism/.config/sway/config.d/* diff --git a/sway/config.d/06-startup b/sway/config.d/06-startup index d02021e..1b10d2d 100644 --- a/sway/config.d/06-startup +++ b/sway/config.d/06-startup @@ -1,5 +1,9 @@ -exec swayidle -w timeout 900 'swaylock -f -c 000000' timeout 1200 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' before-sleep 'swaylock -f -c 000000' -exec dbus-update-activation-environment DISPLAY +exec_always killall swayidle +exec_always swayidle -w \ + timeout 900 'swaylock -f -c 000000' \ + timeout 1200 'swaymsg "output * power off"' \ + resume 'swaymsg "output * power on"' \ + before-sleep 'swaylock -f -c 000000' exec mako exec wl-paste -t text --watch clipman store exec wl-paste -p -t text --watch clipman store --histpath="~/.local/share/clipman-primary.json" diff --git a/zsh/zshrc b/zsh/zshrc index b8b4677..ac049a1 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -46,8 +46,6 @@ source ~/skynet/zsh/zsh-grc # env and path export DOTNET_ROOT=$HOME/dotnet -export MOZ_ENABLE_WAYLAND=1 -export QT_QPA_PLATFORMTHEME=qt6ct export LD_LIBRARY_PATH=$HOME/.local/lib:$LD_LIBRARY_PATH export PATH=$HOME/.local/bin:$HOME/dotnet:$HOME/.dotnet/tools:$HOME/go/bin:$HOME/.cargo/bin:$HOME/node/node_modules/.bin:$PATH