dotfiles

my active dotfiles
git clone git://git.jakekoroman.com/dotfiles
Log | Files | Refs | README

commit 2411e9db0a68cd44393354075f3d7a9a0d19d737
parent c34f2e2f1bb51622744f77c05c4b60fc9fd32d80
Author: Jake Koroman <jake@jakekoroman.com>
Date:   Fri, 13 Jun 2025 21:20:58 -0400

changing stuff

Diffstat:
Mdeploy.sh | 68++++++++++++++++++++++++++++++++++----------------------------------
Memacs/init.el | 55++++++++++++++++++++++++-------------------------------
Mi3/config | 23++++++++++++++++++++++-
Mi3status/config | 2++
Mscripts/murder | 2+-
5 files changed, 83 insertions(+), 67 deletions(-)

diff --git a/deploy.sh b/deploy.sh @@ -1,44 +1,44 @@ #!/bin/sh -# stolen from: https://github.com/rexim/dotfiles/blob/master/deploy.sh +# forked from: https://github.com/rexim/dotfiles/blob/master/deploy.sh SCRIPT_DIR="$( cd "$( dirname "$BASH_SOURCE[0]" )" && pwd )" -symlinkFile() { - filename="$SCRIPT_DIR/$1" - destination="$HOME/$2/$1" - - mkdir -p $(dirname "$destination") - - if [ ! -L "$destination" ]; then - if [ -e "$destination" ]; then - echo "[ERROR] $destination exists but it's not a symlink. Please fix that manually" && exit 1 - else - ln -s "$filename" "$destination" - echo "[OK] $filename -> $destination" - fi - else - echo "[WARNING] $filename already symlinked" - fi +symlink_file() { + filename="$SCRIPT_DIR/$1" + destination="$HOME/$2/$1" + + mkdir -p $(dirname "$destination") + + if [ ! -L "$destination" ]; then + if [ -e "$destination" ]; then + echo "[ERROR] $destination exists but it's not a symlink. Please fix that manually" && exit 1 + else + ln -s "$filename" "$destination" + echo "[OK] $filename -> $destination" + fi + else + echo "[WARNING] $filename already symlinked" + fi } -deployManifest() { - for row in $(cat $SCRIPT_DIR/$1); do - filename=$(echo $row | cut -d \| -f 1) - operation=$(echo $row | cut -d \| -f 2) - destination=$(echo $row | cut -d \| -f 3) - - case $operation in - symlink) - symlinkFile $filename $destination - ;; - - *) - echo "[WARNING] Unknown operation $operation. Skipping..." - ;; - esac - done +deploy_manifest() { + for row in $(cat $SCRIPT_DIR/$1); do + filename=$(echo $row | cut -d \| -f 1) + operation=$(echo $row | cut -d \| -f 2) + destination=$(echo $row | cut -d \| -f 3) + + case $operation in + symlink) + symlink_file $filename $destination + ;; + + *) + echo "[WARNING] Unknown operation $operation. Skipping..." + ;; + esac + done } echo "--- Configs ---" -deployManifest MANIFEST +deploy_manifest MANIFEST diff --git a/emacs/init.el b/emacs/init.el @@ -18,6 +18,7 @@ (setq jrk/font-big-size 24) (setq jrk/font (concat jrk/font-name (number-to-string jrk/font-size))) (modify-all-frames-parameters `((font . ,jrk/font))) +(load-theme 'gruber-darker t) (set-default 'truncate-lines nil) @@ -66,7 +67,7 @@ (require 'package) (add-to-list 'package-archives - '("melpa-stable" . "https://stable.melpa.org/packages/") t) + '("melpa" . "https://melpa.org/packages/") t) (use-package compile :ensure t @@ -78,16 +79,11 @@ (use-package modus-themes :ensure t :config - (setq modus-themes-org-blocks 'gray-background) - (load-theme 'modus-operandi t)) + (setq modus-themes-org-blocks 'gray-background)) (use-package ef-themes :ensure t) -;;; TODO: make guix package -;; (use-package gruber-darker-theme -;; :ensure t) - (use-package minions :ensure t @@ -132,26 +128,13 @@ :ensure t :init (vertico-mode 1) - (setq vertico-cycle t) - :config - (setq vertico-multiform-categories - '((consult-grep - buffer - (vertico-buffer-display-action . (display-buffer-same-window)))))) + (setq vertico-cycle t)) (use-package orderless :ensure t - :init - ;; Configure a custom style dispatcher (see the Consult wiki) - ;; (setq orderless-style-dispatchers '(+orderless-consult-dispatch orderless-affix-dispatch) - ;; orderless-component-separator #'orderless-escapable-split-on-space) - (setq completion-styles '(orderless basic) - completion-category-defaults nil - completion-category-overrides '((file (styles partial-completion)))) - :config - (vertico-multiform-mode) - (setq vertico-multiform-categories - '((consult-grep buffer)))) + :custom + (completion-styles '(orderless basic)) + (completion-category-overrides '((file (styles basic partial-completion))))) (use-package dired :ensure nil @@ -235,7 +218,7 @@ (display-line-numbers-mode -1)))) (use-package org-tempo - :ensure t + :ensure nil :after (org) :config (add-to-list 'org-structure-template-alist @@ -243,11 +226,10 @@ (use-package org-bullets :ensure t - :after (org) - :ensure - :hook - (org-mode . (lambda () - (org-bullets-mode)))) + :after (org)) + ;; :hook + ;; (org-mode . (lambda () + ;; (org-bullets-mode)))) (use-package ido :ensure t @@ -294,6 +276,17 @@ '(("internal" . font-lock-keyword-face) ("global" . 'font-lock-keyword-face))) +(use-package web-mode + :ensure t) + ;; :hook + ;; (web-mode . (lambda () + ;; (setq tab-width 2 + ;; web-mode-style-padding 2 + ;; web-mode-script-padding 2 + ;; web-mode-markup-indent-offset 2 + ;; web-mode-code-indent-offset 2 + ;; setq web-mode-css-indent-offset 2)))) + (defun jrk/eshell () "Open eshell in other window" (interactive) @@ -345,7 +338,7 @@ ;; Sets the default compile command based on OS (if (string= system-type "windows-nt") (setq compile-command "build.bat") - (setq compile-command "guix shell -m ./manifest.scm -- ./build.sh")) + (setq compile-command "./build.sh")) (defun jrk/disable-all-themes () "Disables all active themes." diff --git a/i3/config b/i3/config @@ -13,10 +13,18 @@ set $mod Mod4 font pango:Iosevka 10 -gaps outer 20px +# gaps outer 20px gaps inner 5px default_border pixel 2px +# class border backgr. text indicator child_border +client.focused #dadeac #61538d #e4e4ef #dddfff #61538d +client.focused_inactive #333333 #5f676a #e4e4ef #484e50 #5f676a +client.unfocused #333333 #222222 #888888 #292d2e #222222 +client.urgent #2f343a #900000 #e4e4ef #900000 #f43841 +client.placeholder #000000 #0c0c0c #e4e4ef #000000 #0c0c0c +client.background #ffffff + # Start XDG autostart .desktop files using dex. See also # https://wiki.archlinux.org/index.php/XDG_Autostart exec --no-startup-id dex --autostart --environment i3 @@ -193,4 +201,17 @@ bar { status_command i3status tray_output primary position top + + colors { + background #181818 + statusline #f5f5f5 + separator #666666 + + # border background text + focused_workspace #96a6c8 #61538d #f5f5f5 + active_workspace #333333 #5f676a #f5f5f5 + inactive_workspace #333333 #222222 #888888 + urgent_workspace #2f343a #D9534F #f5f5f5 + binding_mode #2f343a #900000 #f5f5f5 + } } diff --git a/i3status/config b/i3status/config @@ -1,5 +1,7 @@ general { colors = true + color_good = "#73c936" + color_bad = "#f43841" interval = 5 } diff --git a/scripts/murder b/scripts/murder @@ -1,3 +1,3 @@ #!/bin/sh -ps -e | fzf | awk 'OFS=" " {print $1}' | xargs kill $1 +ps -e | dmenu -l 16 | awk 'OFS=" " {print $1}' | xargs kill $1