diff --git a/README.md b/README.md index 9dddfac..24a54f3 100644 --- a/README.md +++ b/README.md @@ -32,20 +32,25 @@ This is made for my Thinkpad L490 with Void Linux + MangoWM ![Emacs](20260928_12h48m46s_grim.png) ### Installation -#### WARNING THIS WILL REPLACE ALL EXISTING DOTFILES WITH THE ONES IN THIS REPO - +#### WARNING THIS MIGHT REPLACE ALL EXISTING DOTFILES WITH THE ONES IN THIS REPO Firstly clone this repo and enter it: ```bash git clone https://codeberg.org/MysteryBirb/Zoe-Dotfiles.git; cd Zoe-Dotfiles ``` -Then use stow to symlink all the dotfiles to their destination: +The use my small script based off `stow` to update or link all dotfiles: For all: ```bash -stow * +./zstow ``` -or for one specific config (e.g. neovim): + +Updating: +```bash +./zstow update +``` + +For specific dotfiles you can just use stow (e.g. neovim): ```bash stow nvim ``` diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 2191c3f..0842838 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -1,4 +1,4 @@ -;; -*- lexical-binding: nil -*- +;; -*- lexical-binding: nil; -*- ;; Keybind reminder for self: ;; C-x C-f : enter a file / find one @@ -15,6 +15,7 @@ ;; M-x cd : change dir duh ;; M-y : to paste into vterm or generally ;; M-x package-list-packages RET Ux : updates packages +;; M-x eglot-inlay-hints-mode : cool info for code ;; M-ESC : Escapes corfu prompt ;; C-g : Escapes emacs command line @@ -64,7 +65,6 @@ ;; Vterm (use-package vterm :config - (setq vterm-shell 'bash) (add-hook 'vterm-mode-hook (lambda () (setq evil-default-state 'emacs))) :ensure t) @@ -72,7 +72,11 @@ (use-package qml-mode :ensure t) ;; LSP / Eglot + +(setq eglot-ignored-server-capabilities '(:documentOnTypeFormattingProvider :documentFormattingProvider :documentRangeFormattingProvider)) + ;; (add-hook 'nix-mode-hook #'eglot-ensure) ;;(for nix) +(add-hook 'eglot-managed-mode-hook (lambda () (eglot-inlay-hints-mode -1))) (add-hook 'c-mode-hook 'eglot-ensure) (add-hook 'c++-mode-hook 'eglot-ensure) (add-hook 'qml-mode-hook 'eglot-ensure) @@ -143,21 +147,21 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(base16-theme-highlight-mode-line 'box) + '(eglot-ignored-server-capabilities + '(:documentFormattingProvider :documentRangeFormattingProvider)) '(package-selected-packages '(evil))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - - ;; Removing ass boxes and making theme be "smooth" '(default ((t (:box nil :background "#1e0a28" :foreground "#ffffff")))) - '(font-lock-comment-face ((t (:foreground "#656565")))) - '(font-lock-comment-delimiter-face ((t (:foreground "#656565")))) '(ansi-color-fast-blick ((t (:box nil)))) '(ansi-color-slow-blick ((t (:box nil)))) '(corfu-border ((t (:background nil)))) '(cursor ((t (:inherit t :background "#506050" :foreground "#000000")))) + '(font-lock-comment-delimiter-face ((t (:foreground "#656565")))) + '(font-lock-comment-face ((t (:foreground "#656565")))) '(fringe ((t nil))) '(help-key-binding ((t (:box nil)))) '(line-number ((t (:foreground "#504050" :background "#1e0a28")))) diff --git a/foot/.config/foot/foot.ini b/foot/.config/foot/foot.ini index 41492aa..1cdcbd2 100644 --- a/foot/.config/foot/foot.ini +++ b/foot/.config/foot/foot.ini @@ -10,6 +10,7 @@ # locked-title=no font=NotoSansM Nerd Font:size=12 +# font=Iosevka:size=12 # font-bold= # font-italic= # font-bold-italic= diff --git a/walls/.config/walls/20260508_10h09m43s_grim.png b/walls/.config/walls/20260508_10h09m43s_grim.png deleted file mode 100644 index 7ac81a8..0000000 Binary files a/walls/.config/walls/20260508_10h09m43s_grim.png and /dev/null differ diff --git a/zgit b/zgit new file mode 100755 index 0000000..56262f4 --- /dev/null +++ b/zgit @@ -0,0 +1,34 @@ +#!/bin/bash +# This is just to update my git repo a tiny bit faster + +usage() { echo "Usage: $0 [-a \"\"] [-s ]" 1>&2; exit 1; } + +while getopts "a:s:" o; do + case "${o}" in + a) + a=${OPTARG} + git add . + git commit -m "$a" + git push + exit 0 + ;; + s) + s=${OPTARG} + if [ -f $s ]; then + git add $s + read -p "Commit message: " commitMsg + tmp="${commitMsg%\"}" + tmp="${tmp#\"}" + git commit -m "$tmp" + git push + else + echo "$s is not a regular file!" + exit 1 + fi + ;; + *) + usage + ;; + esac +done +#shift $((OPTIND-1)) diff --git a/zstow b/zstow new file mode 100755 index 0000000..2cdfd0d --- /dev/null +++ b/zstow @@ -0,0 +1,7 @@ +#!/bin/bash +# Had to make this because i couldn't figure out how ".stow-local-igmore" works smh +if [ "${1,,}" == "update" ]; then + stow -v -R */ +else + stow -v */ +fi