From d65ba7ab8b9a364420fbf36e2aba7636b8bc2776 Mon Sep 17 00:00:00 2001 From: Inhji Date: Tue, 23 Jan 2024 21:13:36 +0100 Subject: [PATCH] move general config files to dot_config folder --- config/{ => dot_config}/cmus/base | 0 .../cmus/cmus_status_scrobbler.ini.example | 0 .../cmus/cmus_status_scrobbler.py | 0 .../cmus/status_display_program.sh | 0 config/dot_config/doom/config.el | 78 +++++++ config/dot_config/doom/init.el | 195 ++++++++++++++++++ config/dot_config/doom/packages.el | 50 +++++ config/{ => dot_config}/fish/config.fish | 13 +- config/{ => dot_config}/fish/fish_plugins | 0 config/{ => dot_config}/foot/foot.ini | 2 +- config/dot_config/helix/#config.toml# | 9 + config/{ => dot_config}/helix/config.toml | 0 .../helix/themes/catppuccin_frappe.toml | 0 .../helix/themes/catppuccin_latte.toml | 0 .../helix/themes/catppuccin_macchiato.toml | 0 .../helix/themes/catppuccin_mocha.toml | 0 config/{ => dot_config}/lsd/config.yaml | 0 config/dot_config/tofi/config | 22 ++ install.conf.yaml | 17 +- 19 files changed, 370 insertions(+), 16 deletions(-) rename config/{ => dot_config}/cmus/base (100%) rename config/{ => dot_config}/cmus/cmus_status_scrobbler.ini.example (100%) rename config/{ => dot_config}/cmus/cmus_status_scrobbler.py (100%) rename config/{ => dot_config}/cmus/status_display_program.sh (100%) create mode 100644 config/dot_config/doom/config.el create mode 100644 config/dot_config/doom/init.el create mode 100644 config/dot_config/doom/packages.el rename config/{ => dot_config}/fish/config.fish (86%) rename config/{ => dot_config}/fish/fish_plugins (100%) rename config/{ => dot_config}/foot/foot.ini (81%) create mode 100644 config/dot_config/helix/#config.toml# rename config/{ => dot_config}/helix/config.toml (100%) rename config/{ => dot_config}/helix/themes/catppuccin_frappe.toml (100%) rename config/{ => dot_config}/helix/themes/catppuccin_latte.toml (100%) rename config/{ => dot_config}/helix/themes/catppuccin_macchiato.toml (100%) rename config/{ => dot_config}/helix/themes/catppuccin_mocha.toml (100%) rename config/{ => dot_config}/lsd/config.yaml (100%) create mode 100644 config/dot_config/tofi/config diff --git a/config/cmus/base b/config/dot_config/cmus/base similarity index 100% rename from config/cmus/base rename to config/dot_config/cmus/base diff --git a/config/cmus/cmus_status_scrobbler.ini.example b/config/dot_config/cmus/cmus_status_scrobbler.ini.example similarity index 100% rename from config/cmus/cmus_status_scrobbler.ini.example rename to config/dot_config/cmus/cmus_status_scrobbler.ini.example diff --git a/config/cmus/cmus_status_scrobbler.py b/config/dot_config/cmus/cmus_status_scrobbler.py similarity index 100% rename from config/cmus/cmus_status_scrobbler.py rename to config/dot_config/cmus/cmus_status_scrobbler.py diff --git a/config/cmus/status_display_program.sh b/config/dot_config/cmus/status_display_program.sh similarity index 100% rename from config/cmus/status_display_program.sh rename to config/dot_config/cmus/status_display_program.sh diff --git a/config/dot_config/doom/config.el b/config/dot_config/doom/config.el new file mode 100644 index 0000000..fd5c746 --- /dev/null +++ b/config/dot_config/doom/config.el @@ -0,0 +1,78 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! + + +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. It is optional. +;; (setq user-full-name "John Doe" +;; user-mail-address "john@doe.com") + +;; Doom exposes five (optional) variables for controlling fonts in Doom: +;; +;; - `doom-font' -- the primary font to use +;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable) +;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; - `doom-symbol-font' -- for symbols +;; - `doom-serif-font' -- for the `fixed-pitch-serif' face +;; +;; See 'C-h v doom-font' for documentation and more examples of what they +;; accept. For example: +;; +;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light) +;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13)) +;; +;; If you or Emacs can't find your font, use 'M-x describe-font' to look them +;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to +;; refresh your font settings. If Emacs still can't find your font, it likely +;; wasn't installed correctly. Font issues are rarely Doom issues! + +;; There are two ways to load a theme. Both assume the theme is installed and +;; available. You can either set `doom-theme' or manually load a theme with the +;; `load-theme' function. This is the default: +(setq doom-theme 'doom-one) + +;; This determines the style of line numbers in effect. If set to `nil', line +;; numbers are disabled. For relative line numbers, set this to `relative'. +(setq display-line-numbers-type t) + +;; If you use `org' and don't want your org files in the default location below, +;; change `org-directory'. It must be set before org loads! +(setq org-directory "~/org/") + +;; Set bash as the default shell to run Emacs in since fish can cause problems +(setq shell-file-name (executable-find "bash")) + +;; Whenever you reconfigure a package, make sure to wrap your config in an +;; `after!' block, otherwise Doom's defaults may override your settings. E.g. +;; +;; (after! PACKAGE +;; (setq x y)) +;; +;; The exceptions to this rule: +;; +;; - Setting file/directory variables (like `org-directory') +;; - Setting variables which explicitly tell you to set them before their +;; package is loaded (see 'C-h v VARIABLE' to look up their documentation). +;; - Setting doom variables (which start with 'doom-' or '+'). +;; +;; Here are some additional functions/macros that will help you configure Doom. +;; +;; - `load!' for loading external *.el files relative to this one +;; - `use-package!' for configuring packages +;; - `after!' for running code after a package has loaded +;; - `add-load-path!' for adding directories to the `load-path', relative to +;; this file. Emacs searches the `load-path' when you load packages with +;; `require' or `use-package'. +;; - `map!' for binding new keys +;; +;; To get information about any of these functions/macros, move the cursor over +;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). +;; This will open documentation for it, including demos of how they are used. +;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces, +;; etc). +;; +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how +;; they are implemented. diff --git a/config/dot_config/doom/init.el b/config/dot_config/doom/init.el new file mode 100644 index 0000000..a55152d --- /dev/null +++ b/config/dot_config/doom/init.el @@ -0,0 +1,195 @@ +;;; init.el -*- lexical-binding: t; -*- + +;; This file controls what Doom modules are enabled and what order they load +;; in. Remember to run 'doom sync' after modifying it! + +;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's +;; documentation. There you'll find a link to Doom's Module Index where all +;; of our modules are listed, including what flags they support. + +;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or +;; 'C-c c k' for non-vim users) to view its documentation. This works on +;; flags as well (those symbols that start with a plus). +;; +;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its +;; directory (for easy access to its source code). + +(doom! :input + ;;bidi ; (tfel ot) thgir etirw uoy gnipleh + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row + + :completion + company ; the ultimate code completion backend + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + ;;ivy ; a search engine for love and life + vertico ; the search engine of the future + + :ui + ;;deft ; notational velocity for Emacs + doom ; what makes DOOM look the way it does + doom-dashboard ; a nifty splash screen for Emacs + ;;doom-quit ; DOOM quit-message prompts when you quit Emacs + ;;(emoji +unicode) ; 🙂 + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + ;;hydra + ;;indent-guides ; highlighted indent columns + ;;ligatures ; ligatures and symbols to make your code pretty again + ;;minimap ; show a map of the code on the side + modeline ; snazzy, Atom-inspired modeline, plus API + ;;nav-flash ; blink cursor line after big motions + ;;neotree ; a project drawer, like NERDTree for vim + ophints ; highlight the region an operation acts on + (popup +defaults) ; tame sudden yet inevitable temporary windows + ;;tabs ; a tab bar for Emacs + ;;treemacs ; a project drawer, like neotree but cooler + ;;unicode ; extended unicode support for various languages + (vc-gutter +pretty) ; vcs diff in the fringe + vi-tilde-fringe ; fringe tildes to mark beyond EOB + ;;window-select ; visually switch windows + workspaces ; tab emulation, persistence & separate workspaces + ;;zen ; distraction-free coding or writing + + :editor + (evil +everywhere); come to the dark side, we have cookies + file-templates ; auto-snippets for empty files + fold ; (nigh) universal code folding + ;;(format +onsave) ; automated prettiness + ;;god ; run Emacs commands without modifier keys + ;;lispy ; vim for lisp, for people who don't like vim + ;;multiple-cursors ; editing in many places at once + ;;objed ; text object editing for the innocent + ;;parinfer ; turn lisp into python, sort of + ;;rotate-text ; cycle region at point between text candidates + snippets ; my elves. They type so I don't have to + ;;word-wrap ; soft wrapping with language-aware indent + + :emacs + dired ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + ;;ibuffer ; interactive buffer management + undo ; persistent, smarter undo for your inevitable mistakes + vc ; version-control and Emacs, sitting in a tree + + :term + ;;eshell ; the elisp shell that works everywhere + ;;shell ; simple shell REPL for Emacs + ;;term ; basic terminal emulator for Emacs + ;;vterm ; the best terminal emulation in Emacs + + :checkers + syntax ; tasing you for every semicolon you forget + ;;(spell +flyspell) ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make + + :tools + ;;ansible + ;;biblio ; Writes a PhD for you (citation needed) + ;;collab ; buffers with friends + ;;debugger ; FIXME stepping through code, to help you add bugs + ;;direnv + ;;docker + ;;editorconfig ; let someone else argue about tabs vs spaces + ;;ein ; tame Jupyter notebooks with emacs + (eval +overlay) ; run code, run (also, repls) + ;;gist ; interacting with github gists + lookup ; navigate your code and its documentation + ;;lsp ; M-x vscode + magit ; a git porcelain for Emacs + ;;make ; run make tasks from Emacs + ;;pass ; password manager for nerds + ;;pdf ; pdf enhancements + ;;prodigy ; FIXME managing external services & code builders + ;;rgb ; creating color strings + ;;taskrunner ; taskrunner for all your projects + ;;terraform ; infrastructure as code + ;;tmux ; an API for interacting with tmux + ;;tree-sitter ; syntax and parsing, sitting in a tree... + ;;upload ; map local to remote projects via ssh/ftp + + :os + (:if IS-MAC macos) ; improve compatibility with macOS + ;;tty ; improve the terminal Emacs experience + + :lang + ;;agda ; types of types of types of types... + ;;beancount ; mind the GAAP + ;;(cc +lsp) ; C > C++ == 1 + ;;clojure ; java with a lisp + ;;common-lisp ; if you've seen one lisp, you've seen them all + ;;coq ; proofs-as-programs + ;;crystal ; ruby at the speed of c + ;;csharp ; unity, .NET, and mono shenanigans + ;;data ; config/data formats + ;;(dart +flutter) ; paint ui and not much else + ;;dhall + ;;elixir ; erlang done right + ;;elm ; care for a cup of TEA? + emacs-lisp ; drown in parentheses + ;;erlang ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics + ;;factor + ;;faust ; dsp, but you get to keep your soul + ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) + ;;fsharp ; ML stands for Microsoft's Language + ;;fstar ; (dependent) types and (monadic) effects and Z3 + ;;gdscript ; the language you waited for + ;;(go +lsp) ; the hipster dialect + ;;(graphql +lsp) ; Give queries a REST + ;;(haskell +lsp) ; a language that's lazier than I am + ;;hy ; readability of scheme w/ speed of python + ;;idris ; a language you can depend on + ;;json ; At least it ain't XML + ;;(java +lsp) ; the poster child for carpal tunnel syndrome + ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + ;;kotlin ; a better, slicker Java(Script) + ;;latex ; writing papers in Emacs has never been so fun + ;;lean ; for folks with too much to prove + ;;ledger ; be audit you can be + ;;lua ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;;nim ; python + lisp at the speed of c + ;;nix ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + org ; organize your plain life in plain text + ;;php ; perl's insecure younger brother + ;;plantuml ; diagrams for confusing people more + ;;purescript ; javascript, but functional + ;;python ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + ;;racket ; a DSL for DSLs + ;;raku ; the artist formerly known as perl6 + ;;rest ; Emacs as a REST client + ;;rst ; ReST in peace + ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + ;;(rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scala ; java, but good + ;;(scheme +guile) ; a fully conniving family of lisps + sh ; she sells {ba,z,fi}sh shells on the C xor + ;;sml + ;;solidity ; do you need a blockchain? No. + ;;swift ; who asked for emoji variables? + ;;terra ; Earth and Moon in alignment for performance. + ;;web ; the tubes + ;;yaml ; JSON, but readable + ;;zig ; C, but simpler + + :email + ;;(mu4e +org +gmail) + ;;notmuch + ;;(wanderlust +gmail) + + :app + ;;calendar + ;;emms + ;;everywhere ; *leave* Emacs!? You must be joking + ;;irc ; how neckbeards socialize + ;;(rss +org) ; emacs as an RSS reader + ;;twitter ; twitter client https://twitter.com/vnought + + :config + ;;literate + (default +bindings +smartparens)) diff --git a/config/dot_config/doom/packages.el b/config/dot_config/doom/packages.el new file mode 100644 index 0000000..364e6e9 --- /dev/null +++ b/config/dot_config/doom/packages.el @@ -0,0 +1,50 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; To install a package with Doom you must declare them here and run 'doom sync' +;; on the command line, then restart Emacs for the changes to take effect -- or +;; use 'M-x doom/reload'. + + +;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: +;; (package! some-package) + +;; To install a package directly from a remote git repo, you must specify a +;; `:recipe'. You'll find documentation on what `:recipe' accepts here: +;; https://github.com/radian-software/straight.el#the-recipe-format +;; (package! another-package +;; :recipe (:host github :repo "username/repo")) + +;; If the package you are trying to install does not contain a PACKAGENAME.el +;; file, or is located in a subdirectory of the repo, you'll need to specify +;; `:files' in the `:recipe': +;; (package! this-package +;; :recipe (:host github :repo "username/repo" +;; :files ("some-file.el" "src/lisp/*.el"))) + +;; If you'd like to disable a package included with Doom, you can do so here +;; with the `:disable' property: +;; (package! builtin-package :disable t) + +;; You can override the recipe of a built in package without having to specify +;; all the properties for `:recipe'. These will inherit the rest of its recipe +;; from Doom or MELPA/ELPA/Emacsmirror: +;; (package! builtin-package :recipe (:nonrecursive t)) +;; (package! builtin-package-2 :recipe (:repo "myfork/package")) + +;; Specify a `:branch' to install a package from a particular branch or tag. +;; This is required for some packages whose default branch isn't 'master' (which +;; our package manager can't deal with; see radian-software/straight.el#279) +;; (package! builtin-package :recipe (:branch "develop")) + +;; Use `:pin' to specify a particular commit to install. +;; (package! builtin-package :pin "1a2b3c4d5e") + + +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;; (unpin! pinned-package) +;; ...or multiple packages +;; (unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;; (unpin! t) diff --git a/config/fish/config.fish b/config/dot_config/fish/config.fish similarity index 86% rename from config/fish/config.fish rename to config/dot_config/fish/config.fish index d59e35c..01bc3c0 100644 --- a/config/fish/config.fish +++ b/config/dot_config/fish/config.fish @@ -7,12 +7,12 @@ set SITE $HOME/Devel/kirby set KEYFILE $HOME/.ssh/id_ed25519 -fish_add_path $HOME/.local/bin $HOME/.mix $HOME/.mix/escripts $HOME/.cargo/bin $GOPATH/bin +fish_add_path $HOME/.local/bin $HOME/.mix $HOME/.mix/escripts $HOME/.cargo/bin $GOPATH/bin $HOME/.config/emacs/bin ## Environment setup set -xU TERMINAL 'foot' set -xU TERM 'xterm' -set -xU EDITOR 'hx' +set -xU EDITOR 'helix' ## Functions @@ -28,14 +28,14 @@ alias dot="$EDITOR $DOTFILES" alias site="$EDITOR $SITE" # Add apt aliases for updating / upgrading if available -if test -e (which apt) +if type -q (which apt &> /dev/null) alias up="sudo apt update && sudo apt list --upgradable" alias ug="sudo apt upgrade" alias install="sudo apt install" end # Replace ls with lsd if available -if test -e (which lsd) +if type -q (which lsd &> /dev/null) alias ls="lsd" alias la="lsd -a" alias ll="lsd -l" @@ -64,13 +64,14 @@ alias jctl="journalctl -p 3 -xb" alias cal="ncal -3Mb" if status is-interactive - if test -e (which keychain) + if type -q (which keychain &> /dev/null) keychain --quick --quiet --eval $KEYFILE | source end end - ## Load asdf if available if test -e ~/.asdf/asdf.fish source ~/.asdf/asdf.fish end + +#source ~/.dotfiles/submodules/fisher/functions/fisher.fish diff --git a/config/fish/fish_plugins b/config/dot_config/fish/fish_plugins similarity index 100% rename from config/fish/fish_plugins rename to config/dot_config/fish/fish_plugins diff --git a/config/foot/foot.ini b/config/dot_config/foot/foot.ini similarity index 81% rename from config/foot/foot.ini rename to config/dot_config/foot/foot.ini index 5314ed5..55ff800 100644 --- a/config/foot/foot.ini +++ b/config/dot_config/foot/foot.ini @@ -1,7 +1,7 @@ # -*- conf -*- [main] -font=Caskaydia Cove Nerd Font:size=18 +font=JetBrainsMono NF:size=14 term=xterm dpi-aware=no shell=/usr/bin/fish diff --git a/config/dot_config/helix/#config.toml# b/config/dot_config/helix/#config.toml# new file mode 100644 index 0000000..f861533 --- /dev/null +++ b/config/dot_config/helix/#config.toml# @@ -0,0 +1,9 @@ +theme = "catppuccin_mocha" + +# this should be enabled once soft wrap is merged +[editor] +soft-wrap.enable = true + +[keys.normal] +C-s = ":w" + diff --git a/config/helix/config.toml b/config/dot_config/helix/config.toml similarity index 100% rename from config/helix/config.toml rename to config/dot_config/helix/config.toml diff --git a/config/helix/themes/catppuccin_frappe.toml b/config/dot_config/helix/themes/catppuccin_frappe.toml similarity index 100% rename from config/helix/themes/catppuccin_frappe.toml rename to config/dot_config/helix/themes/catppuccin_frappe.toml diff --git a/config/helix/themes/catppuccin_latte.toml b/config/dot_config/helix/themes/catppuccin_latte.toml similarity index 100% rename from config/helix/themes/catppuccin_latte.toml rename to config/dot_config/helix/themes/catppuccin_latte.toml diff --git a/config/helix/themes/catppuccin_macchiato.toml b/config/dot_config/helix/themes/catppuccin_macchiato.toml similarity index 100% rename from config/helix/themes/catppuccin_macchiato.toml rename to config/dot_config/helix/themes/catppuccin_macchiato.toml diff --git a/config/helix/themes/catppuccin_mocha.toml b/config/dot_config/helix/themes/catppuccin_mocha.toml similarity index 100% rename from config/helix/themes/catppuccin_mocha.toml rename to config/dot_config/helix/themes/catppuccin_mocha.toml diff --git a/config/lsd/config.yaml b/config/dot_config/lsd/config.yaml similarity index 100% rename from config/lsd/config.yaml rename to config/dot_config/lsd/config.yaml diff --git a/config/dot_config/tofi/config b/config/dot_config/tofi/config new file mode 100644 index 0000000..5688b6e --- /dev/null +++ b/config/dot_config/tofi/config @@ -0,0 +1,22 @@ +# dmenu theme +anchor = top +width = 0 +height = 30 +horizontal = true +font-size = 14 +prompt-text = " run: " +outline-width = 0 +border-width = 0 +background-color = #000000 +min-input-width = 50 +result-spacing = 15 +padding-top = 1 +padding-bottom = 0 +padding-left = 0 +padding-right = 0 + +# performance +font = "/home/inhji/.fonts/Inter-Regular.otf" +num-results = 10 +hint-font = false +late-keyboard-init = true \ No newline at end of file diff --git a/install.conf.yaml b/install.conf.yaml index 6afb86d..ca57ffc 100644 --- a/install.conf.yaml +++ b/install.conf.yaml @@ -3,17 +3,16 @@ - create: - ~/.config - - ~/.config/fish - link: ~/.gitconfig: config/git/gitconfig ~/.gitignore: config/git/gitignore ~/.ssh/config: config/ssh/config - ~/.config/fish: - glob: true - path: config/fish/* - -- shell: - - - command: ./scripts/fisher.sh - stdout: true \ No newline at end of file + ~/.config: + create: true + glob: true + path: config/dot_config/**/* + ~/.local/bin: + create: true + glob: true + path: config/scripts/*