This commit is contained in:
Benjamin Kyd
2023-05-03 15:07:33 +01:00
parent 71c4978fba
commit 1738ab3d1e
8 changed files with 48 additions and 148 deletions

View File

@@ -1,7 +1,7 @@
#!/bin/bash
#
# Dev utilsv
yay -S neovim-git nvm wezterm ranger ripgrep zsh curl exa
yay -S neovim-git nvm wezterm ranger ripgrep zsh zsh-vi-mode curl exa
sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
# WM Deps

View File

@@ -80,6 +80,7 @@ awesome.connect_signal("backlight_change",
"cat /sys/class/backlight/intel_backlight/brightness",
function(stdout)
local backlight_level = tonumber(stdout)
backlight_level = backlight_level / 4
backlight_bar.value = backlight_level
if (backlight_level < 50) then
backlight_icon:set_image(icon_dir .. "brightness-low.png")

View File

@@ -34,17 +34,6 @@ ruled.client.connect_signal("request::rules", function()
},
})
ruled.client.append_rule({
id = "signal",
rule = {
class = "Signal",
},
properties = {
screen = 2,
tag = "2",
},
})
ruled.client.append_rule({
id = "floating",
rule_any = {

View File

@@ -3,4 +3,3 @@ require('globals')
require('keymappings')
require('plugins')
require('post-plugin-basics')

View File

@@ -210,7 +210,7 @@ local packer = require('packer').startup(function(use)
enabled = true,
auto_trigger = true,
keymap = {
accept = '<S-CR>',
accept = '<C-CR>',
}
},
})

37
common/.tmux.conf Normal file
View File

@@ -0,0 +1,37 @@
set-option -g default-shell /bin/zsh
set -s extended-keys on
set -as terminal-features 'xterm*:extkeys'
set -ga terminal-overrides ",xterm*:Tc"
set -sg escape-time 0
set -g history-limit 50000
# fix tmux being a pain in the fucking ass and pass through C-CR to vim
#bind C-Enter send-keys -t $PANE_ID C-Enter
unbind C-Enter
# smart pane switching with awareness of vim splits
bind h select-pane -L
bind j select-pane -D
bind k select-pane -U
bind l select-pane -R
bind -r C-h resize-pane -L 4
bind -r C-j resize-pane -D 2
bind -r C-k resize-pane -U 2
bind -r C-l resize-pane -R 4
bind C-p previous-window
bind C-n next-window
set -g repeat-time 1000
# split panes using v and x
bind v split-window -h
bind x split-window -v
unbind '"'
unbind %
set -g status-right ""
set -g status-style 'bg=#98C379 fg=#282C34'

View File

@@ -1,125 +1,22 @@
# If you come from bash you might have to change your $PATH.
# export PATH=$HOME/bin:/usr/local/bin:$PATH
# Path to your oh-my-zsh installation.
export ZSH="$HOME/.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="robbyrussell"
ZSH_THEME="bira"
# 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 one of the following lines to change the auto-update behavior
# zstyle ':omz:update' mode disabled # disable automatic updates
# zstyle ':omz:update' mode auto # update automatically without asking
# zstyle ':omz:update' mode reminder # just remind me to update when it's time
# Uncomment the following line to change how often to auto-update (in days).
# zstyle ':omz:update' frequency 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.
# You can also set it to another string to have that shown instead of the default red dots.
# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
# 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 fancy-ctrl-z fzf)
source $ZSH/oh-my-zsh.sh
# User configuration
# 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 zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"
#keybindings
bindkey '^H' backward-kill-word
#export QSYS_ROOTDIR="/home/benk/.cache/yay/quartus-free/pkg/quartus-free-quartus/opt/intelFPGA/21.1/quartus/sopc_builder/bin"
#source "/home/ben/dprog/Resources/zephyr_master/zephyr/zephyr-env.sh"
#source /usr/share/nvm/init-nvm.sh
#[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.nvm"
#source /usr/share/nvm/nvm.sh
#source /usr/share/nvm/bash_completion
#s:ource /usr/share/nvm/install-nvm-exec
# more based keybinginds for regular ass typing
source /usr/share/zsh/plugins/zsh-vi-mode/zsh-vi-mode.plugin.zsh
ZVM_VI_EDITOR=vim
# aliases
alias vim="nvim"
alias vi="nvim"
alias v="nvim"
alias oldvim="vim"
alias vim=nvim
alias vi=nvim
alias v=nvim
alias oldvim=vim
export VISUAL=nvim;
export EDITOR=nvim;
@@ -132,5 +29,5 @@ alias ls="exa"
#[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
source .zshrc.local
source $HOME/.zshrc.local

View File

@@ -1,23 +0,0 @@
set-option -g default-shell /bin/zsh
# List of plugins
set -g @plugin 'tmux-plugins/tpm'
set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'christoomey/vim-tmux-navigator'
set -g @plugin 'dracula/tmux'
set -g @dracula-show-powerline true
set -g @dracula-show-fahrenheit false
set -g @dracula-show-flags true
set -g @dracula-show-left-icon session
set -g status-position top
# Other examples:
# set -g @plugin 'github_username/plugin_name'
# set -g @plugin 'github_username/plugin_name#branch'
# set -g @plugin 'git@github.com:user/plugin'
# set -g @plugin 'git@bitbucket.com:user/plugin'
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
run '~/.tmux/plugins/tpm/tpm'