Skip to content

Commit

Permalink
Upd
Browse files Browse the repository at this point in the history
  • Loading branch information
Ddystopia committed May 6, 2023
1 parent bd49f0a commit af06080
Show file tree
Hide file tree
Showing 14 changed files with 46 additions and 35 deletions.
4 changes: 4 additions & 0 deletions Config/fish/config.fish
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,8 @@ if status is-interactive

end

if test -f ~/.profile
bash -c 'source ~/.profile'
end

# thefuck --alias | source
4 changes: 2 additions & 2 deletions Config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dracula.nvim": { "branch": "main", "commit": "26d04c8ced02f02207e7aec1d5730c3a9ebadeeb" },
"fzy-lua-native": { "branch": "master", "commit": "45148b3f70d244e8b8b5db60df447a2b7ac2de9d" },
"hop": { "branch": "master", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" },
"lazy.nvim": { "branch": "main", "commit": "ceb413678dfcf3d5455208959185e3db1f7892c7" },
"lazy.nvim": { "branch": "main", "commit": "83a625f5c884a3ceee821ce54a812c8321ecba31" },
"lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
"neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" },
"neoformat": { "branch": "master", "commit": "fe6ef62dda0118a98bebb7a6c576e9b23b8a701b" },
Expand All @@ -20,7 +20,7 @@
"nvim-lspconfig": { "branch": "master", "commit": "255e07ce2a05627d482d2de77308bba51b90470c" },
"nvim-lsputils": { "branch": "master", "commit": "ae1a4a62449863ad82c70713d5b6108f3a07917c" },
"nvim-surround": { "branch": "main", "commit": "e6047128e57c1aff1566fb9f627521d2887fc77a" },
"nvim-treesitter": { "branch": "master", "commit": "cc360a9beb1b30d172438f640e2c3450358c4086" },
"nvim-treesitter": { "branch": "master", "commit": "12453e0e3d2e82a4ae813f1540315c7cf2df2363" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "5632f926833493bf44de3d0c214169a062b068df" },
"nvim-treesitter-textsubjects": { "branch": "master", "commit": "b913508f503527ff540f7fe2dcf1bf1d1f259887" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" },
Expand Down
1 change: 1 addition & 0 deletions Config/nvim/lua/plugins.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ local M = {
'romgrk/fzy-lua-native', 'kyazdani42/nvim-web-devicons',
-- 'liuchengxu/vim-clap'
},
build = function () vim.cmd [[ UpdateRemotePlugins ]] end,
config = function()
local wilder = require('wilder')
wilder.setup({ modes = { ':', '/', '?' } })
Expand Down
11 changes: 8 additions & 3 deletions Config/nvim/lua/plugins/treesitter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ local M = {
}

M.dependencies = {
{ 'nvim-treesitter/nvim-treesitter-textobjects', lazy = false }, --
{ 'RRethy/nvim-treesitter-textsubjects', lazy = false }, --
{ 'nvim-treesitter/nvim-treesitter-textobjects', lazy = false }, --
{ 'RRethy/nvim-treesitter-textsubjects', lazy = false }, --
{
'p00f/nvim-ts-rainbow',
lazy = false,
Expand Down Expand Up @@ -60,7 +60,12 @@ M.config = function()
local treesitter = require('nvim-treesitter.configs')

treesitter.setup {
ensure_installed = { 'javascript', 'lua', 'rust' },
ensure_installed = {
'rust', 'c', 'cpp', 'javascript', 'lua', 'python', 'bash',
'fish', 'html', 'css', 'dockerfile', 'diff', 'fish', 'go',
'json', 'make', 'markdown', 'python', 'regex', 'scheme',
'sxhkdrc', 'typescript', 'yaml', 'zig'
},
highlight = { enable = true, additional_vim_regex_highlighting = false },

incremental_selection = {
Expand Down
2 changes: 1 addition & 1 deletion Config/sxhkd/sxhkdrc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ XF86TouchpadToggle

# brightness control
XF86MonBrightness{Up,Down}
xbacklight {+,-}5
sudo xbacklight {+,-}5

# volume control
XF86Audio{Raise,Lower}Volume
Expand Down
6 changes: 3 additions & 3 deletions Home/.gitconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[user]
email = [email protected]
name = Ddystopia
signingkey = 109875EC11535212
signkey = github.pub
[core]
editor = nvim
[init]
Expand All @@ -10,5 +10,5 @@
helper = store
[alias]
root = rev-parse --show-toplevel
[commit]
gpgsign = true
[gpg]
format = ssh
4 changes: 0 additions & 4 deletions Home/.profile
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if [[ -z "${DISPLAY}" ]] && [[ "${XDG_VTNR}" -le 3 ]] && command -v startx; then
exec startx ~/.xinitrc dwm
fi

# custom
[[ -z ${XDG_CONFIG_HOME} ]] && export XDG_CONFIG_HOME="$HOME/.config"
[[ -z ${XDG_CACHE_HOME} ]] && export XDG_CACHE_HOME="$HOME/.cache"
Expand Down
19 changes: 11 additions & 8 deletions Home/.xinitrc
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@ sysmodmap=/etc/X11/xinit/.Xmodmap

SESSION=${1:-dwm}

case $session in
i3|i3wm ) exec i3;;
kde ) exec startplasma-x11;;
xfce|xfce4 ) exec startxfce4;;
bspwm ) sxhkd &; exec bspwm;;
dwm ) exec dwm;;
source ~/.profile
exec dwm

