diff --git a/ext/doom/config.el b/ext/doom/config.el new file mode 100644 index 0000000..35699c9 --- /dev/null +++ b/ext/doom/config.el @@ -0,0 +1,183 @@ +;;; $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-ont' -- a non-monospace font (where applicable) +;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; - `doom-unicode-font' -- for unicode glyphs +;; - `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 nerd-icons-font-names '("SymbolsNerdFontMono-Regular.ttf")) + +(setq doom-font (font-spec :family "FiraCode Nerd Font" :size 14) + ;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13) + ;; doom-symbol-font (font-spec :family "all-the-icons" :size 13) + doom-big-font (font-spec :family "FiraCode Nerd Font" :size 18 :weight 'demibold)) + +(defun add-back-emoji-fallback-font-families () + (when (fboundp 'set-fontset-font) + (let ((fn (doom-rpartial #'member (font-family-list)))) + (when-let (font (cl-find-if fn doom-emoji-fallback-font-families)) + (set-fontset-font t 'unicode font nil 'append))))) + +;; (add-hook 'after-setting-font-hook 'add-back-emoji-fallback-font-families) + +;; +;; 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/") + + +;; 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. + +;; Nix + +(use-package! nixpkgs-fmt + :hook (nix-mode . nixpkgs-fmt-on-save-mode)) + +;; Shell stuff;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(setq shell-file-name (executable-find "bash")) + +(setq-default vterm-shell (executable-find "fish")) + +;; TABS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(use-package centaur-tabs + :init + (setq centaur-tabs-enable-key-bindings t) + :config + (setq centaur-tabs-style "wave" + centaur-tabs-height 32 + centaur-tabs-set-icons t + centaur-tabs-show-new-tab-button t + centaur-tabs-show-navigation-buttons t + centaur-tabs-set-bar 'under + centaur-tabs-show-count t + centaur-tabs-gray-out-icons 'buffer + x-underline-at-descent-line t + centaur-tabs-set-modified-marker t + centaur-tabs-modified-marker "•" + centaur-tabs-close-button "x" + centaur-tabs-cycle-scope 'tabs + centaur-tabs-adjust-buffer-order t + centaur-tabs-left-edge-margin nil) + + (centaur-tabs-change-fonts (face-attribute 'default :font) 110) + (centaur-tabs-headline-match) + (centaur-tabs-group-by-projectile-project) + ;; (centaur-tabs-enable-buffer-alphabetical-reordering) + (centaur-tabs-mode t) + (setq uniquify-separator "/") + (setq uniquify-buffer-name-style 'forward) + + + (defvar categories-alist + '( + (:name "Terminal" :modes (vterm-mode term-mode) :type per-project) + (:name "Org" :modes (org-mode org-agenda-mode) :type global) + (:name "Misc" :modes (+doom-dashboard-mode native-comp-limple-mode messages-buffer-mode) :type global) + (:name "Misc" :modes (special-mode fundamental-mode) :type per-project) + ) + "Mapping of categories to modes with their respective type logic.") + + (defun get-project-name-or-default (default-name) + "Return the project name if available, or DEFAULT-NAME." + (if-let ((project-root (condition-case _err + (projectile-project-root) + (error nil)))) + (concat (projectile-project-name) "::" default-name) + default-name)) + + (defun get-category-name (mode) + "Get category name for the given MODE." + (let (category-name) + (dolist (category categories-alist category-name) + (let ((modes (plist-get category :modes))) + (when (or (null modes) (memq mode modes)) + (setq category-name + (if (eq (plist-get category :type) 'per-project) + (get-project-name-or-default (plist-get category :name)) + (plist-get category :name)))))))) + + (defun centaur-tabs-group-name-by-category () + "Get tab group name based on category." + (let ((mode-category (get-category-name major-mode))) + (if mode-category + (list mode-category) + (list (get-project-name-or-default "Main"))))) + + (defun centaur-tabs-projectile-buffer-groups () + "Return the list of group names BUFFER belongs to." + (if centaur-tabs-projectile-buffer-group-calc + (symbol-value 'centaur-tabs-projectile-buffer-group-calc) + (set (make-local-variable 'centaur-tabs-projectile-buffer-group-calc) + (centaur-tabs-group-name-by-category)))) + + (add-hook! '(+doom-dashboard-mode-hook +popup-buffer-mode-hook) + (defun +tabs-disable-centaur-tabs-mode-maybe-h () + "Disable `centaur-tabs-mode' in current buffer." + (when (centaur-tabs-mode-on-p) + (centaur-tabs-local-mode)))) + ) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/ext/doom/custom.el b/ext/doom/custom.el new file mode 100644 index 0000000..4244566 --- /dev/null +++ b/ext/doom/custom.el @@ -0,0 +1,14 @@ +(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 + '("88f7ee5594021c60a4a6a1c275614103de8c1435d6d08cc58882f920e0cec65e" "02f57ef0a20b7f61adce51445b68b2a7e832648ce2e7efb19d217b6454c1b644" "467dc6fdebcf92f4d3e2a2016145ba15841987c71fbe675dcfe34ac47ffb9195" "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" default)) + '(magit-todos-insert-after '(bottom) nil nil "Changed by setter of obsolete option `magit-todos-insert-at'")) +(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. + ) diff --git a/ext/doom/init.el b/ext/doom/init.el new file mode 100644 index 0000000..5b9ccc5 --- /dev/null +++ b/ext/doom/init.el @@ -0,0 +1,217 @@ +;;; 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 + +childframe) ; 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 +icons) ; 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 + +diff-hl + +pretty) ; vcs diff in the fringe + vi-tilde-fringe ; fringe tildes to mark beyond EOB + (window-select ; visually switch windows + +numbers) + 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 +icons) ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + (ibuffer +icons) ; interactive buffer management + (undo +tree) ; 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 + +childframe) ; tasing you for every semicolon you forget + (spell + +aspell + +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 + +docsets + +dictionary) ; 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 +lsp) ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + (org ; organize your plain life in plain text + +jupyter + +pomodoro + +journal + +pomodoro + +dragndrop + +gnuplot + +roam2 + +present) + ;;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 + +css) ; 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)) + +(after! doom-cli-env + ;; Allow SSH-related environment variables to be set in persistent configuration. + (add-to-list 'doom-env-allow "^SSH_")) diff --git a/ext/doom/packages.el b/ext/doom/packages.el new file mode 100644 index 0000000..0a4db0e --- /dev/null +++ b/ext/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! centaur-tabs) +(package! nixpkgs-fmt) + +;; 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/flake.lock b/flake.lock index b075409..0cb9523 100644 --- a/flake.lock +++ b/flake.lock @@ -29,11 +29,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1697533697, - "narHash": "sha256-rZfP1HrI+kCfgCwJKNu/RMuhXws0cguMkcRcIygrHG4=", + "lastModified": 1697707800, + "narHash": "sha256-0FqCKVbDilWqM/+5YSo5de0lGBeCG5NRShpK8arLqIM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c4804b8f1cf82bbe90436dcfb4ab113d9a9dbed2", + "rev": "2e57d25ca0727155acd795d857f37932c457dbf7", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1697059129, - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", + "lastModified": 1697456312, + "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", + "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "type": "github" }, "original": { @@ -230,11 +230,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697226376, - "narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=", + "lastModified": 1697583813, + "narHash": "sha256-SRXK2EBMZHlOAs/5bjphhX9XnIKR6peTV6i7yoL6/Lg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5", + "rev": "b5f8ec6be261dfc44c3b56b220e2793d1b61512b", "type": "github" }, "original": { @@ -246,11 +246,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1697226376, - "narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=", + "lastModified": 1697583813, + "narHash": "sha256-SRXK2EBMZHlOAs/5bjphhX9XnIKR6peTV6i7yoL6/Lg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5", + "rev": "b5f8ec6be261dfc44c3b56b220e2793d1b61512b", "type": "github" }, "original": { @@ -310,11 +310,11 @@ }, "nur": { "locked": { - "lastModified": 1697544658, - "narHash": "sha256-WehJ7I1lis82yKZVEIzKxnmzbwQXh3+14HAWvIMofQQ=", + "lastModified": 1697716025, + "narHash": "sha256-5gT33Zs2uGsiU43FNWN4GrRqNy/n+eOeGRapU9yy1Bs=", "owner": "nix-community", "repo": "NUR", - "rev": "564f727a32998fe4b2959843e86481a5fef523c9", + "rev": "9e80a4be10bd21688163db9b3d2c710e185a654e", "type": "github" }, "original": { @@ -411,11 +411,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1692543521, - "narHash": "sha256-/a6U3HkADtAZJq716PB4bxIw/7h5oEG6N7bvw8vTQtE=", + "lastModified": 1697576357, + "narHash": "sha256-nMlx9L5SaaRRzKeixx2TtRtE8RrWdK7h1jXba1TZcNs=", "owner": "blitz", "repo": "tuxedo-nixos", - "rev": "91f7d9ba249f5fd1357f8d55bc510c1641d54a52", + "rev": "a6a1b5cd29300f1b8b73f134f9f541e8c0c8c237", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a9bc58e..8a11420 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,8 @@ }; outputs = - { nixpkgs + { self + , nixpkgs , nixpkgs-unstable , nixos-unstable , home-manager @@ -106,6 +107,7 @@ inputs.tuxedo-nixos.nixosModules.default ]; args = { + inherit self; inherit inputs; inherit system; }; @@ -146,6 +148,7 @@ _module = { inherit args; }; xsession.enable = true; } + ] ++ hmModules; }; @@ -162,6 +165,7 @@ nixpkgs.pkgs = pkgs; home-manager.sharedModules = hmModules; + home-manager.extraSpecialArgs = args; } ] ++ osModules; diff --git a/home-mods/shell/default.nix b/home-mods/shell/default.nix index 25881d1..2f9a604 100644 --- a/home-mods/shell/default.nix +++ b/home-mods/shell/default.nix @@ -1,5 +1,9 @@ -{ config, pkgs, lib, ... }: - +{ self +, config +, pkgs +, lib +, ... +}: let doomemacsSrc = builtins.fetchGit { url = "https://github.com/doomemacs/doomemacs"; @@ -7,11 +11,6 @@ let rev = "986398504d09e585c7d1a8d73a6394024fe6f164"; }; - personalDoomConfSrc = builtins.fetchGit { - url = "https://git.vlt81.de/tristan/doom"; - ref = "main"; - rev = "c6558ab65f106628a3bdb890df935bb7965edd95"; - }; in { programs = { @@ -114,15 +113,17 @@ in home = { - activation.installDoomEmacs = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + activation.setupEmacs = lib.hm.dag.entryAfter [ "writeBoundary" ] '' mkdir ~/.config/emacs -p chmod u+rw -R ~/.config/emacs cp -r ${doomemacsSrc}/. "$HOME/.config/emacs" - mkdir ~/.config/doom -p - chmod u+rw -R ~/.config/doom - cp -r ${personalDoomConfSrc}/. "$HOME/.config/doom" ''; + file.".config/doom" = { + recursive = true; + source = ../../ext/doom; + }; + packages = with pkgs.unstable-pkgs; [ btop imagemagick diff --git a/users/tristand.nix b/users/tristand.nix index bf26398..072db10 100644 --- a/users/tristand.nix +++ b/users/tristand.nix @@ -2,36 +2,25 @@ , config , inputs , system -, lib , ... }: -let - desktop = import ../home-mods/desktop { - inherit pkgs; - inherit config; - inherit inputs; - }; -in { imports = [ ../home-mods/common - # ../home-mods/desktop + ../home-mods/shell + ../home-mods/desktop ../home-mods/dev ../home-mods/firefox ../home-mods/plasma ../home-mods/virt - ../home-mods/shell ]; - config = pkgs.lib.mkMerge [ - { - home = { - username = "tristand"; + config = { + home = { + username = "tristand"; - stateVersion = "23.05"; - }; - } - desktop - ]; + stateVersion = "23.05"; + }; + }; }