From 3b9f0cb7c805b8a5f384d6d89cf6e3f9674a8e03 Mon Sep 17 00:00:00 2001 From: Vidhu Kant Sharma Date: Sat, 10 May 2025 10:27:21 +0530 Subject: did stuff --- .config/alacritty/alacritty.toml | 1 + .config/alacritty/env.toml | 2 +- .config/alacritty/shell.toml | 5 +- .config/doom/config.el | 79 ++++++++++++++++ .config/doom/init.el | 193 +++++++++++++++++++++++++++++++++++++ .config/doom/packages.el | 50 ++++++++++ .config/fish/conf.d/rustup.fish | 1 + .config/fish/fish_variables | 6 +- .config/zsh/.zshenv | 4 +- .doom.d/config.el | 59 ------------ .doom.d/custom.el | 51 ---------- .doom.d/init.el | 190 ------------------------------------- .doom.d/packages.el | 50 ---------- .doom.d/themes/zt-theme.el | 200 --------------------------------------- .scripts/open_terminal | 6 +- .xprofile | 34 ++++--- 16 files changed, 358 insertions(+), 573 deletions(-) create mode 100644 .config/doom/config.el create mode 100644 .config/doom/init.el create mode 100644 .config/doom/packages.el create mode 100644 .config/fish/conf.d/rustup.fish delete mode 100644 .doom.d/config.el delete mode 100644 .doom.d/custom.el delete mode 100644 .doom.d/init.el delete mode 100644 .doom.d/packages.el delete mode 100644 .doom.d/themes/zt-theme.el diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index d53281c..c24bd97 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,3 +1,4 @@ +[general] import = [ #"~/.config/alacritty/font.toml", #"~/.config/alacritty/keybindings.toml", diff --git a/.config/alacritty/env.toml b/.config/alacritty/env.toml index d0d8c1a..d8f1069 100644 --- a/.config/alacritty/env.toml +++ b/.config/alacritty/env.toml @@ -1,2 +1,2 @@ [env] -WINIT_X11_SCALE_FACTOR = "1.3" +WINIT_X11_SCALE_FACTOR = "1.1" diff --git a/.config/alacritty/shell.toml b/.config/alacritty/shell.toml index 6c4fb7b..97f9975 100644 --- a/.config/alacritty/shell.toml +++ b/.config/alacritty/shell.toml @@ -1,4 +1,7 @@ +[general] working_directory = "None" -[shell] +[terminal] + +[terminal.shell] program = "/bin/fish" diff --git a/.config/doom/config.el b/.config/doom/config.el new file mode 100644 index 0000000..2388d3b --- /dev/null +++ b/.config/doom/config.el @@ -0,0 +1,79 @@ +;;; $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-font "Source Code Pro:size=16") + +(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/") + + +;; 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/doom/init.el b/.config/doom/init.el new file mode 100644 index 0000000..05c5466 --- /dev/null +++ b/.config/doom/init.el @@ -0,0 +1,193 @@ +;;; 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 + (corfu +orderless) ; complete with cap(f), cape and a flying feather! + ;;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 + 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 + ;;eww ; the internet is gross + ;;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) + 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 + ;;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 (featurep :system 'macos) 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 + ;;graphviz ; diagrams for confusing yourself even 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 + + :config + ;;literate + (default +bindings +smartparens)) diff --git a/.config/doom/packages.el b/.config/doom/packages.el new file mode 100644 index 0000000..364e6e9 --- /dev/null +++ b/.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/conf.d/rustup.fish b/.config/fish/conf.d/rustup.fish new file mode 100644 index 0000000..e4cb363 --- /dev/null +++ b/.config/fish/conf.d/rustup.fish @@ -0,0 +1 @@ +source "$HOME/.cargo/env.fish" diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index e872f9b..73ea245 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,6 +1,6 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 -SETUVAR __fish_initialized:3400 +SETUVAR __fish_initialized:3800 SETUVAR fish_color_autosuggestion:brblack SETUVAR fish_color_cancel:\x2dr SETUVAR fish_color_command:blue @@ -18,7 +18,7 @@ SETUVAR fish_color_operator:brcyan SETUVAR fish_color_param:cyan SETUVAR fish_color_quote:yellow SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_status:red SETUVAR fish_color_user:brgreen @@ -29,4 +29,4 @@ SETUVAR fish_pager_color_description:yellow\x1e\x2di SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_selected_background:\x2dr -SETUVAR fish_user_paths:/usr/local/bin\x1e/home/vidhukant/\x2elocal/bin\x1e/home/vidhukant/\x2escripts +SETUVAR fish_user_paths:/home/vidhukant/\x2ecargo/bin\x1e/home/vidhukant/\x2egopath/bin\x1e/home/vidhukant/\x2econfig/emacs/bin\x1e/usr/local/bin\x1e/home/vidhukant/\x2elocal/bin\x1e/home/vidhukant/\x2escripts diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index 9718802..e24964d 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -12,8 +12,8 @@ export PATH=$HOME/.config/emacs/bin:$PATH export PATH=/usr/local/bin:$PATH # export RUST_SRC_PATH=$HOME/.cargo -# export PATH=$HOME/.gopath:$PATH -# export GOPATH="$HOME/.gopath" +export PATH=$HOME/.gopath:$PATH +export GOPATH="$HOME/.gopath" # export PATH=$HOME/.local/flutter/bin:$PATH export QT_QPA_PLATFORMTHEME=gtk2 diff --git a/.doom.d/config.el b/.doom.d/config.el deleted file mode 100644 index 05c83ae..0000000 --- a/.doom.d/config.el +++ /dev/null @@ -1,59 +0,0 @@ -;;; $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. -(setq user-full-name "Vidhu Kant Sharma" - user-mail-address "vidhukant@vidhukant.com") - -;; Doom exposes five (optional) variables for controlling fonts in Doom. Here -;; are the three important ones: -;; -;; + `doom-font' -;; + `doom-variable-pitch-font' -;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for -;; presentations or streaming. -;; -;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd -;; font string. You generally only need these two: -;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light) -;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) -(setq doom-font (font-spec :family "Source Code Pro" :size 18) - doom-variable-pitch-font (font-spec :family "Source Han Sans JP" :size 18)) - -;; 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 'zt) - -;; 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 "/hdd/Documents/org/") - -;; 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) - -(setq default-indent-tabs-mode nil) -(setq default-tab-width 2) -(setq doom/set-indent-width 2) - -;; Here are some additional functions/macros that could 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. -;; -;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how -;; they are implemented. diff --git a/.doom.d/custom.el b/.doom.d/custom.el deleted file mode 100644 index d1fb65e..0000000 --- a/.doom.d/custom.el +++ /dev/null @@ -1,51 +0,0 @@ -(custom-set-variables - ;; custom-set-variables 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. - '(custom-safe-themes - '("6abe1a7563dbd6524f08e1a875415adb800e918cfb9617f9a1eb8d2ef7f5305a" default)) - '(magit-todos-insert-after '(bottom) nil nil "Changed by setter of obsolete option `magit-todos-insert-at'") - '(warning-suppress-log-types '((doom-first-file-hook) (defvaralias)))) -(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. - '(line-number ((t (:slant normal)))) - '(line-number-current-line ((t (:slant normal))))) - -(add-hook 'go-mode-hook - (defun my-go-mode-hook () - (add-hook 'before-save-hook 'gofmt-before-save) - (setq tab-width 2 indent-tabs-mode 0))) - -(add-hook 'dart-mode-hook - (defun my-go-mode-hook () - (setq tab-width 2 indent-tabs-mode 0))) - -(add-hook 'web-mode-hook - (defun my-web-mode-hook () - (setq web-mode-markup-indent-offset 2))) - -(custom-set-faces! - '(line-number :slant normal) - '(line-number-current-line :slant normal)) - -; window transparency -(add-to-list 'default-frame-alist '(alpha . 80)) - -;; dashboard config - -; anime splash image -(setq fancy-splash-image "/home/zt/hdd/Pictures/.emacs-header.png") - -; dashboard footer -(add-hook! '+doom-dashboard-functions :prepend - (insert (+doom-dashboard--center +doom-dashboard--width "Welcome back, VidhuKant!") "\n\n\n")) - -; delete some menu items -(assoc-delete-all "Open org-agenda" +doom-dashboard-menu-sections) -(assoc-delete-all "Jump to bookmark" +doom-dashboard-menu-sections) -(assoc-delete-all "Open documentation" +doom-dashboard-menu-sections) -(assoc-delete-all "Open private configuration" +doom-dashboard-menu-sections) \ No newline at end of file diff --git a/.doom.d/init.el b/.doom.d/init.el deleted file mode 100644 index f2db2ad..0000000 --- a/.doom.d/init.el +++ /dev/null @@ -1,190 +0,0 @@ -;;; 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 "Module Index" link where you'll find -;; a comprehensive list of Doom's modules and 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 - ;;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 ; 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) - ;;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 - ;;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 ; 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 - ;;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 - (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 +meghanada) ; 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 ; 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 - - :app - ;;calendar - ;;emms - ;;everywhere ; *leave* Emacs!? You must be joking - ;;irc ; how neckbeards socialize - rss ; emacs as an RSS reader - ;;twitter ; twitter client https://twitter.com/vnought - - :config - ;;literate - (default +bindings +smartparens)) diff --git a/.doom.d/packages.el b/.doom.d/packages.el deleted file mode 100644 index b80e9cc..0000000 --- a/.doom.d/packages.el +++ /dev/null @@ -1,50 +0,0 @@ -;; -*- 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/raxod502/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 raxod502/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/.doom.d/themes/zt-theme.el b/.doom.d/themes/zt-theme.el deleted file mode 100644 index 3070ac5..0000000 --- a/.doom.d/themes/zt-theme.el +++ /dev/null @@ -1,200 +0,0 @@ -;;; themes/zt-theme.el -*- lexical-binding: t; -*- - -;;; doom-one-theme.el --- inspired by Atom One Dark -*- lexical-binding: t; no-byte-compile: t; -*- -;; -;; Added: May 23, 2016 (28620647f838) -;; Author: Henrik Lissner -;; Maintainer: Henrik Lissner -;; Source: https://github.com/atom/one-dark-ui -;; -;;; Commentary: -;; -;; This themepack's flagship theme. -;; -;;; Code: -(require 'doom-themes) - - -;; -;;; Variables - -(defgroup zt-theme nil - "Options for the `zt' theme." - :group 'doom-themes) - -(defcustom zt-brighter-modeline nil - "If non-nil, more vivid colors will be used to style the mode-line." - :group 'zt-theme - :type 'boolean) - -(defcustom zt-brighter-comments nil - "If non-nil, comments will be highlighted in more vivid colors." - :group 'zt-theme - :type 'boolean) - -(defcustom zt-padded-modeline doom-themes-padded-modeline - "If non-nil, adds a 4px padding to the mode-line. -Can be an integer to determine the exact padding." - :group 'zt-theme - :type '(choice integer boolean)) - - -;; -;;; Theme definition - -(def-doom-theme zt - "A dark theme inspired by Atom One Dark." - - ;; name default 256 16 - ;((bg '("#100b13" "black" "black" )) ; this looks bad because polybar has messed up color rendering or something - ((bg '("#282c34" "black" "black" )) - (fg '("#bbc2cf" "#bfbfbf" "brightwhite" )) - - ;; These are off-color variants of bg/fg, used primarily for `solaire-mode', - ;; but can also be useful as a basis for subtle highlights (e.g. for hl-line - ;; or region), especially when paired with the `doom-darken', `doom-lighten', - ;; and `doom-blend' helper functions. - (bg-alt-alt '("#21242b" "black" "black" )) - ;(bg-alt '("#100b13" "black" "black" )) - (bg-alt '("#0e0911" "black" "black" )) - (fg-alt '("#5B6268" "#2d2d2d" "white" )) - - ;; These should represent a spectrum from bg to fg, where base0 is a starker - ;; bg and base8 is a starker fg. For example, if bg is light grey and fg is - ;; dark grey, base0 should be white and base8 should be black. - (base0 '("#1B2229" "black" "black" )) - (base1 '("#1c1f24" "#1e1e1e" "brightblack" )) - (base2 '("#202328" "#2e2e2e" "brightblack" )) - (base3 '("#23272e" "#262626" "brightblack" )) - (base4 '("#3f444a" "#3f3f3f" "brightblack" )) - (base5 '("#5B6268" "#525252" "brightblack" )) - (base6 '("#73797e" "#6b6b6b" "brightblack" )) - (base7 '("#9ca0a4" "#979797" "brightblack" )) - (base8 '("#DFDFDF" "#dfdfdf" "white" )) - - (grey base4) - (red '("#ff6c6b" "#ff6655" "red" )) - (orange '("#da8548" "#dd8844" "brightred" )) - (green '("#98be65" "#99bb66" "green" )) - (teal '("#4db5bd" "#44b9b1" "brightgreen" )) - (yellow '("#ECBE7B" "#ECBE7B" "yellow" )) - (blue '("#8845bf" "#8845bf" "brightblue" )) - (dark-blue '("#2257A0" "#2257A0" "blue" )) - (magenta '("#c678dd" "#c678dd" "brightmagenta")) - (violet '("#a9a1e1" "#a9a1e1" "magenta" )) - (cyan '("#46D9FF" "#46D9FF" "brightcyan" )) - (dark-cyan '("#5699AF" "#5699AF" "cyan" )) - ; custom colors - (purple '("#9b1bed" "#a9a1e1" "magenta" )) - (purple2 '("#660ec7" "#a9a1e1" "magenta" )) - (purple3 '("#9a30a4" "#a9a1e1" "magenta" )) - (pink '("#ff0aa3" "#c678dd" "brightmagenta")) - (lime '("#0ec685" "#ecbe7b" "yellow")) - - ;; These are the "universal syntax classes" that doom-themes establishes. - ;; These *must* be included in every doom themes, or your theme will throw an - ;; error, as they are used in the base theme defined in doom-themes-base. - (highlight lime) - (vertical-bar (doom-darken base1 0.1)) - (selection blue) - (builtin magenta) - (comments (if zt-brighter-comments dark-cyan base5)) - (doc-comments (doom-lighten (if zt-brighter-comments dark-cyan base5) 0.25)) - (constants (doom-lighten lime 0.5)) - (functions (doom-lighten purple3 0.3)) - (keywords lime) - (methods cyan) - (operators lime) - (type magenta) - (strings (doom-lighten pink 0.6)) - (variables (doom-lighten pink 0.4)) - (numbers yellow) - (region `(,(doom-lighten (car bg-alt) 0.15) ,@(doom-lighten (cdr base1) 0.35))) - (error red) - (warning yellow) - (success green) - (vc-modified orange) - (vc-added green) - (vc-deleted red) - - ;; These are extra color variables used only in this theme; i.e. they aren't - ;; mandatory for derived themes. - (modeline-fg fg) - (modeline-fg-alt base5) - (modeline-bg (if zt-brighter-modeline - (doom-darken blue 0.45) - (doom-darken bg-alt 0.1))) - (modeline-bg-alt (if zt-brighter-modeline - (doom-darken blue 0.475) - `(,(doom-darken (car bg-alt) 0.15) ,@(cdr bg)))) - (modeline-bg-inactive `(,(car bg-alt) ,@(cdr base1))) - (modeline-bg-inactive-alt `(,(doom-darken (car bg-alt) 0.1) ,@(cdr bg))) - - (-modeline-pad - (when zt-padded-modeline - (if (integerp zt-padded-modeline) zt-padded-modeline 4)))) - - - ;;;; Base theme face overrides - ( - ((line-number &override) :foreground magenta :background bg-alt) - ((line-number-current-line &override) :foreground magenta :background "#21242b") - ((cursor &override) :background purple3) - ((region &override) :background "#71279f") - ;((region &override) :background "#9a30a4") - ((hl-line &override) :background "#21242b") - ((highlight &override) :background "#ff0aa3") - ;((tide-hl-identifier-face &override) :background "#0ec685" :foreground "#232627") - ((tide-hl-identifier-face &override) :background "#9b1bed" :foreground "#232627") - ((selection &override) :background "#9b1bed") - ((default &override) :background "#0e0911") - ((window-divider &override) :foreground purple3) - - - - ((font-lock-comment-face &override) - :background (if zt-brighter-comments (doom-lighten bg 0.05))) - (mode-line - :background modeline-bg :foreground modeline-fg - :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg))) - (mode-line-inactive - :background modeline-bg-inactive :foreground modeline-fg-alt - :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive))) - (mode-line-emphasis :foreground (if zt-brighter-modeline base8 highlight)) - - ;;;; css-mode / scss-mode - (css-proprietary-property :foreground orange) - (css-property :foreground green) - (css-selector :foreground blue) - ;;;; doom-modeline - (doom-modeline-bar :background (if zt-brighter-modeline modeline-bg highlight)) - (doom-modeline-buffer-file :inherit 'mode-line-buffer-id :weight 'bold) - (doom-modeline-buffer-path :inherit 'mode-line-emphasis :weight 'bold) - (doom-modeline-buffer-project-root :foreground green :weight 'bold) - ;;;; elscreen - (elscreen-tab-other-screen-face :background "#353a42" :foreground "#1e2022") - ;;;; ivy - (ivy-current-match :background dark-blue :distant-foreground base0 :weight 'normal) - ;;;; LaTeX-mode - (font-latex-math-face :foreground green) - ;;;; markdown-mode - (markdown-markup-face :foreground base5) - (markdown-header-face :inherit 'bold :foreground red) - ((markdown-code-face &override) :background (doom-lighten base3 0.05)) - ;;;; rjsx-mode - (rjsx-tag :foreground red) - (rjsx-attr :foreground orange) - ;;;; solaire-mode - (solaire-mode-line-face - :inherit 'mode-line - :background modeline-bg-alt - :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-alt))) - (solaire-mode-line-inactive-face - :inherit 'mode-line-inactive - :background modeline-bg-inactive-alt - :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-alt)))) - - ;;;; Base theme variable overrides- - ()) - -;;; zt-theme.el ends here diff --git a/.scripts/open_terminal b/.scripts/open_terminal index b928758..a2ef1b8 100755 --- a/.scripts/open_terminal +++ b/.scripts/open_terminal @@ -8,15 +8,13 @@ then PID=$(xprop -id $ACTIVE_WINDOW | grep _NET_WM_PID | grep -oP "\d+") if [[ "$PID" == "" ]] then - # WINIT_X11_SCALE_FACTOR=1.3 alacritty - alacritty + WINIT_X11_SCALE_FACTOR=1.3 alacritty fi # Get first child of terminal CHILD_PID=$(pgrep -P $PID) if [[ "$PID" == "" ]] then - # WINIT_X11_SCALE_FACTOR=1.3 alacritty - alacritty + WINIT_X11_SCALE_FACTOR=1.3 alacritty fi # Get current directory of child. The first child should be the shell. pushd "/proc/${CHILD_PID}/cwd" diff --git a/.xprofile b/.xprofile index 0977341..837554b 100755 --- a/.xprofile +++ b/.xprofile @@ -4,25 +4,35 @@ [[ -f ~/.config/zsh/.zshenv ]] && source ~/.config/zsh/.zshenv # makes gnome-keyring work -dbus-update-activation-environment --all & +# dbus-update-activation-environment --all & # autostart apps for both xmonad and any other DE -emacs --daemon & +# emacs --daemon & #virtual_mic.sh & +nitrogen --restore & + +# turn on the red danger light on the side +# so i know it's turned on without opening the lid +brightnessctl --device hp::hddprotect set 100% + # autostart apps only for XMonad -if [[ "$DESKTOP_SESSION" = "xmonad" ]]; then - screensetup.sh & +if [[ "$DESKTOP_SESSION" = "dwm" ]]; then + # screensetup.sh & # autostart apps - nitrogen --restore & - picom & - dunst & - udiskie & + # picom & + # dunst & + # udiskie & # glava -dm radial & - polystart & - nm-applet & - blueman-applet & - flameshot & + # polystart & + # nm-applet & + # blueman-applet & + # flameshot & + + while :; do + xsetroot -name "BAT: $(acpi | awk '{print $4}' | sed s/,//) | $(date '+%Y-%m-%d %H:%M:%S')" + sleep 1 + done & fi -- cgit v1.2.3