hazel
/
etc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

init move to 21.11

canon
Hazel Levine 7 months ago
parent
15a6af142f
commit
b9ec71efe9
Signed by: hazel GPG Key ID: 1884029A28789A62
7 changed files with 622 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      config/doom/config.org
  2. 562
      config/doom/themes/doom-earl-grey-theme.el
  3. 42
      flake.lock
  4. 21
      flake.nix
  5. 9
      modules/agenix.nix
  6. 2
      modules/services/bitwarden.nix
  7. 6
      modules/shell/git.nix

29
config/doom/config.org
View File

@ -90,7 +90,7 @@ I use light themes. After years and years of dark themes, I came to the realizat
Right now I'm using the Leuven theme.
#+BEGIN_SRC emacs-lisp
(setq doom-theme 'leuven)
(setq doom-theme 'doom-earl-grey)
#+END_SRC
** Everything else
Enable line numbers, because those are nice, and make 'em relative:
@ -120,8 +120,13 @@ Copy Tecosaur's splash screen because I'm lazy:
:template non-default template file
:file file to use instead of template")
;; (defvar fancy-splash-template-colours
;; '(("$colour1" . "#335ea8"))
;; "list of colour-replacement alists of the form (\"$placeholder\" . 'theme-colour) which applied the template")
(defvar fancy-splash-template-colours
'(("$colour1" . "#335ea8"))
'(("$colour1" . keywords) ("$colour2" . type) ("$colour3" . base5) ("$colour4" . base8))
"list of colour-replacement alists of the form (\"$placeholder\" . 'theme-colour) which applied the template")
(unless (file-exists-p (expand-file-name "theme-splashes" doom-cache-dir))
@ -149,7 +154,7 @@ Copy Tecosaur's splash screen because I'm lazy:
(dolist (substitution fancy-splash-template-colours)
(goto-char (point-min))
(while (re-search-forward (car substitution) nil t)
(replace-match (cdr substitution) nil nil)))
(replace-match (doom-color (cdr substitution)) nil nil)))
(write-region nil nil
(fancy-splash-filename (symbol-name doom-theme) height) nil nil)))
@ -512,13 +517,13 @@ Then enable it. It takes care of the file extensions itself.
(defvar hzl/modeline-green "#c0e8c3")
(defvar hzl/modeline-red "#ffc8c8")
(custom-set-faces!
`(doom-modeline-info :foreground ,hzl/modeline-green)
`(doom-modeline-debug :foreground ,hzl/modeline-green)
`(doom-modeline-urgent :foreground ,hzl/modeline-red)
`(doom-modeline-buffer-minor-mode :foreground ,hzl/modeline-green)
`(doom-modeline-evil-motion-state :foreground ,hzl/modeline-green)
`(doom-modeline-evil-normal-state :foreground ,hzl/modeline-green)
`(doom-modeline-buffer-modified :foreground ,hzl/modeline-red)
`(doom-modeline-project-dir :foreground ,hzl/modeline-green))
;; (custom-set-faces!
;; `(doom-modeline-info :foreground ,hzl/modeline-green)
;; `(doom-modeline-debug :foreground ,hzl/modeline-green)
;; `(doom-modeline-urgent :foreground ,hzl/modeline-red)
;; `(doom-modeline-buffer-minor-mode :foreground ,hzl/modeline-green)
;; `(doom-modeline-evil-motion-state :foreground ,hzl/modeline-green)
;; `(doom-modeline-evil-normal-state :foreground ,hzl/modeline-green)
;; `(doom-modeline-buffer-modified :foreground ,hzl/modeline-red)
;; `(doom-modeline-project-dir :foreground ,hzl/modeline-green))
#+END_SRC

562
config/doom/themes/doom-earl-grey-theme.el
View File

