From 87d1769dcbdd5fe5e5ebde8f2bc6e490611947cb Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Tue, 1 Oct 2024 15:41:38 -0400 Subject: I'm going through changes --- .config/mpd/.gitignore | 4 ++++ .config/mpd/mpd.conf | 20 ++++++++++++++++++++ .config/mpd/mpd.pid | 1 + 3 files changed, 25 insertions(+) create mode 100644 .config/mpd/.gitignore create mode 100644 .config/mpd/mpd.conf create mode 100644 .config/mpd/mpd.pid (limited to '.config/mpd') diff --git a/.config/mpd/.gitignore b/.config/mpd/.gitignore new file mode 100644 index 0000000..af73ba5 --- /dev/null +++ b/.config/mpd/.gitignore @@ -0,0 +1,4 @@ +mpd.log +mpdstate +mpd.db +/playlists/ \ No newline at end of file diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf new file mode 100644 index 0000000..0d0d817 --- /dev/null +++ b/.config/mpd/mpd.conf @@ -0,0 +1,20 @@ +bind_to_address "127.0.0.1" +#bind_to_address "~/.mpd/socket" +music_directory "~/Music" +playlist_directory "~/.config/mpd/playlists" +db_file "~/.config/mpd/mpd.db" +log_file "~/.config/mpd/mpd.log" +pid_file "~/.config/mpd/mpd.pid" +state_file "~/.config/mpd/mpdstate" +audio_output { + type "pipewire" + name "pw audio" + mixer_type "hardware" +} + +audio_output { + type "fifo" + name "my_fifo" + path "/tmp/mpd.fifo" + format "44100:16:2" +} diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid new file mode 100644 index 0000000..30ed602 --- /dev/null +++ b/.config/mpd/mpd.pid @@ -0,0 +1 @@ +1378 -- cgit v1.2.3 From 632b0a5b5b8fe5456750eb030d54a52a285a6870 Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Thu, 3 Oct 2024 21:54:39 -0400 Subject: changes --- .bashrc | 1 + .config/hypr/hyprlock.conf | 13 +++++++------ .config/hypr/hyprpaper.conf | 4 ++-- .config/mpd/mpd.pid | 2 +- scripts/godot | 3 +++ scripts/startup | 1 + wallpapers/snowy.png | Bin 0 -> 6936996 bytes 7 files changed, 15 insertions(+), 9 deletions(-) create mode 100755 scripts/godot create mode 100644 wallpapers/snowy.png (limited to '.config/mpd') diff --git a/.bashrc b/.bashrc index c1ccf49..6371ac8 100644 --- a/.bashrc +++ b/.bashrc @@ -8,3 +8,4 @@ alias ls='ls --color=auto' alias grep='grep --color=auto' PS1='\[\033[1;1m\]\u\[\033[00m\]@\[\033[34m\]\h \[\033[32m\]\w \[\033[35m\]$(git-ps1)\[\033[00m\]\$ ' + diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index fb4be3c..e12fee9 100644 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -17,8 +17,8 @@ background { } input-field { monitor = - size = 50, 50 - outline_thickness = 3 + size = 200, 200 + outline_thickness = 15 dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8 dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0 dots_center = false @@ -27,13 +27,14 @@ input-field { inner_color = rgb(200, 200, 200) font_color = rgb(10, 10, 10) fade_on_empty = true - fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered. + fade_timeout = 50 # Milliseconds before fade_on_empty is triggered. hide_input = true rounding = -1 # -1 means complete rounding (circle/oval) - check_color = rgb(204, 136, 34) + check_color = rgb(100, 118, 48) fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color - fail_text = $FAIL ($ATTEMPTS) # can be set to empty - fail_transition = 300 # transition time in ms between normal outer_color and fail_color + placeholder_text = + fail_text = ($ATTEMPTS) # can be set to empty + fail_transition = 50 # transition time in ms between normal outer_color and fail_color capslock_color = -1 numlock_color = -1 bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above) diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index 961f0ca..ac582db 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,2 +1,2 @@ -preload = /home/jack/.dotfiles/wallpapers/ghibliForest.png -wallpaper = ,/home/jack/.dotfiles/wallpapers/ghibliForest.png +preload = /home/jack/.dotfiles/wallpapers/snowy.png +wallpaper = ,/home/jack/.dotfiles/wallpapers/snowy.png diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid index 30ed602..5ae289b 100644 --- a/.config/mpd/mpd.pid +++ b/.config/mpd/mpd.pid @@ -1 +1 @@ -1378 +1371 diff --git a/scripts/godot b/scripts/godot new file mode 100755 index 0000000..a2d74f9 --- /dev/null +++ b/scripts/godot @@ -0,0 +1,3 @@ +#!/bin/sh + +godot-mono --single-window \ No newline at end of file diff --git a/scripts/startup b/scripts/startup index 46e4c17..818acb4 100755 --- a/scripts/startup +++ b/scripts/startup @@ -7,4 +7,5 @@ mpd & dunst & waybar & hyprpaper & +hypridle & gpg-agent --daemon diff --git a/wallpapers/snowy.png b/wallpapers/snowy.png new file mode 100644 index 0000000..b1ef37f Binary files /dev/null and b/wallpapers/snowy.png differ -- cgit v1.2.3 From 84012003fe1b7a6ef5c20f132d851792e72de5fa Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Sat, 5 Oct 2024 00:18:08 -0400 Subject: fix screenshot and update wallpaper --- .config/hypr/binds.conf | 5 +---- .config/hypr/hyprpaper.conf | 4 ++-- .config/mpd/mpd.pid | 2 +- README.md | 21 --------------------- install.sh | 13 +------------ scripts/discord | 3 +++ wallpapers/active/snowy-tower.png | Bin 0 -> 6936996 bytes wallpapers/fogCreek.png | Bin 5787435 -> 0 bytes wallpapers/fogForest-transformed.png | Bin 8987674 -> 0 bytes wallpapers/fogForest-transformed2.png | Bin 8071771 -> 0 bytes wallpapers/fogForest.png | Bin 2758165 -> 0 bytes wallpapers/ghibliForest.png | Bin 15822184 -> 0 bytes wallpapers/inactive/fogForest.png | Bin 0 -> 2758165 bytes wallpapers/inactive/ghibliForest.png | Bin 0 -> 15822184 bytes wallpapers/inactive/signalis.png | Bin 0 -> 205675 bytes wallpapers/signalis.png | Bin 205675 -> 0 bytes wallpapers/snowy.png | Bin 6936996 -> 0 bytes 17 files changed, 8 insertions(+), 40 deletions(-) create mode 100644 scripts/discord create mode 100644 wallpapers/active/snowy-tower.png delete mode 100644 wallpapers/fogCreek.png delete mode 100644 wallpapers/fogForest-transformed.png delete mode 100644 wallpapers/fogForest-transformed2.png delete mode 100644 wallpapers/fogForest.png delete mode 100644 wallpapers/ghibliForest.png create mode 100644 wallpapers/inactive/fogForest.png create mode 100644 wallpapers/inactive/ghibliForest.png create mode 100644 wallpapers/inactive/signalis.png delete mode 100644 wallpapers/signalis.png delete mode 100644 wallpapers/snowy.png (limited to '.config/mpd') diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 186ee78..46e829d 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -12,7 +12,7 @@ bind = $mainMod, RETURN, exec, $menu bind = $mainMod, A, exec, $terminal bind = $mainMod, D, killactive, bind = $mainMod CTRL SHIFT, D, exec, hyprctl kill -bind = $mainMod CTRL, S, exec, grim -g "$(slurp)" ~/Pictures/Screenshots/$(date +'%s_grim.png') +bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" ~/Pictures/Screenshots/$(date +'%s_grim.png') bind = $mainMod, S, exec, grim -o eDP-1 ~/Pictures/Screenshots/$(date +'%s_grim.png') bind = $mainMod, M, exit, bind = $mainMod, V, togglefloating, @@ -53,9 +53,6 @@ binde = SHIFT, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDI binde = SHIFT, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 1%- binde = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle -# screenshot + crop keybind -bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" "${HOME}/Pictures/screenshots/screenshot-$(date +%F-%T).png" - # Example special workspace (scratchpad) COMMENTED OUT FOR SCREENSHOT KEYBIND # bind = $mainMod, S, togglespecialworkspace, magic # bind = $mainMod SHIFT, S, movetoworkspace, special:magic diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index ac582db..c759e59 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,2 +1,2 @@ -preload = /home/jack/.dotfiles/wallpapers/snowy.png -wallpaper = ,/home/jack/.dotfiles/wallpapers/snowy.png +preload = /home/jack/.dotfiles/wallpapers/active/snowy-tower.png +wallpaper = ,/home/jack/.dotfiles/wallpapers/active/snowy-tower.png diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid index 5ae289b..3f3c936 100644 --- a/.config/mpd/mpd.pid +++ b/.config/mpd/mpd.pid @@ -1 +1 @@ -1371 +1344 diff --git a/README.md b/README.md index 1fca88a..3c9c9c3 100644 --- a/README.md +++ b/README.md @@ -11,24 +11,3 @@ Dependencies: - Brightnessctl - Calcurse - Pipewire - -## TODO -- [x] Lock keybind -- [x] Screenshot keybind -- [x] Reconfigure waybar (better styling + date + battery charging + working buttons) -- [x] System monitor -- [x] Wallpaper -- [ ] Multiple monitors -- [ ] Redo weird purple theme (is it gtk? gdb? fml?) -- [ ] Settings app -- [ ] Monitor scaling for laptop -- [ ] Reconfigure hyprlock, wofi, kitty -- [ ] Laptop backlight + auto suspend + volume control buttons -- [ ] Cachy browser settings -- [ ] Add more initial settings and optional app install - -## FIXES -- [ ] Discord push to talk -- [ ] Hyprshot keybind broken -- [ ] Go through env vars -- [ ] Make waybar use pipewire widget diff --git a/install.sh b/install.sh index d72e8ec..9cc6b11 100755 --- a/install.sh +++ b/install.sh @@ -1,12 +1 @@ -# install dependencies (TODO) - - -# stow dotfiles -stow hypr --adopt -stow waybar --adopt -stow fish --adopt -stow kitty --adopt -stow wofi --adopt - -# do other stuff (TODO) -git config --global core.editor "micro" +# stow . ? (TODO) diff --git a/scripts/discord b/scripts/discord new file mode 100644 index 0000000..52af980 --- /dev/null +++ b/scripts/discord @@ -0,0 +1,3 @@ +#!/bin/sh + +discord-screenaudio \ No newline at end of file diff --git a/wallpapers/active/snowy-tower.png b/wallpapers/active/snowy-tower.png new file mode 100644 index 0000000..b1ef37f Binary files /dev/null and b/wallpapers/active/snowy-tower.png differ diff --git a/wallpapers/fogCreek.png b/wallpapers/fogCreek.png deleted file mode 100644 index 6381292..0000000 Binary files a/wallpapers/fogCreek.png and /dev/null differ diff --git a/wallpapers/fogForest-transformed.png b/wallpapers/fogForest-transformed.png deleted file mode 100644 index ed786fd..0000000 Binary files a/wallpapers/fogForest-transformed.png and /dev/null differ diff --git a/wallpapers/fogForest-transformed2.png b/wallpapers/fogForest-transformed2.png deleted file mode 100644 index 476add9..0000000 Binary files a/wallpapers/fogForest-transformed2.png and /dev/null differ diff --git a/wallpapers/fogForest.png b/wallpapers/fogForest.png deleted file mode 100644 index bd58509..0000000 Binary files a/wallpapers/fogForest.png and /dev/null differ diff --git a/wallpapers/ghibliForest.png b/wallpapers/ghibliForest.png deleted file mode 100644 index 1c1dce4..0000000 Binary files a/wallpapers/ghibliForest.png and /dev/null differ diff --git a/wallpapers/inactive/fogForest.png b/wallpapers/inactive/fogForest.png new file mode 100644 index 0000000..bd58509 Binary files /dev/null and b/wallpapers/inactive/fogForest.png differ diff --git a/wallpapers/inactive/ghibliForest.png b/wallpapers/inactive/ghibliForest.png new file mode 100644 index 0000000..1c1dce4 Binary files /dev/null and b/wallpapers/inactive/ghibliForest.png differ diff --git a/wallpapers/inactive/signalis.png b/wallpapers/inactive/signalis.png new file mode 100644 index 0000000..f51166f Binary files /dev/null and b/wallpapers/inactive/signalis.png differ diff --git a/wallpapers/signalis.png b/wallpapers/signalis.png deleted file mode 100644 index f51166f..0000000 Binary files a/wallpapers/signalis.png and /dev/null differ diff --git a/wallpapers/snowy.png b/wallpapers/snowy.png deleted file mode 100644 index b1ef37f..0000000 Binary files a/wallpapers/snowy.png and /dev/null differ -- cgit v1.2.3 From ae201197d96cc3989773da7dfd66b3e7291fe16f Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Sat, 12 Oct 2024 21:39:45 -0400 Subject: shortcuts and other changes --- .bash_profile | 3 ++- .config/mpd/mpd.pid | 2 +- .stow-local-ignore | 1 + scripts/discord | 3 --- scripts/godot | 3 --- shortcuts/bottles | 1 + shortcuts/discord | 3 +++ shortcuts/godot | 3 +++ 8 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 scripts/discord delete mode 100755 scripts/godot create mode 100755 shortcuts/bottles create mode 100644 shortcuts/discord create mode 100755 shortcuts/godot (limited to '.config/mpd') diff --git a/.bash_profile b/.bash_profile index 81ae1ca..d737e42 100644 --- a/.bash_profile +++ b/.bash_profile @@ -5,7 +5,8 @@ [[ -f ~/.bashrc ]] && . ~/.bashrc export PATH="$PATH:$HOME/.dotfiles/scripts" -export PATH="$PATH:/home/jack/.dotnet/tools" +export PATH="$PATH:$HOME/.dotnet/tools" +export PATH="$PATH:$HOME/.dotfiles/shortcuts" if [[ -t 0 && $(tty) == /dev/tty1 && ! $DISPLAY ]]; then exec dbus-launch --exit-with-session Hyprland diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid index 3f3c936..1b1818c 100644 --- a/.config/mpd/mpd.pid +++ b/.config/mpd/mpd.pid @@ -1 +1 @@ -1344 +1353 diff --git a/.stow-local-ignore b/.stow-local-ignore index 0ae4a8e..805a30f 100644 --- a/.stow-local-ignore +++ b/.stow-local-ignore @@ -1,5 +1,6 @@ /files /scripts +/shortcuts .*~undo-tree~ /.git .gitignore diff --git a/scripts/discord b/scripts/discord deleted file mode 100644 index 52af980..0000000 --- a/scripts/discord +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -discord-screenaudio \ No newline at end of file diff --git a/scripts/godot b/scripts/godot deleted file mode 100755 index a2d74f9..0000000 --- a/scripts/godot +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -godot-mono --single-window \ No newline at end of file diff --git a/shortcuts/bottles b/shortcuts/bottles new file mode 100755 index 0000000..bd26412 --- /dev/null +++ b/shortcuts/bottles @@ -0,0 +1 @@ +flatpak run com.usebottles.bottles \ No newline at end of file diff --git a/shortcuts/discord b/shortcuts/discord new file mode 100644 index 0000000..52af980 --- /dev/null +++ b/shortcuts/discord @@ -0,0 +1,3 @@ +#!/bin/sh + +discord-screenaudio \ No newline at end of file diff --git a/shortcuts/godot b/shortcuts/godot new file mode 100755 index 0000000..a2d74f9 --- /dev/null +++ b/shortcuts/godot @@ -0,0 +1,3 @@ +#!/bin/sh + +godot-mono --single-window \ No newline at end of file -- cgit v1.2.3 From eec9332265496456b705035af32c24e2a90f48bb Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Sat, 19 Oct 2024 11:34:16 -0400 Subject: changes --- .config/emacs/Emacs.org | 13 +++++++++++-- .config/emacs/init.el | 12 ++++++++++-- .config/mpd/mpd.pid | 2 +- shortcuts/discord | 0 4 files changed, 22 insertions(+), 5 deletions(-) mode change 100644 => 100755 shortcuts/discord (limited to '.config/mpd') diff --git a/.config/emacs/Emacs.org b/.config/emacs/Emacs.org index 71a342c..8ecb98e 100644 --- a/.config/emacs/Emacs.org +++ b/.config/emacs/Emacs.org @@ -356,6 +356,15 @@ best git frontend ever (global-set-key (kbd "M-p") #'move-text-up) (global-set-key (kbd "M-n") #'move-text-down) + (defun next-word (p) + "Move point to the beginning of the next word, past any spaces" + (interactive "d") + (forward-word) + (forward-word) + (backward-word)) + (global-set-key "\M-f" 'next-word) + + #+end_src * Development @@ -496,8 +505,8 @@ best git frontend ever :config (setq dired-dwim-target t) (evil-collection-define-key 'normal 'dired-mode-map - "h" 'dired-single-up-directory - "l" 'dired-single-buffer)) + "h" 'dired-single-up-directory + "l" 'dired-single-buffer)) (use-package dired-single :commands (dired dired-jump)) diff --git a/.config/emacs/init.el b/.config/emacs/init.el index e10998b..09dace5 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -322,6 +322,14 @@ (global-set-key (kbd "M-p") #'move-text-up) (global-set-key (kbd "M-n") #'move-text-down) +(defun next-word (p) + "Move point to the beginning of the next word, past any spaces" + (interactive "d") + (forward-word) + (forward-word) + (backward-word)) +(global-set-key "\M-f" 'next-word) + (use-package lsp-mode :init (setq lsp-keymap-prefix "C-c l" @@ -448,8 +456,8 @@ :config (setq dired-dwim-target t) (evil-collection-define-key 'normal 'dired-mode-map - "h" 'dired-single-up-directory - "l" 'dired-single-buffer)) + "h" 'dired-single-up-directory + "l" 'dired-single-buffer)) (use-package dired-single :commands (dired dired-jump)) diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid index 1b1818c..c4425ac 100644 --- a/.config/mpd/mpd.pid +++ b/.config/mpd/mpd.pid @@ -1 +1 @@ -1353 +1395 diff --git a/shortcuts/discord b/shortcuts/discord old mode 100644 new mode 100755 -- cgit v1.2.3 From ddd43ed96249932652c7427dbdbbac92e5ef49ed Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Fri, 8 Nov 2024 13:10:20 -0500 Subject: keybind and fastfetch --- .bashrc | 2 +- .config/alacritty/alacritty.yml | 4 +- .config/emacs/Emacs.org | 3 +- .config/emacs/init.el | 218 ++++++++++++++++++++-------------------- .config/fastfetch/config.jsonc | 33 ++++++ .config/hypr/binds.conf | 24 ++--- .config/mpd/mpd.pid | 2 +- .gitignore | 1 + 8 files changed, 162 insertions(+), 125 deletions(-) create mode 100644 .config/fastfetch/config.jsonc (limited to '.config/mpd') diff --git a/.bashrc b/.bashrc index 6371ac8..16dc9c9 100644 --- a/.bashrc +++ b/.bashrc @@ -4,7 +4,7 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return - +fastfetch alias ls='ls --color=auto' alias grep='grep --color=auto' PS1='\[\033[1;1m\]\u\[\033[00m\]@\[\033[34m\]\h \[\033[32m\]\w \[\033[35m\]$(git-ps1)\[\033[00m\]\$ ' diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 79c905e..ce5abcd 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -47,8 +47,8 @@ window: # Blank space added around the window in pixels. This padding is scaled # by DPI and the specified value is always added at both opposing sides. padding: - x: 0 - y: 0 + x: 5 + y: 5 # Spread additional padding evenly around the terminal content. dynamic_padding: false diff --git a/.config/emacs/Emacs.org b/.config/emacs/Emacs.org index 8ecb98e..5865bcc 100644 --- a/.config/emacs/Emacs.org +++ b/.config/emacs/Emacs.org @@ -480,7 +480,8 @@ best git frontend ever (define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) (define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point)) - +(use-package tagedit) + #+end_src ** multiple cursors diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 09dace5..5f1978e 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -331,114 +331,116 @@ (global-set-key "\M-f" 'next-word) (use-package lsp-mode - :init - (setq lsp-keymap-prefix "C-c l" - lsp-headerline-breadcrumb-enable nil - lsp-headerline-breadcrumb-icons-enable nil - lsp-keep-workspace-alive nil - lsp-enable-snippet nil - lsp-lens-enable nil) - :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode) - (c-mode . lsp) - (c++-mode . lsp) - (python-mode . lsp-deferred) - (csharp-mode . lsp) - ;; if you want which-key integration - (lsp-mode . lsp-enable-which-key-integration)) - :commands lsp) - - -(use-package consult-lsp - :after lsp) - -(defun my-c-mode-common-hook () - ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode - (c-set-offset 'substatement-open 0) - ;; other customizations can go here - - (setq c++-tab-always-indent t) - (setq c-basic-offset 4) ;; Default is 2 - (setq c-indent-level 4) ;; Default is 2 - - (setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60)) - (setq tab-width 4) - (setq indent-tabs-mode t) ; use spaces only if nil - ) - -(add-hook 'c-mode-common-hook 'my-c-mode-common-hook) - -(use-package lsp-ui - :after lsp - :diminish lsp-lens-mode - :config - (setq lsp-ui-sideline-update-mode 'point) - (setq lsp-ui-sideline-show-diagnostics t) - (setq lsp-ui-sideline-ignore-duplicate t)) - -(use-package hydra) - -(use-package lsp-treemacs - :ensure t - :commands lsp-treemacs-errors-list) - -(use-package expand-region) -(global-set-key (kbd "C-=") 'er/expand-region) - -;; company -(use-package company - :ensure t - :diminish - :config - (setq company-show-numbers t - company-minimum-prefix-length 1 - company-idle-delay 0.2 - company-backends - '((company-files - company-keywords - company-capf - company-yasnippet) - (company-abbrev company-dabbrev))) - (global-company-mode +1)) - -(use-package clang-format) -(use-package clang-format+) - - -(use-package company-box - :ensure t - :diminish - :after company - :hook (company-mode . company-box-mode)) - -;; flycheck -(use-package flycheck - :diminish flycheck-mode - :config - (setq flycheck-error-message-buffer " *Flycheck error messages*") - (setq-default flycheck-emacs-lisp-load-path 'inherit) - (global-flycheck-mode 1)) - -(use-package flycheck-pos-tip - :ensure t - :after flycheck - :config - (flycheck-pos-tip-mode)) - -(use-package ccls - :ensure t - :config - :hook ((c-mode c++-mode objc-mode cuda-mode) . - (lambda () (require 'ccls) (lsp))) - (setq ccls-executable "/usr/local/bin/ccls") - (setq ccls-initialization-options - '(:index (:comments 2) :completion (:detailedLabel t)))) - -(use-package srefactor - :ensure t - :config - (semantic-mode 1) - (define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) - (define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point)) + :init + (setq lsp-keymap-prefix "C-c l" + lsp-headerline-breadcrumb-enable nil + lsp-headerline-breadcrumb-icons-enable nil + lsp-keep-workspace-alive nil + lsp-enable-snippet nil + lsp-lens-enable nil) + :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode) + (c-mode . lsp) + (c++-mode . lsp) + (python-mode . lsp-deferred) + (csharp-mode . lsp) + ;; if you want which-key integration + (lsp-mode . lsp-enable-which-key-integration)) + :commands lsp) + + + (use-package consult-lsp + :after lsp) + + (defun my-c-mode-common-hook () + ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode + (c-set-offset 'substatement-open 0) + ;; other customizations can go here + + (setq c++-tab-always-indent t) + (setq c-basic-offset 4) ;; Default is 2 + (setq c-indent-level 4) ;; Default is 2 + + (setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60)) + (setq tab-width 4) + (setq indent-tabs-mode t) ; use spaces only if nil + ) + + (add-hook 'c-mode-common-hook 'my-c-mode-common-hook) + + (use-package lsp-ui + :after lsp + :diminish lsp-lens-mode + :config + (setq lsp-ui-sideline-update-mode 'point) + (setq lsp-ui-sideline-show-diagnostics t) + (setq lsp-ui-sideline-ignore-duplicate t)) + + (use-package hydra) + + (use-package lsp-treemacs + :ensure t + :commands lsp-treemacs-errors-list) + + (use-package expand-region) + (global-set-key (kbd "C-=") 'er/expand-region) + + ;; company + (use-package company + :ensure t + :diminish + :config + (setq company-show-numbers t + company-minimum-prefix-length 1 + company-idle-delay 0.2 + company-backends + '((company-files + company-keywords + company-capf + company-yasnippet) + (company-abbrev company-dabbrev))) + (global-company-mode +1)) + + (use-package clang-format) + (use-package clang-format+) + + + (use-package company-box + :ensure t + :diminish + :after company + :hook (company-mode . company-box-mode)) + + ;; flycheck + (use-package flycheck + :diminish flycheck-mode + :config + (setq flycheck-error-message-buffer " *Flycheck error messages*") + (setq-default flycheck-emacs-lisp-load-path 'inherit) + (global-flycheck-mode 1)) + + (use-package flycheck-pos-tip + :ensure t + :after flycheck + :config + (flycheck-pos-tip-mode)) + + (use-package ccls + :ensure t + :config + :hook ((c-mode c++-mode objc-mode cuda-mode) . + (lambda () (require 'ccls) (lsp))) + (setq ccls-executable "/usr/local/bin/ccls") + (setq ccls-initialization-options + '(:index (:comments 2) :completion (:detailedLabel t)))) + + (use-package srefactor + :ensure t + :config + (semantic-mode 1) + (define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) + (define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point)) + +(use-package tagedit) (use-package multiple-cursors :bind (:map global-map diff --git a/.config/fastfetch/config.jsonc b/.config/fastfetch/config.jsonc new file mode 100644 index 0000000..52344a9 --- /dev/null +++ b/.config/fastfetch/config.jsonc @@ -0,0 +1,33 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "modules": [ + "title", + "separator", + "os", + "host", + "kernel", + "uptime", + "packages", + "shell", + "display", + "de", + "wm", + "wmtheme", + "theme", + "icons", + "font", + "cursor", + "terminal", + "terminalfont", + "cpu", + "gpu", + "memory", + "swap", + "disk", + "battery", + "poweradapter", + "locale", + "break", + "colors" + ] +} diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 62d15a3..54c04b5 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -33,19 +33,19 @@ bind = $mainMod, SPACE, layoutmsg, swapwithmaster bind = $mainMod, E, exec, emacsclient -c # Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, n, cyclenext, prev -bind = $mainMod, p, cyclenext -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d +binde = $mainMod, left, movefocus, l +binde = $mainMod, right, movefocus, r +binde = $mainMod, n, cyclenext, prev +binde = $mainMod, p, cyclenext +binde = $mainMod, up, movefocus, u +binde = $mainMod, down, movefocus, d -bind = $mainMod SHIFT,left ,movewindow, l -bind = $mainMod SHIFT,right ,movewindow, r -bind = $mainMod SHIFT, n, swapnext, prev -bind = $mainMod SHIFT, p, swapnext -bind = $mainMod SHIFT,up ,movewindow, u -bind = $mainMod SHIFT,down ,movewindow, d +binde = $mainMod SHIFT,left ,movewindow, l +binde = $mainMod SHIFT,right ,movewindow, r +binde = $mainMod SHIFT, n, swapnext, prev +binde = $mainMod SHIFT, p, swapnext +binde = $mainMod SHIFT,up ,movewindow, u +binde = $mainMod SHIFT,down ,movewindow, d # controls binde = , xf86monbrightnessup , exec, brightnessctl set 10%+ diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid index c4425ac..ea29ccd 100644 --- a/.config/mpd/mpd.pid +++ b/.config/mpd/mpd.pid @@ -1 +1 @@ -1395 +1362 diff --git a/.gitignore b/.gitignore index 92d748d..42623f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /.config/emacs/recentf /.config/emacs/undotreefiles/ /.config/emacs/elpa/ +.config/emacs/init.el -- cgit v1.2.3