From ee92c6100fd18a80309bcaa86d1cbc20f8f2cd49 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Fri, 23 Dec 2022 21:20:52 +0100 Subject: added a bunch of stuff and relocated some files --- .config/x11/xinitrc | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .config/x11/xinitrc (limited to '.config/x11') diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc new file mode 100644 index 0000000..cbaec52 --- /dev/null +++ b/.config/x11/xinitrc @@ -0,0 +1,26 @@ +#!/bin/sh + +rfkill block all + +eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" +eval "$(ssh-agent)" + +xset r rate 300 30 +xset s off -dpms +setxkbmap -option "ctrl:nocaps" + +xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary +xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 + +dbus-launch --sh-syntax --exit-with-session + +ibus-daemon -dxrR +statusbar & +pipewire & +mpd & +/usr/local/bin/emacs --daemon & +picom & +set-wallpaper & + +exec dwm >/dev/null 2>&1 + -- cgit v1.2.3 From 5da0902c8d705b2ad5c0baa7ff62cb459b02ea5e Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sat, 24 Dec 2022 14:07:10 +0100 Subject: updated --- .config/mpd/mpd.conf | 12 +++++----- .config/nvim/plugin/packer_compiled.lua | 40 ++++++++++++++++----------------- .config/shell/aliasrc | 6 ++--- .config/shell/profile | 5 ++++- .config/x11/xinitrc | 10 ++++----- .config/zsh/.zshrc | 5 ++++- .ncmpcpp/config | 2 +- 7 files changed, 43 insertions(+), 37 deletions(-) (limited to '.config/x11') diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 1b10341..f409799 100755 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -1,12 +1,12 @@ -bind_to_address "0.0.0.0" +bind_to_address "127.0.0.1" #bind_to_address "/run/mpd/socket" -music_directory "/hdd/music" +music_directory "/media/hdd/music" playlist_directory "~/.config/mpd/playlists" -db_file "~/.config/mpd/database" -log_file "~/.config/mpd/log" -pid_file "~/.config/mpd/pid" -state_file "~/.config/mpd/mpdstate" +db_file "~/.config/mpd/database" +log_file "~/.config/mpd/log" +pid_file "~/.config/mpd/pid" +state_file "~/.config/mpd/mpdstate" audio_output { type "pipewire" diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 75d1f59..6a3d510 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -242,30 +242,38 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) --- Config for: nvim-treesitter -time([[Config for nvim-treesitter]], true) -try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") -time([[Config for nvim-treesitter]], false) --- Config for: dracula -time([[Config for dracula]], true) -try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula") -time([[Config for dracula]], false) +-- Config for: nvim-ts-autotag +time([[Config for nvim-ts-autotag]], true) +try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag") +time([[Config for nvim-ts-autotag]], false) +-- Config for: nvim-cmp +time([[Config for nvim-cmp]], true) +try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") +time([[Config for nvim-cmp]], false) -- Config for: nvim-lspconfig time([[Config for nvim-lspconfig]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.lspconfig\frequire\0", "config", "nvim-lspconfig") time([[Config for nvim-lspconfig]], false) +-- Config for: dracula +time([[Config for dracula]], true) +try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.dracula\frequire\0", "config", "dracula") +time([[Config for dracula]], false) -- Config for: lualine.nvim time([[Config for lualine.nvim]], true) try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.lualine\frequire\0", "config", "lualine.nvim") time([[Config for lualine.nvim]], false) +-- Config for: nvim-autopairs +time([[Config for nvim-autopairs]], true) +try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") +time([[Config for nvim-autopairs]], false) -- Config for: nvim-tree.lua time([[Config for nvim-tree.lua]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.nvim-tree\frequire\0", "config", "nvim-tree.lua") time([[Config for nvim-tree.lua]], false) --- Config for: nvim-ts-autotag -time([[Config for nvim-ts-autotag]], true) -try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag") -time([[Config for nvim-ts-autotag]], false) +-- Config for: nvim-treesitter +time([[Config for nvim-treesitter]], true) +try_loadstring("\27LJ\2\n]\0\0\3\0\4\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\0\0'\2\3\0B\0\2\1K\0\1\0\28user.plugins.treesitter\nsetup\16spellsitter\frequire\0", "config", "nvim-treesitter") +time([[Config for nvim-treesitter]], false) -- Config for: LuaSnip time([[Config for LuaSnip]], true) try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25user.plugins.luasnip\frequire\0", "config", "LuaSnip") @@ -274,14 +282,6 @@ time([[Config for LuaSnip]], false) time([[Config for telescope.nvim]], true) try_loadstring("\27LJ\2\n6\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\27user.plugins.telescope\frequire\0", "config", "telescope.nvim") time([[Config for telescope.nvim]], false) --- Config for: nvim-cmp -time([[Config for nvim-cmp]], true) -try_loadstring("\27LJ\2\n0\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\21user.plugins.cmp\frequire\0", "config", "nvim-cmp") -time([[Config for nvim-cmp]], false) --- Config for: nvim-autopairs -time([[Config for nvim-autopairs]], true) -try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") -time([[Config for nvim-autopairs]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index b328c56..af0be04 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -1,8 +1,8 @@ ## MISCELLANEOUS # various shortcuts -alias reboot='sudo openrc-shutdown -r' -alias poweroff='sudo openrc-shutdown -p' +alias reboot='sudo reboot' +alias poweroff='sudo poweroff' alias pms='sudo pm-suspend' alias refresh='source $ZDOTDIR/.zshrc' alias fuck='sudo $(fc -Lln -1)' @@ -11,7 +11,7 @@ alias mutt='pushd ~/.mutt/attachments; mutt; popd' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' alias vi="$EDITOR" alias z='zathura' -alias cn='clear;macchina' +alias cn='clear;neofetch' alias nnn='nnn -Hde' alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' diff --git a/.config/shell/profile b/.config/shell/profile index a774d0e..ea3879e 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -1,4 +1,4 @@ -umask 0076 +umask 0077 export _JAVA_AWT_WM_NONREPARENTING=1 export EDITOR="nvim" @@ -23,8 +23,11 @@ export QT_IM_MODULE='ibus' export XMODIFIERS='@im=ibus' export XDG_SESSION_TYPE='x11' +export NVM_DIR="$HOME/.config/nvm" + export PATH="$PATH:$HOME/.local/bin:$HOME/.fzf/bin:$HOME/.cargo/bin:/sbin:/usr/sbin" # if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then # exec startx # fi + diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index cbaec52..b2e6a2a 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -2,8 +2,8 @@ rfkill block all -eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" -eval "$(ssh-agent)" +# eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" +# eval "$(ssh-agent)" xset r rate 300 30 xset s off -dpms @@ -14,13 +14,13 @@ xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 dbus-launch --sh-syntax --exit-with-session -ibus-daemon -dxrR +# ibus-daemon -dxrR statusbar & pipewire & mpd & -/usr/local/bin/emacs --daemon & +# /usr/local/bin/emacs --daemon & picom & set-wallpaper & -exec dwm >/dev/null 2>&1 +exec dwm diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index ec2f9e0..b63c931 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -84,7 +84,10 @@ setopt pushd_silent setopt pushd_ignore_dups setopt pushd_minus -macchina +neofetch + +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion if [ -f $XDG_CONFIG_HOME/.dircolors ]; then eval "$(dircolors -b $XDG_CONFIG_HOME/.dircolors)" diff --git a/.ncmpcpp/config b/.ncmpcpp/config index 763ee0a..6669585 100644 --- a/.ncmpcpp/config +++ b/.ncmpcpp/config @@ -4,7 +4,7 @@ lyrics_directory = ~/.ncmpcpp/lyrics mpd_host = localhost mpd_port = 6600 -mpd_music_dir = /hdd/music +mpd_music_dir = /media/hdd/music mpd_connection_timeout = 5 # Playlist -- cgit v1.2.3 From 66ebf6e1e49075c36ce8e1a3e869985f6b171581 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sun, 25 Dec 2022 23:27:37 +0100 Subject: added http audio output to mpd --- .config/mpd/mpd.conf | 16 ++++++++++++++-- .config/shell/aliasrc | 6 +++++- .config/x11/xinitrc | 4 ++-- .config/zsh/.zshrc | 12 +++++++----- 4 files changed, 28 insertions(+), 10 deletions(-) (limited to '.config/x11') diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index f409799..6f04a5d 100755 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -1,5 +1,5 @@ -bind_to_address "127.0.0.1" -#bind_to_address "/run/mpd/socket" +bind_to_address "0.0.0.0" +#bind_to_address "/run/mpd/socket" music_directory "/media/hdd/music" playlist_directory "~/.config/mpd/playlists" @@ -29,6 +29,16 @@ audio_output { format "44100:16:2" } +audio_output { + type "httpd" + name "My HTTP Stream" + encoder "vorbis" # optional, vorbis or lame + port "8001" + quality "8.0" # do not define if bitrate is defined +# bitrate "256" # do not define if quality is defined + format "44100:16:1" +} + input { enabled "no" plugin "qobuz" @@ -44,3 +54,5 @@ decoder { plugin "wildmidi" config_file "/etc/timidity/timidity.cfg" } + +mixer_type "software" diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index af0be04..cdc7be8 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -13,7 +13,11 @@ alias vi="$EDITOR" alias z='zathura' alias cn='clear;neofetch' alias nnn='nnn -Hde' -alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' +alias ea='vi ~/.config/shell/aliasrc' +#alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' + +# setting custom ascii +alias neofetch='neofetch --source ~/docs/ascii/lain' # cp mv and rm always verbose alias cp='cp -iv' diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index b2e6a2a..0c98334 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -2,8 +2,8 @@ rfkill block all -# eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" -# eval "$(ssh-agent)" +eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" +eval "$(ssh-agent)" xset r rate 300 30 xset s off -dpms diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index b63c931..13c6719 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -84,7 +84,6 @@ setopt pushd_silent setopt pushd_ignore_dups setopt pushd_minus -neofetch [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion @@ -97,19 +96,22 @@ if [ -f $XDG_CONFIG_HOME/shell/aliasrc ]; then . $XDG_CONFIG_HOME/shell/aliasrc fi -if [ -f $HOME/.fzf/fzf.zsh ]; then - . $HOME/.fzf/fzf.zsh -fi - +# FZF Section export FZF_DEFAULT_OPS="--extended" export FZF_DEFAULT_COMMAND="fdfind --type f" export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" +if [ -f $HOME/.fzf/fzf.zsh ]; then + . $HOME/.fzf/fzf.zsh +fi + # NNN if [ -f $XDG_CONFIG_HOME/nnn/nnn.bash ]; then . $XDG_CONFIG_HOME/nnn/nnn.bash fi +neofetch + if [ -f $XDG_DATA_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then . $XDG_DATA_HOME/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh fi -- cgit v1.2.3 From a360f1fc5d89be132044a0aa8f7a8ec4e65a7d95 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Tue, 27 Dec 2022 22:25:35 +0100 Subject: fixed color in zsh, sourced Xsession.d in xinitrc, changed clangd command in lspconfig --- .config/mpd/mpd.conf | 26 ++++++++++---------------- .config/nvim/lua/user/plugins/lspconfig.lua | 2 +- .config/shell/aliasrc | 2 +- .config/sxiv/exec/key-handler | 1 + .config/x11/xinitrc | 14 +++++++++----- .config/zsh/.zshrc | 4 +--- 6 files changed, 23 insertions(+), 26 deletions(-) (limited to '.config/x11') diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 6f04a5d..2ebf6b5 100755 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -8,27 +8,13 @@ log_file "~/.config/mpd/log" pid_file "~/.config/mpd/pid" state_file "~/.config/mpd/mpdstate" +# default local output audio_output { type "pipewire" name "Default" -# sink "alsa_output.pci-0000_29_00.0.analog-stereo" -} - -# For some reason ncmpcpp now switches correctly, so i'm disabling this. -#audio_output { -# type "pulse" -# name "Speakers" -# sink "alsa_output.pci-0000_31_00.4.analog-stereo" -#} -# - -audio_output { - type "fifo" - name "Visualizer feed" - path "/tmp/mpd.fifo" - format "44100:16:2" } +# http streaming audio_output { type "httpd" name "My HTTP Stream" @@ -39,6 +25,14 @@ audio_output { format "44100:16:1" } +# visualizer output +audio_output { + type "fifo" + name "Visualizer feed" + path "/tmp/mpd.fifo" + format "44100:16:2" +} + input { enabled "no" plugin "qobuz" diff --git a/.config/nvim/lua/user/plugins/lspconfig.lua b/.config/nvim/lua/user/plugins/lspconfig.lua index a63975b..92a728b 100644 --- a/.config/nvim/lua/user/plugins/lspconfig.lua +++ b/.config/nvim/lua/user/plugins/lspconfig.lua @@ -115,9 +115,9 @@ require 'lspconfig'.clangd.setup { flags = { debounce_text_changes = 150, }, + cmd = { "/usr/bin/clangd-13" }; } - -- suppress error messages from lang servers vim.notify = function(msg, log_level, _) if msg:match 'exit code' then diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index cdc7be8..10f32a1 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -14,7 +14,7 @@ alias z='zathura' alias cn='clear;neofetch' alias nnn='nnn -Hde' alias ea='vi ~/.config/shell/aliasrc' -#alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' +alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' # setting custom ascii alias neofetch='neofetch --source ~/docs/ascii/lain' diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler index 19bcc67..dcbc60b 100755 --- a/.config/sxiv/exec/key-handler +++ b/.config/sxiv/exec/key-handler @@ -6,5 +6,6 @@ do "C-d") rm "$file" ;; "C-c") cat "$file" | xclip -sel c -t image/png ;; "C-w") xwallpaper --maximize "$file" ;; + "C-z") mv "$file" /media/hdd/pics/wallpaper/ esac done diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 0c98334..dc3b2b5 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -1,24 +1,28 @@ #!/bin/sh +if [ -d "/etc/X11/Xsession.d" ]; then + for f in /etc/X11/Xsession.d/*; do + [ -x "$f" ] && . "$f" + done + unset f +fi + rfkill block all eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" -eval "$(ssh-agent)" -xset r rate 300 30 +xset r rate 250 30 xset s off -dpms setxkbmap -option "ctrl:nocaps" xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 -dbus-launch --sh-syntax --exit-with-session - # ibus-daemon -dxrR statusbar & +dunst & pipewire & mpd & -# /usr/local/bin/emacs --daemon & picom & set-wallpaper & diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 13c6719..c5e5f2d 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,7 +1,5 @@ autoload -U colors && colors -# PS1="%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%{$reset_color%}$%b " - stty stop undef autoload -U compinit @@ -56,7 +54,7 @@ TRAPINT() { return $(( 128 + $1 )) } -PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%{$reset_color%}%b %(?.%F{green}$THEME_VI_MODE_SYMBOL.%F{red}$THEME_VI_MODE_SYMBOL) ' +PROMPT='%B%{$fg[red]%}[%{$fg[magenta]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[yellow]%}%~%{$fg[red]%}]%b%(?.%F{green}$THEME_VI_MODE_SYMBOL.%F{red}$THEME_VI_MODE_SYMBOL)%{$reset_color%} ' setopt extendedGlob -- cgit v1.2.3 From 5cf8669daf4addb2003f0ca4b362cc7b3c3db38f Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Wed, 11 Jan 2023 22:46:14 +0100 Subject: i dont even know anymore, i just update this from time to time --- .config/neofetch/config.conf | 2 +- .config/picom/picom.conf | 10 ++++++---- .config/shell/aliasrc | 2 +- .config/shell/profile | 1 - .config/x11/xinitrc | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) (limited to '.config/x11') diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 0707571..86feaa4 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -745,7 +745,7 @@ ascii_distro="auto" # Example: # ascii_colors=(distro) - Ascii is colored based on Distro colors. # ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. -ascii_colors=(distro) +ascii_colors=(15 88 88 88 88 88) # Bold ascii logo # Whether or not to bold the ascii logo. diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index 08dea69..fa4d989 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -1,6 +1,8 @@ # just very slightly rounded corners -corner-radius = 6 +# empty file, just so transparency works on st -rounded-corners-exclude = [ - "class_g = 'dwm'" -]; +# corner-radius = 6 + +# rounded-corners-exclude = [ +# "class_g = 'dwm'" +# ]; diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 10f32a1..7cc0a9d 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -17,7 +17,7 @@ alias ea='vi ~/.config/shell/aliasrc' alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' # setting custom ascii -alias neofetch='neofetch --source ~/docs/ascii/lain' +# alias neofetch='neofetch --source ~/docs/ascii/lain' # cp mv and rm always verbose alias cp='cp -iv' diff --git a/.config/shell/profile b/.config/shell/profile index ea3879e..6cca5f1 100644 --- a/.config/shell/profile +++ b/.config/shell/profile @@ -14,7 +14,6 @@ export ZDOTDIR="$XDG_CONFIG_HOME/zsh" export LC_ALL=en_US.UTF-8 -export STARSHIP_CONFIG=~/.config/starship/starship.toml export MAIL=~/.mutt/Maildir export NO_AT_BRIDGE=1 diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index dc3b2b5..220c9ff 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -10,6 +10,7 @@ fi rfkill block all eval "$(gpg-agent --daemon --allow-preset-passphrase --write-env-file "$envfile")" +eval "$(ssh-agent)" xset r rate 250 30 xset s off -dpms @@ -20,7 +21,6 @@ xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 # ibus-daemon -dxrR statusbar & -dunst & pipewire & mpd & picom & -- cgit v1.2.3 From 782ee288d7a60e9f1359d6aa439ddc0f28ed09e6 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Fri, 17 Feb 2023 00:03:57 +0100 Subject: add metadata to yt-dlp vids, changed mkwebm video codec, re-added ibus-daemon to xinitrc --- .config/picom/picom.conf | 5 +++++ .config/shell/aliasrc | 39 ++++++++++++++++++++++++++++++++------- .config/x11/xinitrc | 2 +- .config/yt-dlp/config | 2 +- .config/zsh/.zshrc | 1 + 5 files changed, 40 insertions(+), 9 deletions(-) (limited to '.config/x11') diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index fa4d989..6d3640c 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -1,6 +1,11 @@ # just very slightly rounded corners # empty file, just so transparency works on st +opacity-rule = [ + "90:class_g = 'discord' && focused", + "90:class_g = 'discord' && !focused" +] + # corner-radius = 6 # rounded-corners-exclude = [ diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 7cc0a9d..c107f4d 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -14,6 +14,8 @@ alias z='zathura' alias cn='clear;neofetch' alias nnn='nnn -Hde' alias ea='vi ~/.config/shell/aliasrc' +alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' +alias cam='mpv --profile=low-latency --untimed /dev/video0' alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' # setting custom ascii @@ -28,10 +30,18 @@ alias mkd='mkdir -pv' # Colorize grep output alias grep='grep --color=auto -i' -# color ls, always full info and human readable; group dirs +# ls shortcuts alias ls='ls -hl --color=always --group-directories-first' alias la='ls -a' +ld() { + if [ "$1" = "" ]; then + ls -d */; + else + ls -d $1/*/ | sed "s|$1/||"; + fi +} + # Control Audio alias headset="wpctl set-default $(wpctl status | grep 'Headphones' | cut -b11-12)" alias speakers="wpctl set-default $(wpctl status | grep 'Speakers' | cut -b11-12)" @@ -45,6 +55,25 @@ alias setlmon-lowres='xrandr --auto --output DisplayPort-2 --mode 640x480 --left alias setlmon-midres='xrandr --auto --output DisplayPort-2 --mode 800x600 --left-of HDMI-A-0' alias setlmon-default='xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0' +# function for timer and stopwatch +timer() { + date1=$((`date +%s` + $1)); + while [ "$date1" -ge `date +%s` ]; do + echo -ne "$(date -u --date @$(($date1 - `date +%s`)) +%H:%M:%S)\r"; + sleep 0.1 + done + notify-send "Time Up"; pw-play "/usr/share/sounds/freedesktop/stereo/complete.oga" +} + +stopwatch() { + date1=`date +%s`; + while true; do + echo -ne "$(date -u --date @$((`date +%s` - $date1)) +%H:%M:%S)\r"; + sleep 0.1 + done +} + + ## FUNCTIONS FOR CONVERTING DATE TO ISO 8601 # convert date from YYYYMMDD to YYYY-MM-DD @@ -63,15 +92,11 @@ date-reverse() { done; } -## DOWNLOADING AND CONVERTING VIDEO - -# shortcuts for most used yt-dlp settings -alias ytvid='yt-dlp -o "/media/hdd/vids/random/%(title)s.%(ext)s" --remux-video "mkv"' -alias ytarchive='yt-dlp -o "/media/hdd/vids/archives/%(uploader)s/%(upload_date)s - %(title)s/%(title)s.%(ext)s" --remux-video "mkv"' +## CONVERTING VIDEO # convert video files to webm mkwebm() { - ffmpeg -i "${1}" -crf 1 -b:v 1M -c:a libvorbis "${1%.*}".webm + ffmpeg -i "${1}" -c:v libvpx-vp9 -crf 1 -b:v 1M -c:a libvorbis "${1%.*}".webm } ## GIT diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 220c9ff..d106aa8 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -19,7 +19,7 @@ setxkbmap -option "ctrl:nocaps" xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 -# ibus-daemon -dxrR +ibus-daemon -dxrR statusbar & pipewire & mpd & diff --git a/.config/yt-dlp/config b/.config/yt-dlp/config index aeb3bda..e2b5628 100755 --- a/.config/yt-dlp/config +++ b/.config/yt-dlp/config @@ -1 +1 @@ ---verbose -ciw -f bestvideo[ext=mp4][vcodec!*=av01]+bestaudio[ext=m4a]/best[ext=mp4]/best --merge-output-format mkv +--verbose -ciw -f bestvideo[ext=mp4][vcodec!*=av01]+bestaudio[ext=m4a]/best[ext=mp4]/best --add-metadata --merge-output-format mkv diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index c5e5f2d..016a729 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,6 +1,7 @@ autoload -U colors && colors stty stop undef +setopt no_nomatch autoload -U compinit zstyle ':completion:*' menu select -- cgit v1.2.3 From be35ccddeb63db26949183ade5a801593918a597 Mon Sep 17 00:00:00 2001 From: yuzu-eva Date: Sat, 1 Apr 2023 15:59:07 +0200 Subject: removed emacs configs --- .config/nvim/snippets/all.lua | 23 +++ .config/nvim/snippets/html.lua | 20 --- .config/picom/picom.conf | 4 +- .config/shell/aliasrc | 3 + .config/x11/xinitrc | 1 + .emacs.d/config.el | 87 ---------- .emacs.d/dracula-custom-theme.el | 52 ------ .emacs.d/functions.el | 49 ------ .emacs.d/init.el | 14 -- .emacs.d/keybinds.el | 14 -- .emacs.d/packages.el | 335 --------------------------------------- 11 files changed, 29 insertions(+), 573 deletions(-) create mode 100644 .config/nvim/snippets/all.lua delete mode 100644 .config/nvim/snippets/html.lua delete mode 100644 .emacs.d/config.el delete mode 100644 .emacs.d/dracula-custom-theme.el delete mode 100644 .emacs.d/functions.el delete mode 100644 .emacs.d/init.el delete mode 100644 .emacs.d/keybinds.el delete mode 100644 .emacs.d/packages.el (limited to '.config/x11') diff --git a/.config/nvim/snippets/all.lua b/.config/nvim/snippets/all.lua new file mode 100644 index 0000000..78c33db --- /dev/null +++ b/.config/nvim/snippets/all.lua @@ -0,0 +1,23 @@ +return { + parse('sktn', '\ +\ +\ +\ + Website Title\ + \ + \ + \ +\ +\ +\ +
\ +

