From e57370dbf542b165e430cc8c708677625a9f8ed4 Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Mon, 9 Sep 2024 00:07:54 -0400 Subject: laptop config --- .bashrc | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .bashrc (limited to '.bashrc') diff --git a/.bashrc b/.bashrc new file mode 100644 index 0000000..c1ccf49 --- /dev/null +++ b/.bashrc @@ -0,0 +1,10 @@ +# +# ~/.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +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\]\$ ' -- 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 '.bashrc') 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 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 '.bashrc') 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