#case $session in
#i3|i3wm ) exec i3;;
#kde ) exec startplasma-x11;;
#xfce|xfce4 ) exec startxfce4;;
#bspwm ) sxhkd & exec bspwm;;
#dwm ) exec dwm;;
# No known session, try to run it as command
* ) exec $1;;
esac
#* ) exec $1;;
#esac

# merge in defaults and keymaps

Expand Down
Binary file modified Home/KeePassFiles/MainDatabase.kdbx
Binary file not shown.
Binary file added Home/KeePassFiles/MainDatabase.old.kdbx
Binary file not shown.
4 changes: 4 additions & 0 deletions Root/etc/X11/xorg.conf.d/20-modesettings.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Section "Device"
Identifier "Intel Graphics"
Driver "Modesetting"
EndSection
2 changes: 1 addition & 1 deletion Root/etc/default/grub
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
GRUB_DEFAULT=0
GRUB_TIMEOUT=0
GRUB_DISTRIBUTOR="Arch"
GRUB_CMDLINE_LINUX_DEFAULT="quiet loglevel=0 ec_sys.write_support=1 nowatchdog resume=/dev/disk/by-uuid/537a57f2-9167-4cd3-9c84-6fd8dc55cb1e acpi_os_name=Linux acpi_osi="
GRUB_CMDLINE_LINUX_DEFAULT="quiet loglevel=0 ec_sys.write_support=1 nowatchdog resume=/dev/disk/by-uuid/08b1bc52-83e9-45dd-ae85-f1d5a42419c0 acpi_os_name=Linux acpi_osi="
GRUB_CMDLINE_LINUX=""
GRUB_RECORDFAIL_TIMEOUT=0

Expand Down
23 changes: 10 additions & 13 deletions important.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,21 @@ sudo pacman -S --needed git base-devel linux-headers &&
cd paru &&
makepkg -si

# pandoc xfce4-power-manager

dependencies=(
"noto-fonts" "noto-fonts-emoji" "exa" "acpilight" "fd" "ripgrep" "neovim"
"copyq" "python-pip" "flameshot" "zsh" "playerctl" "pacman-contrib"
"ffmpeg" "btop" "ccls" "clang" "cmake" "fzf" "zsh-autosuggestions"
"qutebrowser" "mpv" "linux-headers" "bspwm" "sxhkd" "rofi" "inetutils"
"rofi-calc" "rofi-pass" "xclip" "xdo" "cron" "feh" "filelight" "zathura"
"thefuck" "neofetch" "cowsay" "pulsemixer" "highlight" "inotify-tools"
"typescript" "racket" "foliate" "discord" "nodejs" "npm" "zathura-pdf-mupdf"
"python" "python3" "vscode" "lua" "luarocks" "tree-sitter" "luajit" "keepassxc"
"typescript" "racket" "foliate" "nodejs" "npm" "zathura-pdf-mupdf"
"python" "python3" "lua" "luarocks" "tree-sitter" "luajit" "keepassxc"
"tor" "thunar" "git" "alacritty" "ranger" "gvfs" "gvfs-mtp" "unrar" "rsync"
"bash-language-server" "pipewire" "pipewire-audio-client-libraries" "pipewire-media-session"
"flameshot" "inkscape" "sassc" "bluez-utils" "yt-dlp" "mariadb"
"pdfjs" "pavucontrol" "android-tools" "usbtools" "lua-language-server" "picom"
"openssh" "redshift" "inkscape" "pdfplots" "gdb" "gtk3" "gtk4" "gtk2" "openssl"
"wine" "libreoffice-fresh" "texlife-most" "hunspell" "hunspell-en_US"
"i2pd" "yggdrasil" "yaml-language-server" "exfat-utils" "virtualbox"
"bash-language-server" "pipewire" "pipewire-media-session"
"flameshot" "bluez-utils" "yt-dlp" #"pipewire-audio-client-libraries"
"pdfjs" "pavucontrol" "lua-language-server" "picom"
"openssh" "redshift" "gdb" "gtk3" "gtk4" "gtk2" "openssl"
"libreoffice-fresh" "hunspell" "hunspell-en_US" "i2pd" "yggdrasil" "yaml-language-server" "exfat-utils"
"ascii" "ueberzug" # attention
)

Expand All @@ -62,9 +59,9 @@ sudo pacman -Suyy --needed ${dependencies[@]}
sudo npm -g i typescript-language-server yarn vscode-langservers-extracted emmet-ls
sudo pip install black python-language-server pykeepass pynacl
paru -S splatmoji ttf-dejavu-sans-mono-powerline-git xkb-switch \
unipicker nerd-fonts-mononoki \
unipicker nerd-fonts \
ttf-meslo-nerd-font-powerlevel10k tex-gyre-math-fonts \
ttf-cm-unicode android-completion xwinwrap
luarocks install --server=https://luarocks.org/dev luaformatter
ttf-cm-unicode xwinwrap
sudo luarocks install --server=https://luarocks.org/dev luaformatter

# android-completion and android-bash-completion
1 change: 1 addition & 0 deletions paru
Submodule paru added at 9f00c1

0 comments on commit af06080

Please sign in to comment.