Header Text

\ +
\ +
\ +

Lorem ipsum bla, bla, bla...

\ +
\ +\ +\ +\ +'), +} diff --git a/.config/nvim/snippets/html.lua b/.config/nvim/snippets/html.lua deleted file mode 100644 index b168aca..0000000 --- a/.config/nvim/snippets/html.lua +++ /dev/null @@ -1,20 +0,0 @@ -return { - parse('sktn', '\ -\ -\ -\ - \ - \ - \ - \ -\ -\ -\ -
\ -

\ -
\ -\ -\ -\ -'), -} diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index f3eb671..a095613 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -2,8 +2,8 @@ # empty file, just so transparency works on st opacity-rule = [ - "90:class_g = 'SchildiChat' && focused", - "90:class_g = 'SchildiChat' && !focused" + "98:class_g = 'SchildiChat' && focused", + "98:class_g = 'SchildiChat' && !focused" ] # corner-radius = 6 diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index c107f4d..5d21bf7 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -10,6 +10,8 @@ alias open='xdg-open' alias mutt='pushd ~/.mutt/attachments; mutt; popd' alias jpwine='LANG=ja_JP.UTF-8 WINEDEBUG=-all wine' alias vi="$EDITOR" +alias em='emacsclient -c -a "emacs" &' +alias emacsd='/usr/local/bin/emacs --daemon &' alias z='zathura' alias cn='clear;neofetch' alias nnn='nnn -Hde' @@ -17,6 +19,7 @@ alias ea='vi ~/.config/shell/aliasrc' alias setkeys='xset r rate 250 30 && setxkbmap -option "ctrl:nocaps"' alias cam='mpv --profile=low-latency --untimed /dev/video0' alias freyr='sudo docker run -it --rm -v /media/hdd/music:/data freyrcli/freyrjs' +alias ofn='/usr/bin/ls | cat -n | while read n f; do rename "s/${f%.*}/$(printf "%04d" "$n")/" "$f"; done' # setting custom ascii # alias neofetch='neofetch --source ~/docs/ascii/lain' diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index d106aa8..76a3ff5 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -20,6 +20,7 @@ xrandr --auto --output HDMI-A-0 --mode 1920x1080 --primary xrandr --auto --output DisplayPort-2 --mode 1600x900 --left-of HDMI-A-0 ibus-daemon -dxrR +/usr/local/bin/emacs --daemon & statusbar & pipewire & mpd & diff --git a/.emacs.d/config.el b/.emacs.d/config.el deleted file mode 100644 index a46bca5..0000000 --- a/.emacs.d/config.el +++ /dev/null @@ -1,87 +0,0 @@ -(add-hook 'text-mode-hook 'display-line-numbers-mode) -(add-hook 'prog-mode-hook 'display-line-numbers-mode) -(add-hook 'emacs-startup-hook 'startup/revert-file-name-handler-alist) -(add-hook 'emacs-startup-hook 'startup/reset-gc) - -;; dirty fix for having AC everywhere -(define-globalized-minor-mode real-global-auto-complete-mode - auto-complete-mode (lambda () - (if (not (minibufferp (current-buffer))) - (auto-complete-mode 1)) - )) -(real-global-auto-complete-mode t) - -;; Mutt support -(add-to-list 'auto-mode-alist '("/tmp/mutt.*" . mail-mode)) - -(show-paren-mode 1) -(tool-bar-mode -1) -(menu-bar-mode -1) -(scroll-bar-mode -1) -(global-prettify-symbols-mode t) -(electric-pair-mode t) -(global-hl-line-mode t) -(recentf-mode 1) -(savehist-mode 1) -(global-auto-revert-mode 1) - -(set-frame-parameter (selected-frame) 'alpha '(80 . 80)) -(add-to-list 'default-frame-alist '(alpha .(80 . 80))) - -(defvar startup/file-name-handler-alist file-name-handler-alist) - -(defalias 'open 'find-file-other-window) -(defalias 'clean 'eshell/clear-scrollback) -(defalias 'yes-or-no-p 'y-or-n-p) - -;; Make emacs startup faster -(setq gc-cons-threshold 402653184 - gc-cons-percentage 0.6) - -(setq-default major-mode 'text-mode) - -(setq inhibit-startup-message t) -(setq x-select-enable-clipboard t) -(setq make-backup-files nil) -(setq scroll-conservatively 100) -(setq ring-bell-function 'ignore) -(setq history-length 25) -(setq global-auto-revert-non-file-buffers t) -(setq native-comp-async-report-warnings-errors 'silent) -(setq warning-minimum-level :error) - -(setq-default tab-width 4) -(setq-default standard-indent 4) -(setq c-basic-offset tab-width) -(setq-default electric-indent-inhibit t) -(setq-default indent-tabs-mode t) -(setq backward-delete-char-untabify-method 'nil) - - -(setq electric-pair-pairs '( - (?\{ . ?\}) - (?\( . ?\)) - (?\[ . ?\]) - (?\" . ?\") - )) - -(setq use-package-always-defer t) - -(setq eshell-prompt-regexp "^[^αλ\n]*[αλ] ") -(setq eshell-prompt-function - (lambda nil - (concat - (if (string= (eshell/pwd) (getenv "HOME")) - (propertize "~" 'face `(:foreground "#99CCFF")) - (replace-regexp-in-string - (getenv "HOME") - (propertize "~" 'face `(:foreground "#99CCFF")) - (propertize (eshell/pwd) 'face `(:foreground "#99CCFF")))) - (if (= (user-uid) 0) - (propertize " α " 'face `(:foreground "#FF6666")) - (propertize " λ " 'face `(:foreground "#A6E22E")))))) - -(setq eshell-highlight-prompt nil) -(setq file-name-handler-alist nil) - -(setq initial-buffer-choice (lambda () (get-buffer "*dashboard*"))) diff --git a/.emacs.d/dracula-custom-theme.el b/.emacs.d/dracula-custom-theme.el deleted file mode 100644 index ee96b4c..0000000 --- a/.emacs.d/dracula-custom-theme.el +++ /dev/null @@ -1,52 +0,0 @@ -(deftheme dracula-custom - "Created 2022-11-27.") - -(custom-theme-set-faces - 'dracula-custom - '(cursor ((t (:background "#ccccc7")))) - '(fixed-pitch ((t (:family "Monospace")))) - '(variable-pitch ((((type w32)) (:foundry "outline" :family "Arial")) (t (:family "Sans Serif")))) - '(escape-glyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown")))) - '(homoglyph ((((background dark)) (:foreground "cyan")) (((type pc)) (:foreground "magenta")) (t (:foreground "brown")))) - '(minibuffer-prompt ((t (:weight bold :foreground "#ff79c6")))) - '(highlight ((t (:foreground "#ccccc7" :background "#464752")))) - '(region ((t (:extend t :inherit (match))))) - '(shadow ((t (:foreground "#6272a4")))) - '(secondary-selection ((((class color) (min-colors 88) (background light)) (:extend t :background "yellow1")) (((class color) (min-colors 88) (background dark)) (:extend t :background "SkyBlue4")) (((class color) (min-colors 16) (background light)) (:extend t :background "yellow")) (((class color) (min-colors 16) (background dark)) (:extend t :background "SkyBlue4")) (((class color) (min-colors 8)) (:extend t :foreground "black" :background "cyan")) (t (:inverse-video t)))) - '(trailing-whitespace ((t (:background "#ffb86c")))) - '(font-lock-builtin-face ((t (:slant italic :foreground "#8be9fd")))) - '(font-lock-comment-delimiter-face ((t (:inherit (shadow))))) - '(font-lock-comment-face ((t (:inherit (shadow))))) - '(font-lock-constant-face ((t (:foreground "#bd93f9")))) - '(font-lock-doc-face ((t (:foreground "#6272a4")))) - '(font-lock-doc-markup-face ((t (:inherit (font-lock-constant-face))))) - '(font-lock-function-name-face ((t (:weight bold :foreground "#50fa7b")))) - '(font-lock-keyword-face ((t (:foreground "#ff79c6" :weight bold)))) - '(font-lock-negation-char-face ((t (:foreground "#8be9fd")))) - '(font-lock-preprocessor-face ((t (:foreground "#ffb86c")))) - '(font-lock-regexp-grouping-backslash ((t (:foreground "#8be9fd")))) - '(font-lock-regexp-grouping-construct ((t (:foreground "#bd93f9")))) - '(font-lock-string-face ((t (:foreground "#f1fa8c")))) - '(font-lock-type-face ((t (:inherit (font-lock-builtin-face))))) - '(font-lock-variable-name-face ((t (:foreground "#d8a5f8" :weight bold)))) - '(font-lock-warning-face ((t (:background "#373844" :inherit (warning))))) - '(button ((t (:inherit (link))))) - '(link ((t (:underline (:color foreground-color :style line) :foreground "#8be9fd")))) - '(link-visited ((default (:inherit (link))) (((class color) (background light)) (:foreground "magenta4")) (((class color) (background dark)) (:foreground "violet")))) - '(fringe ((t (:foreground "#b6b6b2" :background "#282a36")))) - '(header-line ((t (:inherit 'mode-line)))) - '(tooltip ((t (:foreground "#f8f8f2" :background "#44475a")))) - '(mode-line ((t (:box (:line-width (1 . 1) :color "#44475a" :style nil) :inverse-video nil :foreground "#f8f8f2" :background "#44475a")))) - '(mode-line-buffer-id ((t (:weight bold)))) - '(mode-line-emphasis ((t (:weight bold)))) - '(mode-line-highlight ((((supports :box t) (class color) (min-colors 88)) (:box (:line-width (2 . 2) :color "grey40" :style released-button))) (t (:inherit (highlight))))) - '(mode-line-inactive ((t (:box (:line-width (1 . 1) :color "#373844" :style nil) :inverse-video nil :foreground "#b6b6b2" :background "#282a36")))) - '(isearch ((t (:weight bold :inherit (match))))) - '(isearch-fail ((t (:foreground "#282a36" :background "#ffb86c")))) - '(lazy-highlight ((t (:foreground "#e2e2dc" :background "#373844")))) - '(match ((t (:foreground "#282a36" :background "#f1fa8c")))) - '(next-error ((t (:inherit (region))))) - '(query-replace ((t (:inherit (isearch))))) - '(default ((t (:family "Hack Nerd Font" :foundry "SRC" :width normal :height 113 :weight normal :slant normal :underline nil :overline nil :extend nil :strike-through nil :box nil :inverse-video nil :foreground "#F8F8F2" :background "#262626" :stipple nil :inherit nil))))) - -(provide-theme 'dracula-custom) diff --git a/.emacs.d/functions.el b/.emacs.d/functions.el deleted file mode 100644 index cc86002..0000000 --- a/.emacs.d/functions.el +++ /dev/null @@ -1,49 +0,0 @@ -(defun startup/revert-file-name-handler-alist () - (setq file-name-handler-alist startup/file-name-handler-alist)) - -(defun startup/reset-gc () - (setq gc-cons-threshold 16777216 - gc-cons-percentage 0.1)) - -(defun split-and-follow-horizontally () - (interactive) - (split-window-below) - (balance-windows) - (other-window 1)) - -(defun split-and-follow-vertically () - (interactive) - (split-window-right) - (balance-windows) - (other-window 1)) - -(defun toggle-transparency() - (interactive) - (let ((alpha (frame-parameter nil 'alpha))) - (set-frame-parameter - nil 'alpha - (if (eql (cond ((numberp alpha) alpha) - ((numberp (cdr alpha)) (cdr alpha)) - ;; Also handle undocumented ( ) form. - ((numberp (cadr alpha)) (cadr alpha))) - 100) - '(80 . 80) '(100 . 100))))) - -(defun eshell/sudo-open (filename) - "Open a file as root in Eshell." - (let ((qual-filename (if (string-match "^/" filename) - filename - (concat (expand-file-name (eshell/pwd)) "/" filename)))) - (switch-to-buffer - (find-file-noselect - (concat "/sudo::" qual-filename))))) - -(defun eshell-other-window () - "Create or visit an eshell buffer." - (interactive) - (if (not (get-buffer "*eshell*")) - (progn - (split-window-sensibly (selected-window)) - (other-window 1) - (eshell)) - (switch-to-buffer-other-window "*eshell*"))) diff --git a/.emacs.d/init.el b/.emacs.d/init.el deleted file mode 100644 index 6079b3d..0000000 --- a/.emacs.d/init.el +++ /dev/null @@ -1,14 +0,0 @@ -(load "~/.emacs.d/packages" nil t) -(load "~/.emacs.d/functions" nil t) -(load "~/.emacs.d/keybinds" nil t) -(load "~/.emacs.d/config" nil t) - -(server-start) -(set-default-file-modes #o700) - -;; Load Witchmacs theme -(load-theme 'Witchmacs t) - -;; Move customization variables to a separate file and load it -(setq custom-file (locate-user-emacs-file "custom-vars.el")) -(load custom-file 'noerror 'nomessage) diff --git a/.emacs.d/keybinds.el b/.emacs.d/keybinds.el deleted file mode 100644 index e0fa2ed..0000000 --- a/.emacs.d/keybinds.el +++ /dev/null @@ -1,14 +0,0 @@ -;; Control X -(global-set-key (kbd "C-x 2") 'split-and-follow-horizontally) -(global-set-key (kbd "C-x 3") 'split-and-follow-vertically) - -;; Super -(global-set-key (kbd "s-C-") 'shrink-window-horizontally) -(global-set-key (kbd "s-C-") 'enlarge-window-horizontally) -(global-set-key (kbd "s-C-") 'shrink-window) -(global-set-key (kbd "s-C-") 'enlarge-window) -(global-set-key (kbd "") 'eshell-other-window) - -;; Control C -(global-set-key (kbd "C-c r") 'recentf-open-files) -(global-set-key (kbd "C-c t") 'toggle-transparency) diff --git a/.emacs.d/packages.el b/.emacs.d/packages.el deleted file mode 100644 index 9abae55..0000000 --- a/.emacs.d/packages.el +++ /dev/null @@ -1,335 +0,0 @@ -;; Initialize melpa repo -(require 'package) -(setq package-enable-at-startup nil) -(add-to-list 'package-archives - '("melpa" . "https://melpa.org/packages/")) -(package-initialize) - -;; Initialize use-package -(unless (package-installed-p 'use-package) - (package-refresh-contents) - (package-install 'use-package)) -(use-package org - :config - (add-hook 'org-mode-hook 'org-indent-mode) - (add-hook 'org-mode-hook - (lambda () - (visual-line-mode 1)))) - -(use-package org-indent - :diminish org-indent-mode) - -(use-package htmlize - :ensure t) - -(use-package auto-package-update - :defer nil - :ensure t - :config - (setq auto-package-update-delete-old-versions t) - (setq auto-package-update-hide-results t) - (auto-package-update-maybe)) - -(use-package diminish - :ensure t) - -(use-package spaceline - :ensure t) - -(use-package powerline - :ensure t - :init - (spaceline-spacemacs-theme) - :hook - ('after-init-hook) . 'powerline-reset) - -(use-package dashboard - :ensure t - :defer nil - :preface - (defun update-config () - "Update Witchmacs to the latest version." - (interactive) - (let ((dir (expand-file-name user-emacs-directory))) - (if (file-exists-p dir) - (progn - (message "Witchmacs is updating!") - (cd dir) - (shell-command "git pull") - (message "Update finished. Switch to the messages buffer to see changes and then restart Emacs")) - (message "\"%s\" doesn't exist." dir)))) - - (defun create-scratch-buffer () - "Create a scratch buffer" - (interactive) - (switch-to-buffer (get-buffer-create "*scratch*")) - (lisp-interaction-mode)) - :config - (dashboard-setup-startup-hook) - (setq dashboard-items '((recents . 5))) - (setq dashboard-banner-logo-title "W I T C H M A C S - The cutest Emacs distribution!") - (setq dashboard-startup-banner "~/.emacs.d/marivector.png") - (setq dashboard-center-content t) - (setq dashboard-show-shortcuts nil) - (setq dashboard-set-init-info t) - (setq dashboard-init-info (format "%d packages loaded in %s" - (length package-activated-list) (emacs-init-time))) - (setq dashboard-set-footer nil) - (setq dashboard-set-navigator t) - (setq dashboard-navigator-buttons - `(;; line1 - ((,nil - "Witchmacs on github" - "Open Witchmacs' github page on your browser" - (lambda (&rest _) (browse-url "https://github.com/snackon/witchmacs")) - 'default) - (nil - "Witchmacs crash course" - "Open Witchmacs' introduction to Emacs" - (lambda (&rest _) (find-file "~/.emacs.d/Witcheat.org")) - 'default) - (nil - "Update Witchmacs" - "Get the latest Witchmacs update. Check out the github commits for changes!" - (lambda (&rest _) (update-config)) - 'default) - ) - ;; line 2 - ((,nil - "Open scratch buffer" - "Switch to the scratch buffer" - (lambda (&rest _) (create-scratch-buffer)) - 'default) - (nil - "Open config.el" - "Open Witchmacs' configuration file for easy editing" - (lambda (&rest _) (find-file "~/.emacs.d/config.el")) - 'default) - (nil - "Open init.el" - "Open init file" - (lambda (&rest _) (find-file "~/.emacs.d/init.el")) - 'default))))) - - -;(insert (concat -; (propertize (format "%d packages loaded in %s" -; (length package-activated-list) (emacs-init-time)) -; 'face 'font-lock-comment-face))) -; -;(dashboard-center-line) - -(use-package which-key - :ensure t - :diminish which-key-mode - :init - (which-key-mode)) - -(use-package swiper - :ensure t - :bind ("C-s" . 'swiper)) - -(use-package evil - :ensure t - :defer nil - :init - (setq evil-want-keybinding nil) - (setq evil-want-C-u-scroll t) - :config - (evil-mode 1)) - -;(use-package evil-collection -; :after evil -; :ensure t -; :config -; (evil-collection-init)) - -(use-package beacon - :ensure t - :diminish beacon-mode - :init - (beacon-mode 1)) - -(use-package avy - :ensure t - :bind - ("M-s" . avy-goto-char)) - -(use-package switch-window - :ensure t - :config - (setq switch-window-input-style 'minibuffer) - (setq switch-window-increase 4) - (setq switch-window-threshold 2) - (setq switch-window-shortcut-style 'qwerty) - (setq switch-window-qwerty-shortcuts - '("a" "s" "d" "f" "j" "k" "l")) - :bind - ([remap other-window] . switch-window)) - -(use-package ido - :init - (ido-mode 1) - :config - (setq ido-enable-flex-matching nil) - (setq ido-create-new-buffer 'always) - (setq ido-everywhere t)) - -(use-package ido-vertical-mode - :ensure t - :init - (ido-vertical-mode 1)) -; This enables arrow keys to select while in ido mode. If you want to -; instead use the default Emacs keybindings, change it to -; "'C-n-and-C-p-only" -(setq ido-vertical-define-keys 'C-n-C-p-up-and-down) - -(use-package async - :ensure t - :init - (dired-async-mode 1)) - -(use-package page-break-lines - :ensure t - :diminish (page-break-lines-mode visual-line-mode)) - -(use-package undo-tree - :ensure t - :diminish undo-tree-mode) - -(use-package treemacs - :ensure t - :defer t - :init - (with-eval-after-load 'winum - (define-key winum-keymap (kbd "M-0") #'treemacs-select-window)) - :config - (progn - (setq treemacs-collapse-dirs (if (executable-find "python3") 3 0) - treemacs-deferred-git-apply-delay 0.5 - treemacs-display-in-side-window t - treemacs-eldoc-display t - treemacs-file-event-delay 5000 - treemacs-file-follow-delay 0.2 - treemacs-follow-after-init t - treemacs-git-command-pipe "" - treemacs-goto-tag-strategy 'refetch-index - treemacs-indentation 2 - treemacs-indentation-string " " - treemacs-is-never-other-window nil - treemacs-max-git-entries 5000 - treemacs-missing-project-action 'ask - treemacs-no-png-images nil - treemacs-no-delete-other-windows t - treemacs-project-follow-cleanup nil - treemacs-persist-file (expand-file-name ".cache/treemacs-persist" user-emacs-directory) - treemacs-recenter-distance 0.1 - treemacs-recenter-after-file-follow nil - treemacs-recenter-after-tag-follow nil - treemacs-recenter-after-project-jump 'always - treemacs-recenter-after-project-expand 'on-distance - treemacs-show-cursor nil - treemacs-show-hidden-files t - treemacs-silent-filewatch nil - treemacs-silent-refresh nil - treemacs-sorting 'alphabetic-desc - treemacs-space-between-root-nodes t - treemacs-tag-follow-cleanup t - treemacs-tag-follow-delay 1.5 - treemacs-width 30) - (treemacs-resize-icons 11) - - (treemacs-follow-mode t) - (treemacs-filewatch-mode t) - (treemacs-fringe-indicator-mode t) - (pcase (cons (not (null (executable-find "git"))) - (not (null (executable-find "python3")))) - (`(t . t) - (treemacs-git-mode 'deferred)) - (`(t . _) - (treemacs-git-mode 'simple)))) - :bind - (:map global-map - ("M-0" . treemacs-select-window) - ("C-x t 1" . treemacs-delete-other-windows) - ("C-x t t" . treemacs) - ("C-x t B" . treemacs-bookmark) - ("C-x t C-t" . treemacs-find-file) - ("C-x t M-t" . treemacs-find-tag))) - -(use-package treemacs-evil - :after treemacs evil - :ensure t) - - (use-package treemacs-icons-dired - :after treemacs dired - :ensure t - :config (treemacs-icons-dired-mode)) - -(use-package magit - :ensure t) - -(use-package eldoc - :diminish eldoc-mode) - -(use-package abbrev - :diminish abbrev-mode) - -(use-package company - :ensure t - :diminish (meghanada-mode company-mode irony-mode) - :config - (setq company-idle-delay 0) - (setq company-minimum-prefix-length 3) - (define-key company-active-map (kbd "M-n") nil) - (define-key company-active-map (kbd "M-p") nil) - (define-key company-active-map (kbd "C-n") #'company-select-next) - (define-key company-active-map (kbd "C-p") #'company-select-previous) - (define-key company-active-map (kbd "SPC") #'company-abort) - :hook - ((java-mode c-mode c++-mode) . company-mode)) - -(use-package yasnippet - :ensure t - :diminish yas-minor-mode - :hook - ((c-mode c++-mode) . yas-minor-mode) - :config - (yas-reload-all)) - -(use-package yasnippet-snippets - :ensure t) - -(use-package company-c-headers - :defer nil - :ensure t) - -(use-package company-irony - :defer nil - :ensure t - :config - (setq company-backends '((company-c-headers - company-dabbrev-code - company-irony)))) -(use-package irony - :defer nil - :ensure t - :config - :hook - ((c++-mode c-mode) . irony-mode) - ('irony-mode-hook) . 'irony-cdb-autosetup-compile-options) - -(use-package meghanada - :ensure t - :defer nil - :config - (add-hook 'java-mode-hook - (lambda () - (meghanada-mode t))) - (setq meghanada-java-path "java") - (setq meghanada-maven-path "mvn")) - -(use-package evil-surround - :ensure t - :config - (global-evil-surround-mode 1)) -- cgit v1.2.3