From dece9c7ba7a876e8ee6a889534b56d229c254df8 Mon Sep 17 00:00:00 2001 From: horhik Date: Thu, 26 Aug 2021 09:48:40 +0300 Subject: [PATCH] little updates --- .gitignore | 6 +- .zshrc | 104 -------------------- home/gtk/.config/gtk-2.0/gtkfilechooser.ini | 8 +- home/xmonad/.xmonad/xmonad.hs | 16 +-- home/zsh/.zshrc | 9 +- 5 files changed, 20 insertions(+), 123 deletions(-) delete mode 100755 .zshrc diff --git a/.gitignore b/.gitignore index c545fde..7eb9d96 100755 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,15 @@ home/xmonad/.xmonad/xmonad-x86_64-linux home/tmux/.config/tmux/plugins/ -*.hi +*/**/*.hi +*.ini *.o *~ - +.obsidian *.db *.db.lock *# *~ +nix/result home/pure_emacs/.emacs.d/.cache/ home/pure_emacs/.emacs.d/elpa/ home/pure_emacs/.emacs.d/org-roam.db diff --git a/.zshrc b/.zshrc deleted file mode 100755 index e3b6e72..0000000 --- a/.zshrc +++ /dev/null @@ -1,104 +0,0 @@ -# If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:/usr/local/bin:$HOME/.emacs.d/bin:$PATH - -# Path to your oh-my-zsh installation. -export ZSH="/home/horhik/.oh-my-zsh" - -# Set name of the theme to load --- if set to "random", it will -# load a random theme each time oh-my-zsh is loaded, in which case, -# to know which specific one was loaded, run: echo $RANDOM_THEME -# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -ZSH_THEME="dracula" - -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME=random will cause zsh to load -# a theme from this variable instead of looking in $ZSH/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) - -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to use hyphen-insensitive completion. -# Case-sensitive completion must be off. _ and - will be interchangeable. -# HYPHEN_INSENSITIVE="true" - -# Uncomment the following line to disable bi-weekly auto-update checks. -# DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to automatically update without prompting. -# DISABLE_UPDATE_PROMPT="true" - -# Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 - -# Uncomment the following line if pasting URLs and other text is messed up. -# DISABLE_MAGIC_FUNCTIONS="true" - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# You can set one of the optional three formats: -# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, -# see 'man strftime' for details. -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? -# Standard plugins can be found in $ZSH/plugins/ -# Custom plugins may be added to $ZSH_CUSTOM/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. -plugins=(git) - -source $ZSH/oh-my-zsh.sh - -# User configuration - -export PATH=$HOME/.emacs.d/bin:$PATH - -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 - -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='mvim' -# fi - -# Compilation flags -# export ARCHFLAGS="-arch x86_64" - -# Set personal aliases, overriding those provided by oh-my-zsh libs, -# plugins, and themes. Aliases can be placed here, though oh-my-zsh -# users are encouraged to define aliases within the ZSH_CUSTOM folder. -# For a full list of active aliases, run `alias`. -# -# Example aliases -alias vim="nvim" -alias zshconfig="vim ~/.zshrc" -alias ohmyzsh="vim ~/.oh-my-zsh" -alias gc="git clone" -alias ldf="ls -d .*" # ls only dotfiles diff --git a/home/gtk/.config/gtk-2.0/gtkfilechooser.ini b/home/gtk/.config/gtk-2.0/gtkfilechooser.ini index 46dc0e0..98a16dc 100644 --- a/home/gtk/.config/gtk-2.0/gtkfilechooser.ini +++ b/home/gtk/.config/gtk-2.0/gtkfilechooser.ini @@ -2,10 +2,10 @@ LocationMode=path-bar ShowHidden=false ShowSizeColumn=true -GeometryX=630 -GeometryY=118 -GeometryWidth=660 -GeometryHeight=864 +GeometryX=633 +GeometryY=124 +GeometryWidth=654 +GeometryHeight=858 SortColumn=modified SortOrder=descending StartupMode=recent diff --git a/home/xmonad/.xmonad/xmonad.hs b/home/xmonad/.xmonad/xmonad.hs index 7e6db92..4099e19 100755 --- a/home/xmonad/.xmonad/xmonad.hs +++ b/home/xmonad/.xmonad/xmonad.hs @@ -177,8 +177,8 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ , ((modm .|. shiftMask, xK_s ), spawn "flameshot gui") , ((modm .|. mod1Mask , xK_space ), spawn "$HOME/.local/scripts/deadd_notify") -- change lang - , ((modm, xK_Control_R) , spawn "xkblayout-state set +1") - , ((modm, xK_Shift_R) , spawn "xkblayout-state set +1") + , ((modm, xK_Control_R) , spawn "xkb-switch -n") + , ((modm, xK_Shift_R) , spawn "xkb-switch -n") , ((modm, xK_d) , spawn "eww-toggl") -- toggle fullscreen , ((mod4Mask .|. shiftMask, xK_f), sendMessage ToggleStruts) @@ -265,7 +265,7 @@ myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $ -- The available layouts. Note that each layout is separated by |||, -- which denotes layout choice. -- -defaultGapSize = 7; +defaultGapSize = 0; defaultGaps = gaps [(U,defaultGapSize), (R,defaultGapSize), (D, defaultGapSize), (L, defaultGapSize)] mySpacing :: Integer -> l a -> XMonad.Layout.LayoutModifier.ModifiedLayout Spacing l a mySpacing i = spacingRaw False (Border i i i i) True (Border i i i i) True @@ -273,7 +273,7 @@ mySpacing i = spacingRaw False (Border i i i i) True (Border i i i i) True mySpacing' :: Integer -> l a -> XMonad.Layout.LayoutModifier.ModifiedLayout Spacing l a mySpacing' i = spacingRaw True (Border i i i i) True (Border i i i i) True -spacesAndGaps = mySpacing 7 . defaultGaps +spacesAndGaps = mySpacing 0 . defaultGaps @@ -282,7 +282,7 @@ tall = renamed [Replace "tall"] $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) $ limitWindows 12 - $ mySpacing 8 + $ mySpacing 0 $ ResizableTall 1 (3/100) (1/2) [] magnify = renamed [Replace "magnify"] $ smartBorders @@ -290,7 +290,7 @@ magnify = renamed [Replace "magnify"] $ subLayout [] (smartBorders Simplest) $ magnifier $ limitWindows 12 - $ mySpacing 8 + $ mySpacing 0 $ ResizableTall 1 (3/100) (1/2) [] monocle = renamed [Replace "monocle"] $ noBorders @@ -304,14 +304,14 @@ grid = renamed [Replace "grid"] $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) $ limitWindows 12 - $ mySpacing 8 + $ mySpacing 0 $ mkToggle (single MIRROR) $ Grid (16/10) spirals = renamed [Replace "spirals"] $ smartBorders $ addTabs shrinkText myTabTheme $ subLayout [] (smartBorders Simplest) - $ mySpacing' 8 + $ mySpacing' 0 $ spiral (6/7) threeCol = renamed [Replace "threeCol"] $ smartBorders diff --git a/home/zsh/.zshrc b/home/zsh/.zshrc index e582fa7..98bfe9f 100644 --- a/home/zsh/.zshrc +++ b/home/zsh/.zshrc @@ -12,7 +12,7 @@ export ZSH=/usr/share/oh-my-zsh/ # to know which specific one was loaded, run: echo $RANDOM_THEME # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes # if you installed the package oh-my-zsh-powerline-theme-git then you type here "powerline" as zsh theme -ZSH_THEME="sporty_256" +ZSH_THEME="robyshell" # Set list of themes to pick from when loading at random # Setting this variable when ZSH_THEME=random will cause zsh to load @@ -75,9 +75,8 @@ ZSH_THEME="sporty_256" # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git) -source $ZSH/oh-my-zsh.sh +#source $ZSH/oh-my-zsh.sh # User configuration @@ -100,7 +99,7 @@ source $ZSH/oh-my-zsh.sh #### ARCOLINUX SETTINGS #### -source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh +#source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh setopt GLOB_DOTS @@ -369,7 +368,6 @@ export CXX=/usr/bin/clang++ export _JAVA_AWT_WM_NONREPARENTING=1 export ANDROID_SDK_ROOT=/home/horhik/Android/Sdk/ export NDK_HOME=/home/horhik/Android/Sdk/ndk/22.0.7026061/ -ZSH_THEME="cloud" plugins=(git colorize colored-man-pages emoji rustup sudo zsh-syntax-highlighting zsh-autosuggestions zsh-completions) autoload -U compinit && compinit export PATH=$HOME/.local/bin:$PATH @@ -406,3 +404,4 @@ compile_and_run() { # eval $(thefuck --alias) if [ -e /home/horhik/.nix-profile/etc/profile.d/nix.sh ]; then . /home/horhik/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer +