From df531f3f6a17ca5f80aacfdb54e8eee283c936dd Mon Sep 17 00:00:00 2001 From: Flinner Yuu Date: Sat, 11 Jan 2025 15:07:29 +0300 Subject: [PATCH] feat: random updates --- .gitignore | 2 + hypr/.config/hypr/hyprland.conf | 62 +++++++++++++++++++++------- sh_vars/.config/sh_vars/variables.sh | 3 +- vim/.vimrc | 34 +++++++-------- zsh/.zshrc | 7 +++- 5 files changed, 74 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 2a4b4b0..3312b65 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ __pycache__ /emacs.mine/.config/emacs.mine/straight/ /emacs.mine/.config/emacs.mine/var/ /hypr/.face +/emacs.mine/.config/emacs.mine/eln-cache/ +/emacs.mine/.config/emacs.mine/elpy/ diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf index a9ae274..3c04e53 100644 --- a/hypr/.config/hypr/hyprland.conf +++ b/hypr/.config/hypr/hyprland.conf @@ -19,18 +19,33 @@ # source = ~/.config/hypr/myColors.conf -################ -### MONITORS ### -################ -$mainMonitor=DVI-D-1 -$secondMonitor=DP-1 +################## +### 2 MONITORS ### +################## + +#$mainMonitor=DVI-D-1 +#$secondMonitor=DP-1 + +# $mainMonitor=DP-1 +# $secondMonitor=DVI-D-1 +# +# # See https://wiki.hyprland.org/Configuring/Monitors/ +# # MAIN: +# monitor=$mainMonitor,preferred,1920x395,auto +# # LEFT: +# monitor=$secondMonitor,preferred,auto,auto, transform, 3 +# monitor = , highres, auto, 1 + +################## +### MONITORS ### +################## + +$mainMonitor=DP-1 # See https://wiki.hyprland.org/Configuring/Monitors/ # MAIN: -monitor=$mainMonitor,preferred,1920x395,auto -# LEFT: -monitor=$secondMonitor,preferred,auto,auto, transform, 3 -monitor = , preferred, auto, 1 +monitor=$mainMonitor,highres,1920x395,1.25 +monitor = , highres, auto, 1 ################### @@ -80,6 +95,14 @@ env = XCURSOR_SIZE,24 env = HYPRCURSOR_SIZE,24 env = ELECTRON_OZONE_PLATFORM_HINT,auto +# unscale XWayland +xwayland { + force_zero_scaling = true +} +# toolkit-specific scale +#env = GDK_SCALE,2 +#env = XCURSOR_SIZE,32 + ##################### ### LOOK AND FEEL ### @@ -112,6 +135,9 @@ general { allow_tearing = false layout = dwindle + + # on HJKL, don't wrap around + no_focus_fallback = true } # https://wiki.hyprland.org/Configuring/Variables/#decoration @@ -123,7 +149,7 @@ decoration { inactive_opacity = 1.0 shadow { - enabled = true + enabled = false range = 4 render_power = 3 color = rgba(1a1a1aee) @@ -131,7 +157,7 @@ decoration { # https://wiki.hyprland.org/Configuring/Variables/#blur blur { - enabled = true + enabled = false popups = false special = true # this is an expensive operation size = 3 @@ -243,9 +269,13 @@ device { sensitivity = -0.5 } -# FIX: make hjkl not exit fullscreen ;) binds { + # FIX: make hjkl not exit fullscreen ;) movefocus_cycles_fullscreen = 0 + + # For Alt+TAB to work + # https://www.reddit.com/r/hyprland/comments/zyrrtp/how_do_i_switch_back_and_forth_between_two/ + allow_workspace_cycles = true } ################### @@ -270,9 +300,13 @@ bind = , Print, exec, grim -g "$(slurp -o -r -c '##FF0000FF')" -t ppm - | satty # Lock bind = $mainMod, HOME, exec, hyprlock >> ~/hyprlock_logfile.txt + +# Between workspaces +bind = $mainMod, Tab, workspace, previous + # from https://github.com/end-4/dots-hyprland/blob/main/.config/hypr/hyprland/keybinds.conf -bind = $mainMod, Tab, focuscurrentorlast # [hidden] sus keybind -bind = $mainMod, Tab, bringactivetotop, # [hidden] bring it to the top +bind = $mainMod, Grave, focuscurrentorlast # [hidden] sus keybind +bind = $mainMod, Grave, bringactivetotop, # [hidden] bring it to the top # Window Modes bind = $mainMod, s, togglefloating, diff --git a/sh_vars/.config/sh_vars/variables.sh b/sh_vars/.config/sh_vars/variables.sh index 1ef9a5f..eb3f804 100644 --- a/sh_vars/.config/sh_vars/variables.sh +++ b/sh_vars/.config/sh_vars/variables.sh @@ -21,7 +21,8 @@ export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quo export _Z_NO_RESOLVE_SYMLINKS=1 export _Z_DATA="$HOME/.local/share/z" -# jupyter garbage export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab +# jupyter garbage +export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab # python path for jupyter garbage export PYTHONPATH="$HOME/.local/bin" diff --git a/vim/.vimrc b/vim/.vimrc index 9d858af..b2424ed 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -26,44 +26,44 @@ Plug 'mbbill/undotree' Plug 'preservim/tagbar' " }}} Plug 'neoclide/coc.nvim', {'do': { -> coc#util#install()}} " Completion as in vscode -Plug 'preservim/nerdcommenter' " comments code -Plug 'junegunn/goyo.vim' " zen mode +" Plug 'preservim/nerdcommenter' " comments code +" Plug 'junegunn/goyo.vim' " zen mode "Plug 'Valloric/YouCompleteMe', { 'do': './install.py' } -Plug 'vim-utils/vim-man' +" Plug 'vim-utils/vim-man' Plug 'sheerun/vim-polyglot' "all lang packs :) Plug 'qpkorr/vim-bufkill' "JS {{{ -Plug 'https://github.com/pangloss/vim-javascript.git' -Plug 'posva/vim-vue' -Plug 'prettier/vim-prettier' -Plug 'dense-analysis/ale' "ES-Lint -Plug 'pangloss/vim-javascript' -Plug 'heavenshell/vim-jsdoc', { 'for': ['javascript', 'javascript.jsx','typescript'], 'do': 'make install' } +" Plug 'https://github.com/pangloss/vim-javascript.git' +" Plug 'posva/vim-vue' +" Plug 'prettier/vim-prettier' +" Plug 'dense-analysis/ale' "ES-Lint +" Plug 'pangloss/vim-javascript' +" Plug 'heavenshell/vim-jsdoc', { 'for': ['javascript', 'javascript.jsx','typescript'], 'do': 'make install' } Plug 'honza/vim-snippets' -Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } -Plug 'junegunn/fzf.vim' +" Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } +" Plug 'junegunn/fzf.vim' Plug 'francoiscabrol/ranger.vim' -Plug 'rbgrouleff/bclose.vim' +" Plug 'rbgrouleff/bclose.vim' Plug 'SirVer/ultisnips' -Plug 'albanm/vuetify-vim' +" Plug 'albanm/vuetify-vim' "}}} ": Latex{{{ Plug 'lervag/vimtex' Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' } "}}} "Rust {{{ -Plug 'rust-lang/rust.vim' +" Plug 'rust-lang/rust.vim' "}}} "V {{{ -Plug 'ollykel/v-vim' +" Plug 'ollykel/v-vim' "}}} " Markdown {{{ -Plug 'godlygeek/tabular' +" Plug 'godlygeek/tabular' "Plug 'plasticboy/vim-markdown' "}}} " GIT {{{ -Plug 'tpope/vim-fugitive' +" Plug 'tpope/vim-fugitive' Plug 'airblade/vim-gitgutter' " }}} diff --git a/zsh/.zshrc b/zsh/.zshrc index b2678a7..37d9cb6 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -229,6 +229,8 @@ alias startx="exec startx" #=============================================================================================== +#source ~/.config/sh_vars/variables.sh + #xdg specs export XDG_CONFIG_HOME="$HOME"/.config export XDG_CACHE_HOME="$HOME"/.cache @@ -251,10 +253,11 @@ export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quo export _Z_NO_RESOLVE_SYMLINKS=1 export _Z_DATA="$HOME/.local/share/z" -# jupyter garbage export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab +# jupyter garbage +# export JUPYTERLAB_DIR=$HOME/.local/share/jupyter/lab # python path for jupyter garbage -export PYTHONPATH="$HOME/.local/bin" +# export PYTHONPATH="$HOME/.local/bin" # andriod studio, not that I use it # also needed by shitlab! (matlab)