@ -0,0 +1,562 @@
;;; doom-earl-grey-theme.el --- a gentle color scheme, for code -*- no-byte-compile: t; -*-
(require 'doom-themes)
;;
(defgroup doom-earl-grey-theme nil
"Options for doom-themes"
:group 'doom-themes)
(defcustom doom-earl-grey-brighter-modeline nil
"If non-nil, more vivid colors will be used to style the mode-line."
:group 'doom-earl-grey-theme
:type 'boolean)
(defcustom doom-earl-grey-brighter-comments nil
"If non-nil, comments will be highlighted in more vivid colors."
:group 'doom-earl-grey-theme
:type 'boolean)
(defcustom doom-earl-grey-comment-bg doom-earl-grey-brighter-comments
"If non-nil, comments will have a subtle, darker background. Enhancing their
legibility."
:group 'doom-earl-grey-theme
:type 'boolean)
(defcustom doom-earl-grey-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 'doom-earl-grey-theme
:type '(choice integer boolean))
;;
(def-doom-theme doom-earl-grey
"A gentle color scheme for code."
;; name default 256 16
(
;; Earl Grey Colors
(eg-fg '("#605A52" "#626262" ""))
(eg-fg2 '("#4C4741" "#4e4e4e" ""))
(eg-bg '("#FCFBF9" "#FFFFFF" "white"))
(eg-bg2 '("#F7F3EE" "#FFFFFF" "white"))
(eg-purple '("#83577D" "#875FAF" "magenta"))
(eg-blue '("#556995" "#5F87AF" "brightblue"))
(eg-teal '("#477A7B" "#87AFAF" "brightgreen"))
(eg-orange '("#886A44" "#875F00" "brightred"))
(eg-green '("#747B4D" "#5F875F" "green"))
(eg-red '("#8F5652" "#870000" "red"))
(eg-grey1 '("#ECEBE8" "#E4E4E4" "white"))
(eg-grey2 '("#DDDBD8" "#DADADA" "brightblack"))
(eg-grey3 '("#CDCBC7" "#C6C6C6" "brightblack"))
(eg-grey4 '("#BEBBB6" "#B2B2B2" "brightblack"))
(eg-grey5 '("#AEABA6" "#A8A8A8" "brightblack"))
(eg-grey6 '("#9E9A95" "#949494" "brightblack"))
(eg-grey7 '("#8F8A84" "#8A8A8A" "brightblack"))
(eg-grey8 '("#7F7A73" "#767676" "brightblack"))
(eg-grey9 '("#706A63" "#6C6C6C" "brightblack"))
(eg-purple1 '("#F0EBED" "#D7D7FF" "brightmagenta"))
(eg-purple2 '("#E4DAE0" "#D7D7FF" "brightmagenta"))
(eg-purple3 '("#D8CAD4" "#D7D7FF" "brightmagenta"))
(eg-purple4 '("#CCB9C7" "#D7D7FF" "brightmagenta"))
(eg-purple5 '("#C0A9BB" "#AF87FF" "brightmagenta"))
(eg-purple6 '("#B399AF" "#AF87FF" "brightmagenta"))
(eg-purple7 '("#A788A2" "#AF87FF" "brightmagenta"))
(eg-purple8 '("#9B7896" "#AF87FF" "magenta"))
(eg-purple9 '("#8F6789" "#AF87FF" "magenta"))
(eg-blue1 '("#EBECEF" "#87D7FF" "brightblue"))
(eg-blue2 '("#DBDEE5" "#87D7FF" "brightblue"))
(eg-blue3 '("#CACFDB" "#87D7FF" "brightblue"))
(eg-blue4 '("#B9C1D1" "#87D7FF" "brightblue"))
(eg-blue5 '("#A9B2C7" "#87D7FF" "brightblue"))
(eg-blue6 '("#98A3BD" "#87AFFF" "brightblue"))
(eg-blue7 '("#8795B3" "#87AFFF" "brightblue"))
(eg-blue8 '("#7686A9" "#87AFFF" "blue"))
(eg-blue9 '("#66789F" "#87AFFF" "blue"))
(eg-teal1 '("#EAEEEC" "#5FD7D7" "brightgreen"))
(eg-teal2 '("#D8E1E0" "#5FD7D7" "brightgreen"))
(eg-teal3 '("#C6D4D3" "#5FD7D7" "brightgreen"))
(eg-teal4 '("#B4C7C7" "#5FD7D7" "brightgreen"))
(eg-teal5 '("#A2BBBA" "#5FD7D7" "brightgreen"))
(eg-teal6 '("#8FAEAD" "#00AFAF" "brightgreen"))
(eg-teal7 '("#7DA1A1" "#00AFAF" "brightgreen"))
(eg-teal8 '("#6B9494" "#00AFAF" "brightgreen"))
(eg-teal9 '("#598788" "#00AFAF" "brightgreen"))
(eg-orange1 '("#F0EDE7" "#D7AF5F" "brightred"))
(eg-orange2 '("#E5DED5" "#D7AF5F" "brightred"))
(eg-orange3 '("#D9D0C3" "#D7AF5F" "brightred"))
(eg-orange4 '("#CEC1B1" "#D7AF5F" "brightred"))
(eg-orange5 '("#C2B39F" "#D7AF5F" "brightred"))
(eg-orange6 '("#B6A48C" "#D7AF5F" "brightred"))
(eg-orange7 '("#AB967A" "#D7AF5F" "brightred"))
(eg-orange8 '("#9F8768" "#D7AF5F" "brightred"))
(eg-orange9 '("#947956" "#D7AF5F" "brightred"))
(eg-green1 '("#EEEEE8" "#5FAF5F" "green"))
(eg-green2 '("#E1E1D7" "#5FAF5F" "green"))
(eg-green3 '("#D3D5C5" "#5FAF5F" "green"))
(eg-green4 '("#C6C8B4" "#5FAF5F" "green"))
(eg-green5 '("#B8BBA3" "#5FAF5F" "green"))
(eg-green6 '("#AAAE92" "#5F875F" "green"))
(eg-green7 '("#9DA181" "#5F875F" "green"))
(eg-green8 '("#8F956F" "#5F875F" "green"))
(eg-green9 '("#82885E" "#5F875F" "green"))
(eg-red1 '("#F1EBE8" "#d78787" "brightred"))
(eg-red2 '("#E6DAD8" "#d78787" "brightred"))
(eg-red3 '("#DBCAC7" "#d78787" "brightred"))
(eg-red4 '("#D0B9B6" "#d78787" "brightred"))
(eg-red5 '("#C6A9A6" "#d78787" "brightred"))
(eg-red6 '("#BB9895" "#d75f5f" "brightred"))
(eg-red7 '("#B08884" "#d75f5f" "brightred"))
(eg-red8 '("#A57773" "#d75f5f" "red"))
(eg-red9 '("#9A6763" "#d75f5f" "red"))
(bg eg-bg)
(bg-alt eg-bg2)
(base0 (doom-lighten bg 0.1))
(base1 eg-grey2)
(base2 eg-grey3)
(base3 eg-grey4)
(base4 eg-grey5)
(base5 eg-grey6)
(base6 eg-grey7)
(base7 eg-grey8)
(base8 eg-fg2)
(fg eg-fg)
(fg-alt eg-grey8)
(grey base5)
(red eg-red)
(orange eg-orange)
(green eg-green)
(teal eg-teal)
(yellow eg-orange)
(blue eg-blue)
(dark-blue eg-blue)
(magenta eg-purple)
(violet eg-purple)
(cyan eg-teal)
(dark-cyan eg-teal)
;; face categories -- required for all themes
(highlight eg-blue8)
(vertical-bar base2)
(selection eg-purple4)
(builtin fg)
(comments (if doom-earl-grey-brighter-comments
eg-grey7
eg-grey6))
(doc-comments comments)
(constants teal)
(functions fg)
(keywords magenta)
(methods fg)
(operators fg)
(type fg)
(strings green)
(variables blue)
(numbers teal)
(region eg-purple1)
(error red)
(warning yellow)
(success green)
(vc-modified orange)
(vc-added green)
(vc-deleted red)
;; custom categories
(hidden `(,(car bg) "black" "black"))
(-modeline-bright doom-earl-grey-brighter-modeline)
(-modeline-pad
(when doom-earl-grey-padded-modeline
(if (integerp doom-earl-grey-padded-modeline)
doom-earl-grey-padded-modeline 4)))
(modeline-fg nil)
(modeline-fg-alt eg-grey6)
(modeline-bg
(if -modeline-bright
(doom-darken eg-grey2 0.1)
eg-grey2))
(modeline-bg-l
(if -modeline-bright
base2
(doom-blend base1 fg 0.96)))
(modeline-bg-inactive eg-grey1)
(modeline-bg-inactive-l `(,(doom-darken (car bg-alt) 0.05) ,@(cdr base1))))
;; --- extra faces ------------------------
(
;; Modeline
(doom-modeline-buffer-path :foreground blue)
(doom-modeline-buffer-major-mode :inherit 'doom-modeline-buffer-path
:bold 'bold)
(doom-modeline-info :foreground green)
(doom-modeline-project-dir :foreground magenta)
(doom-modeline-evil-insert-state :foreground teal)
(doom-modeline-bar :background (if -modeline-bright modeline-bg highlight))
(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 -modeline-bright base8 highlight))
(doom-modeline-project-root-dir :foreground base6)
;; solaire
(solaire-mode-line-face
:inherit 'mode-line
:background modeline-bg-l
:box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-l)))
(solaire-mode-line-inactive-face
:inherit 'mode-line-inactive
:background modeline-bg-inactive-l
:box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-inactive-l)))
;; Font-Lock
(font-lock-comment-face
:foreground comments
:background (if doom-earl-grey-comment-bg base1)
:inherit 'italic)
(font-lock-doc-face
:inherit 'font-lock-comment-face
:foreground doc-comments)
(font-lock-comment-delimiter-face :inherit font-lock-comment-face)
(font-lock-builtin-face :foreground fg
:inherit 'italic :extend t)
(font-lock-type-face :foreground fg
:inherit 'italic :extend t)
(font-lock-variable-name-face :foreground blue)
(font-lock-warning-face :foreground red)
(font-lock-negation-char-face :foreground orange
:inherit 'default
:extend t)
(font-lock-preprocessor-face :foreground orange
:inherit 'default
:extend t)
(font-lock-preprocessor-char-face :inherit 'default)
(font-lock-regexp-grouping-backslash :inherit 'default)
(font-lock-regexp-grouping-construct :inherit 'default)
(font-lock-constant-face :foreground teal)
(font-lock-function-name-face :foreground fg
:inherit 'italic :extend t)
;; makefile-*-mode
(makefile-targets :foreground magenta)
(makefile-space :background eg-red2)
(makefile-makepp-perl :background eg-blue1)
;; which-key
(which-key-key-face :foreground eg-purple8)
(which-key-group-description-face :foreground eg-blue8)
(which-key-command-description-face :foreground fg)
(which-key-local-map-description-face :foreground orange)
(which-key-separator-face :background bg-alt
:foreground comments)
;; highlight-numbers-mode
(highlight-numbers-number :foreground teal)
;; web-mode
(web-mode-doctype-face :foreground comments)
(web-mode-html-tag-face :foreground magenta)
(web-mode-html-attr-name-face :foreground blue)
(web-mode-html-attr-value-face :inherit 'font-lock-string-face)
(web-mode-html-entity-face :foreground orange
:inherit 'italic)
(web-mode-block-control-face :foreground magenta)
(web-mode-html-tag-bracket-face :foreground fg-alt)
(web-mode-symbol-face :foreground blue)
(web-mode-string-face :inherit 'font-lock-string-face)
(web-mode-current-element-highlight-face :foreground bg)
;; xml
(nxml-element-local-name :foreground magenta)
;; ocaml
(tuareg-font-lock-governing-face :foreground magenta)
(tuareg-font-lock-operator-face :foreground orange)
;; haskell
(haskell-constructor-face :foreground teal)
(haskell-operator-face :foreground fg)
((haskell-type-face &override)
:foreground blue
:inherit 'font-lock-type-face
:extend t)
((haskell-definition-face &override)
:foreground magenta
:inherit 'font-lock-function-name-face
:extend t)
;; Highlight
(lazy-highlight :foreground eg-fg2
:background eg-blue2 :inherit 'default :extend t)
;; php
(php-$this :foreground orange)
;; rjsx-mode
(rjsx-tag :foreground magenta)
(rjsx-text :inherit 'default)
(rjsx-tag-bracket-face :foreground fg-alt)
(rjsx-attr :foreground blue)
;; highlight-quoted-mode
(highlight-quoted-symbol :foreground blue)
(highlight-quoted-quote :foreground teal)
;; rainbow-delimiters
(rainbow-delimiters-depth-1-face :foreground eg-blue6)
(rainbow-delimiters-depth-2-face :foreground eg-purple6)
(rainbow-delimiters-depth-3-face :foreground eg-green6)
(rainbow-delimiters-depth-4-face :foreground eg-orange6)
(rainbow-delimiters-depth-5-face :foreground eg-teal6)
(rainbow-delimiters-depth-6-face :foreground eg-blue6)
(rainbow-delimiters-depth-7-face :foreground eg-purple6)
(rainbow-delimiters-unmatched-face :foreground red
:weight 'bold
:inverse-video t)
(rainbow-delimiters-mismatched-face
:inherit 'rainbow-delimiters-unmatched-face)
;; swiper
(swiper-line-face :background eg-purple2
:foreground fg
:weight 'semi-bold)
(swiper-match-face-1 :inherit 'unspecified
:background eg-purple1
:foreground fg)
(swiper-background-match-face-1 :inherit 'unspecified
:background eg-bg2
:foreground fg)
(swiper-match-face-2 :inherit 'unspecified
:background eg-purple1
:foreground eg-purple)
(swiper-background-match-face-2 :inherit 'unspecified
:background eg-purple1
:foreground eg-purple
:weight 'semi-bold)
(swiper-match-face-3 :inherit 'unspecified
:background eg-blue1
:foreground blue)
(swiper-background-match-face-3 :inherit 'unspecified
:background eg-blue1
:foreground blue
:weight 'semi-bold)
(swiper-match-face-4 :inherit 'unspecified
:background eg-teal1
:foreground teal)
(swiper-background-match-face-4 :inherit 'unspecified
:background eg-teal1
:foreground teal
:weight 'semi-bold)
;; tooltip
(tooltip :background bg-alt :foreground fg)
;; company
(company-tooltip :inherit 'tooltip)
(company-tooltip-annotation :foreground magenta)
(company-tooltip-annotation-selection :foreground magenta )
(company-tooltip-common :foreground magenta
:distant-foreground bg-alt
:weight 'bold)
(company-tooltip-search :background magenta
:foreground bg
:distant-foreground fg
:weight 'bold)
(company-tooltip-search-selection :background eg-purple1)
(company-tooltip-selection :background eg-purple1
:weight 'bold)
(company-tooltip-mouse :background eg-purple8
:foreground bg
:distant-foreground fg)
(company-tooltip-annotation :foreground magenta
:distant-foreground bg)
(company-scrollbar-bg :inherit 'tooltip)
(company-scrollbar-fg :background highlight)
(company-preview :foreground comments)
(company-preview-common :background base3
:foreground highlight)
(company-preview-search :inherit 'company-tooltip-search)
(company-template-field :inherit 'match)
(company-echo-common :background eg-red2
:foreground fg)
;; company-box
(company-box-candidate :foreground fg)
((region &override)
:foreground fg)
((line-number &override) :foreground base4)
((line-number-current-line &override) :foreground base6)
((paren-face-match &override) :foreground red :background eg-grey1 :weight 'ultra-bold)
((paren-face-mismatch &override) :foreground base3 :background red :weight 'ultra-bold)
((vimish-fold-overlay &override) :inherit 'font-lock-comment-face :background base3 :weight 'light)
((vimish-fold-fringe &override) :foreground teal)
;; parens
((show-paren-match &override)
:background eg-grey1)
;; elscreen
(elscreen-tab-other-screen-face :background bg-alt :foreground fg)
;; Magit
(magit-diff-hunk-heading-highlight :foreground bg :background eg-blue8 :weight 'bold)
(magit-diff-hunk-heading :foreground bg :background eg-blue3)
(magit-blame-heading :foreground magenta
:background eg-grey1 :extend t)
(magit-blame-date :foreground blue)
(git-commit-summary :foreground fg)
;; Dired
(diredfl-date-time :foreground blue)
(diredfl-dir-heading :foreground magenta :weight 'bold)
;; ivy
(ivy-posframe :background eg-blue1)
(ivy-virtual :foreground eg-blue8)
(ivy-cursor :foreground bg-alt
:background fg)
(ivy-minibuffer-match-face-1
:background nil
:foreground comments
:weight 'semi-bold)
(ivy-minibuffer-match-face-2
:inherit 'ivy-minibuffer-match-face-1
:foreground eg-purple :background eg-purple1)
(ivy-minibuffer-match-face-3
:inherit 'ivy-minibuffer-match-face-2
:foreground blue :background eg-orange1)
(ivy-minibuffer-match-face-4
:inherit 'ivy-minibuffer-match-face-2
:foreground teal :background eg-teal1)
(ivy-current-match :background eg-purple2 :extend 't)
(internal-border
:foreground eg-blue8
:background eg-blue1)
;; --- major-mode faces -------------------
;; css-mode / scss-mode
(css-property :foreground blue
:inherit 'italic)
(css-proprietary-property :foreground orange)
(css-selector :foreground magenta)
(web-mode-css-property-name-face :foreground fg)
;; markdown-mode
(markdown-header-face :inherit 'bold
:foreground magenta)
(markdown-header-delimiter-face :inherit 'markdown-header-face)
(markdown-metadata-key-face :foreground green)
(markdown-list-face :foreground fg
:inherit 'bold)
(markdown-link-face :foreground teal)
(markdown-url-face :foreground blue)
(markdown-italic-face :inherit 'italic
:foreground fg)
(markdown-bold-face :inherit 'bold
:foreground fg)
(markdown-markup-face :foreground fg
:inherit 'bold)
(markdown-blockquote-face :inherit 'italic
:foreground orange)
(markdown-pre-face :foreground orange
:extend t)
(markdown-code-face :foreground orange
:extend t)
(markdown-reference-face :foreground blue)
(markdown-inline-code-face :inherit '(markdown-code-face markdown-pre-face)
:extend nil)
(markdown-html-attr-name-face :inherit 'font-lock-variable-name-face)
(markdown-html-attr-value-face :inherit 'font-lock-string-face)
(markdown-html-entity-face :inherit 'font-lock-variable-name-face)
(markdown-html-tag-delimiter-face :inherit 'default)
(markdown-html-tag-name-face :inherit 'font-lock-keyword-face)
(nav-flash-face :background eg-purple1 :foreground fg :weight 'bold)
;; org-mode
((outline-1 &override) :foreground magenta)
((outline-2 &override) :foreground red)
((outline-3 &override) :foreground teal)
((outline-4 &override) :foreground orange)
((outline-5 &override) :foreground magenta)
((outline-6 &override) :foreground red)
((outline-7 &override) :foreground teal)
((outline-8 &override) :foreground orange)
(org-drawer :foreground eg-orange)
(org-ellipsis :underline nil :background bg :foreground red)
((org-block-begin-line &override)
:foreground orange
:background bg-alt
:weight 'semi-bold
:extend t)
((org-block &override)
:background bg-alt
:foreground fg
:extend t)
((org-quote &override)
:foreground orange
:background bg-alt
:extend t)
((org-document-title &override)
:foreground magenta)
;; js2-mode
(js2-function-param :foreground blue)
(js2-function-call :foreground fg :inherit 'italic)
(js2-object-property :foreground fg)
(js2-jsdoc-tag :foreground doc-comments)
(js2-external-variable :foreground fg)
;; racket
(racket-keyword-argument-face :foreground orange)
(racket-selfeval-face :foreground teal)
(racket-debug-break-face :foreground bg :background red)
;; clojure
(clojure-keyword-face :foreground blue)
;; elixir
(elixir-atom-face :foreground blue)
(elixir-attribute-face :foreground teal)
;; lsp
(lsp-ui-doc-background :background bg-alt)
(lsp-face-highlight-read :inherit 'lazy-highlight)
(lsp-face-highlight-textual :inherit 'lsp-face-highlight-read)
(lsp-face-highlight-write :inherit 'lsp-face-highlight-read)
;; doom dashboard
(doom-dashboard-banner :foreground eg-grey5)
(doom-dashboard-menu-title :foreground eg-purple8)
(doom-dashboard-menu-desc :foreground eg-green8)
(doom-dashboard-footer-icon :foreground eg-orange8)
(doom-dashboard-loaded :foreground eg-blue8)
;; evil-snipe
(evil-snipe-first-match-face :foreground bg :background blue)
;; End
)
;; --- extra variables ---------------------
()
)
;;; doom-earl-grey-theme.el ends here

42
flake.lock
View File

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1631896269,
"narHash": "sha256-DAyCxJ8JacayOzGgGSfzrn7ghtsfL/EsCyk1NEUaAR8=",
"lastModified": 1637458245,
"narHash": "sha256-2k0u5hO0o9p8LmcyDjGAEdZge7GGvZnKkJZEarLI9pA=",
"owner": "ryantm",
"repo": "agenix",
"rev": "daf1d773989ac5d949aeef03fce0fe27e583dbca",
"rev": "4a93de2bebf58a458611a5918a0ddd82d4ed15b1",
"type": "github"
},
"original": {
@ -22,11 +22,11 @@
},
"emacs-overlay": {
"locked": {
"lastModified": 1633800404,
"narHash": "sha256-BcsD5vsERRfvaXMJNOhW1Picr8KoqI25i0yjbuyeF3g=",
"lastModified": 1637601973,
"narHash": "sha256-FGSCh1RoukoEACBvyOcKSrvG4pHJj+RbPo7crGa1qTQ=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "5a05dd3c06455a6fdb9439fd2fa84a68a9d8e559",
"rev": "c7f51932424258572ab6790c3250384c8524a4c8",
"type": "github"
},
"original": {
@ -57,11 +57,11 @@
]
},
"locked": {
"lastModified": 1633596850,
"narHash": "sha256-5+qVLYvfOropjLAvpQs/APtD8eYnEIbAd9a36lGHZM0=",
"lastModified": 1637019201,
"narHash": "sha256-lq4gz51fx4m5FXfx1SCB444aEBeaYtLMVm3P18Wi9ls=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "49695f33aac22358b59e49c94fe6472218e5d766",
"rev": "bcf03fa16a1f06b8a0abb27bf49afa8d6fffe8f1",
"type": "github"
},
"original": {
@ -73,11 +73,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1633793047,
"narHash": "sha256-XSMlHMVPKwcEqyHGdFj/ZeGMeZeKNwVExOfLlxcg4oE=",
"lastModified": 1637564544,
"narHash": "sha256-wwdjkfdQEbFn+Gr1iBiA5DGgl+Q7PASL83Swo/Wqwy0=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "3aabf78bfcae62f5f99474f2ebbbe418f1c6e54f",
"rev": "08cda8e3a5a4e685af525e5a589dfeb74267d505",
"type": "github"
},
"original": {
@ -88,11 +88,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1633709683,
"narHash": "sha256-KVJEToVd6SuUqc2XFIpfSjns07orqEWzIq9AcF/SIf8=",
"lastModified": 1637448181,
"narHash": "sha256-ujcXli4esmtIHUBjE1BjmMuBWrcNvlHZrVXx56i5B1M=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ce7a1190a0fa4ba3465b5f5471b08567060ca14c",
"rev": "d5b65f812cd4f5a8fa74b406075b59a46f1cfd98",
"type": "github"
},
"original": {
@ -104,11 +104,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1633329294,
"narHash": "sha256-0LpQLS4KMgxslMgmDHmxG/5twFlXDBW9z4Or1iOrCvU=",
"lastModified": 1637593665,
"narHash": "sha256-R7jKS7A+0tZS8qD5pBr1UFcMiTdsw5bfoxgXbYsoWhM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ee084c02040e864eeeb4cf4f8538d92f7c675671",
"rev": "98747f27ecfee70c8c97b195cbb94df80a074dda",
"type": "github"
},
"original": {
@ -239,11 +239,11 @@
"zsh-syntax-highlighting": {
"flake": false,
"locked": {
"lastModified": 1632454857,
"narHash": "sha256-vwtgFWEs51ZfrUbWmRjcHZz+WPMFUrSHfIt4FjrMOoU=",
"lastModified": 1636857900,
"narHash": "sha256-MeuPqDeJpbJi2hT7VUgyQNSmDPY/biUncvyY78IBfzM=",
"owner": "zsh-users",
"repo": "zsh-syntax-highlighting",
"rev": "1a9264bc661b3d52756916bf9ec3f41687d64db2",
"rev": "c7caf57ca805abd54f11f756fda6395dd4187f8a",
"type": "github"
},
"original": {

21
flake.nix
View File

@ -3,12 +3,12 @@
description = "maybe you'd have less problems if you weren't on a zoomer distro";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.0";
home-manager = {
url = "github:nix-community/home-manager/release-21.05";
url = "github:nix-community/home-manager/release-21.11";
inputs.nixpkgs.follows = "nixpkgs";
};
agenix = {
@ -57,7 +57,7 @@
channels: [
(final: prev: {
inherit (channels.unstable)
thunderbird obs-studio;
thunderbird obs-studio agda;
hazel = {
perihelion = prev.callPackage (import inputs.perihelion) {};
@ -73,12 +73,21 @@
./configuration.nix
./machines/hyacinth
nixos-hardware.nixosModules.lenovo-thinkpad-t495
agenix.nixosModules.age
home-manager.nixosModules.home-manager
nixpkgs.nixosModules.notDetected # enable nonfree firmwares
];
kerria.modules = [
./configuration.nix
./machines/kerria
nixos-hardware.nixosModules.pcengines-apu
agenix.nixosModules.age
home-manager.nixosModules.home-manager
nixpkgs.nixosModules.notDetected # enable nonfree firmwares
simple-nixos-mailserver.nixosModule
./modules/services/mail.nix
@ -100,11 +109,5 @@
}
];
};
sharedModules = [
nixpkgs.nixosModules.notDetected # enable nonfree firmwares
home-manager.nixosModules.home-manager
agenix.nixosModules.age
];
};
}

9
modules/agenix.nix
View File

@ -16,11 +16,8 @@ with lib;
file = ./. + "${secretsDir}/${n}";
mode = "0444";
}) (import (./. + secretsFile));
sshKeyPaths =
(if config.services.openssh.enable then
map (e: e.path) (lib.filter (e: e.type == "rsa" || e.type == "ed25519") config.services.openssh.hostKeys)
else []) ++ [
"/etc/agenix/id_ed25519"
];
sshKeyPaths = options.age.sshKeyPaths.default ++ [
"/etc/agenix/id_ed25519"
];
};
}

2
modules/services/bitwarden.nix
View File

@ -17,7 +17,7 @@ with lib; {
# not forwarded -- testing only due to HTTPS restrictions
networking.firewall.allowedTCPPorts = [ 8080 ];
services.bitwarden_rs = {
services.vaultwarden = {
enable = true;
dbBackend = "sqlite";
environmentFile = config.age.secrets.bitwardenEnv.path;

6
modules/shell/git.nix
View File

@ -11,6 +11,12 @@
key = "593067D35E5CA280959CEC3735C1205716621182";
signByDefault = true;
};
aliases = {
wip = ''!git add --all && git commit --message "WIP - $(date)"'';
};
delta.enable = true;
};
# HOO BOY

Write Preview
Loading…
Cancel
Save