Updated system, fixes, culled lots of old config
This commit is contained in:
Emmet
@@ -42,6 +42,6 @@ I use this to pass a few attribute sets:
|
||||
- =userSettings= - Settings for the normal user (see [[../flake.nix][flake.nix]] for more details)
|
||||
- =systemSettings= - Settings for the system (see [[../flake.nix][flake.nix]] for more details)
|
||||
- =inputs= - Flake inputs (see [[../flake.nix][flake.nix]] for more details)
|
||||
- =pkgs= - Set to unstable for client devices and stable for server devices
|
||||
- =pkgs-stable= - Allows me to include stable versions of packages along with (my default) unstable versions of packages
|
||||
- =pkgs-emacs= - Pinned version of nixpkgs I use for Emacs and its dependencies
|
||||
- =pkgs-kdenlive= - Pinned version of nixpkgs I use for kdenlive
|
||||
- =pkgs-unstable= - Allows me to force unstable versions of packages on server devices
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
#+title: Doom Emacs
|
||||
|
||||
* What is Doom Emacs?
|
||||
[[https://github.com/doomemacs/doomemacs][Doom Emacs]] is a distribution of the [[https://www.gnu.org/software/emacs/][Emacs Text Editor]] designed for [[https://www.vim.org/][Vim]] users. I like to use Emacs due to its extensibility and extra features it is capable of (besides text editing). Some of these extra features include:
|
||||
- [[https://orgmode.org/][Org Mode]] (Hierarchical text-based document format)
|
||||
- [[https://www.orgroam.com/][Org Roam]] (A second brain / personal wiki)
|
||||
- [[https://orgmode.org/][Org Agenda]] (Calendar and todo list)
|
||||
- [[https://magit.vc/][magit]] (Git Client)
|
||||
|
||||
[[https://raw.githubusercontent.com/librephoenix/nixos-config-screenshots/main/app/doom.png]]
|
||||
|
||||
I have found Emacs to be incredibly efficient, and transferring my workflow to fit inside of Emacs has allowed me to get much more work done. I primarily use Emacs for writing, note-taking, task/project management and organizing information.
|
||||
|
||||
* My Config
|
||||
This directory includes my Doom Emacs configuration, which consists of:
|
||||
- [[./config.el][config.el]] - Main configuration
|
||||
- [[./init.el][init.el]] - Doom modules (easy sets of packages curated by Doom)
|
||||
- [[./packages.el][packages.el]] - Additional packages from Melpa (Emacs package manager).
|
||||
- [[./themes/doom-stylix-theme.el.mustache][doom-stylix-theme.el.mustache]] - Mustache Doom Emacs template to be used with stylix, requires my [[../../style/stylix.nix][stylix.nix module]] as well
|
||||
- [[./doom.nix][doom.nix]] - Loads Nix Doom Emacs and my configuration into my flake when imported
|
||||
- A few other [[./scripts][random scripts]]
|
||||
|
||||
My full config is a [[./doom.org][literate org document (doom.org)]].
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,148 +0,0 @@
|
||||
{ config, lib, pkgs, pkgs-emacs, pkgs-stable, inputs, userSettings, systemSettings, ... }:
|
||||
let
|
||||
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
|
||||
dashboardLogo = ./. + "/nix-" + themePolarity + ".webp";
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
inputs.nix-doom-emacs.hmModule
|
||||
../git/git.nix
|
||||
../../shell/sh.nix
|
||||
../../shell/cli-collection.nix
|
||||
];
|
||||
|
||||
programs.doom-emacs = {
|
||||
enable = true;
|
||||
emacsPackage = pkgs-emacs.emacs29-pgtk;
|
||||
doomPrivateDir = ./.;
|
||||
# This block from https://github.com/znewman01/dotfiles/blob/be9f3a24c517a4ff345f213bf1cf7633713c9278/emacs/default.nix#L12-L34
|
||||
# Only init/packages so we only rebuild when those change.
|
||||
doomPackageDir = let
|
||||
filteredPath = builtins.path {
|
||||
path = ./.;
|
||||
name = "doom-private-dir-filtered";
|
||||
filter = path: type:
|
||||
builtins.elem (baseNameOf path) [ "init.el" "packages.el" ];
|
||||
};
|
||||
in pkgs-emacs.linkFarm "doom-packages-dir" [
|
||||
{
|
||||
name = "init.el";
|
||||
path = "${filteredPath}/init.el";
|
||||
}
|
||||
{
|
||||
name = "packages.el";
|
||||
path = "${filteredPath}/packages.el";
|
||||
}
|
||||
{
|
||||
name = "config.el";
|
||||
path = pkgs-emacs.emptyFile;
|
||||
}
|
||||
];
|
||||
# End block
|
||||
};
|
||||
|
||||
home.file.".emacs.d/themes/doom-stylix-theme.el".source = config.lib.stylix.colors {
|
||||
template = builtins.readFile ./themes/doom-stylix-theme.el.mustache;
|
||||
extension = ".el";
|
||||
};
|
||||
|
||||
home.packages = (with pkgs-emacs; [
|
||||
emacs-lsp-booster
|
||||
file
|
||||
wmctrl
|
||||
jshon
|
||||
aria
|
||||
hledger
|
||||
hunspell hunspellDicts.en_US-large
|
||||
(pkgs-emacs.mu.override { emacs = emacs29-pgtk; })
|
||||
(pkgs.callPackage ./pkgs/org-analyzer.nix {})
|
||||
emacsPackages.mu4e
|
||||
isync
|
||||
msmtp
|
||||
(python3.withPackages (p: with p; [
|
||||
pandas
|
||||
requests
|
||||
epc lxml
|
||||
pysocks
|
||||
pymupdf
|
||||
markdown
|
||||
]))
|
||||
]) ++ (with pkgs-stable; [
|
||||
nodejs
|
||||
nodePackages.mermaid-cli
|
||||
]) ++ (with pkgs; [
|
||||
openssl
|
||||
stunnel
|
||||
]);
|
||||
|
||||
services.mbsync = {
|
||||
enable = true;
|
||||
package = pkgs-stable.isync;
|
||||
frequency = "*:0/5";
|
||||
};
|
||||
|
||||
home.file.".emacs.d/org-yaap" = {
|
||||
source = "${inputs.org-yaap}";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".emacs.d/org-side-tree" = {
|
||||
source = "${inputs.org-side-tree}";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".emacs.d/org-timeblock" = {
|
||||
source = "${inputs.org-timeblock}";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".emacs.d/org-nursery" = {
|
||||
source = "${inputs.org-nursery}";
|
||||
};
|
||||
|
||||
home.file.".emacs.d/org-krita" = {
|
||||
source = "${inputs.org-krita}";
|
||||
};
|
||||
|
||||
home.file.".emacs.d/org-xournalpp" = {
|
||||
source = "${inputs.org-xournalpp}";
|
||||
};
|
||||
|
||||
home.file.".emacs.d/org-sliced-images" = {
|
||||
source = "${inputs.org-sliced-images}";
|
||||
};
|
||||
|
||||
home.file.".emacs.d/magit-file-icons" = {
|
||||
source = "${inputs.magit-file-icons}";
|
||||
};
|
||||
|
||||
home.file.".emacs.d/dashboard-logo.webp".source = dashboardLogo;
|
||||
home.file.".emacs.d/scripts/copy-link-or-file/copy-link-or-file-to-clipboard.sh" = {
|
||||
source = ./scripts/copy-link-or-file/copy-link-or-file-to-clipboard.sh;
|
||||
executable = true;
|
||||
};
|
||||
|
||||
home.file.".emacs.d/phscroll" = {
|
||||
source = "${inputs.phscroll}";
|
||||
};
|
||||
|
||||
home.file.".emacs.d/mini-frame" = {
|
||||
source = "${inputs.mini-frame}";
|
||||
};
|
||||
|
||||
home.file.".emacs.d/system-vars.el".text = ''
|
||||
;;; ~/.emacs.d/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
;; Import relevant variables from flake into emacs
|
||||
|
||||
(setq user-full-name "''+userSettings.name+''") ; name
|
||||
(setq user-username "''+userSettings.username+''") ; username
|
||||
(setq user-mail-address "''+userSettings.email+''") ; email
|
||||
(setq user-home-directory "/home/''+userSettings.username+''") ; absolute path to home directory as string
|
||||
(setq user-default-roam-dir "''+userSettings.defaultRoamDir+''") ; absolute path to home directory as string
|
||||
(setq system-nix-profile "''+systemSettings.profile+''") ; what profile am I using?
|
||||
(setq system-wm-type "''+userSettings.wmType+''") ; wayland or x11?
|
||||
(setq doom-font (font-spec :family "''+userSettings.font+''" :size 20)) ; import font
|
||||
(setq dotfiles-dir "''+userSettings.dotfilesDir+''") ; import location of dotfiles directory
|
||||
'';
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,175 +0,0 @@
|
||||
(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 +ranger) ; 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 ; 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 ; 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
|
||||
;;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 +lsp) ; 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 +lsp) ; the poster child for carpal tunnel syndrome
|
||||
javascript ; all(hope(abandon(ye(who(enter(here))))))
|
||||
;;julia ; a better, faster MATLAB
|
||||
(kotlin +lsp) ; 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 +roam2) ; 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)
|
||||
;;notmuch
|
||||
;;(wanderlust +gmail)
|
||||
|
||||
: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))
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 56 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 47 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB |
@@ -1,38 +0,0 @@
|
||||
(package! org-analyzer :pin "0908eea")
|
||||
(package! embark :pin "0908eea")
|
||||
(package! dashboard)
|
||||
(package! direnv)
|
||||
(package! org :pin "5bdfc02c6fa1b9ad4f075ac1ad1e4086ead310db")
|
||||
(package! org-modern)
|
||||
(package! org-super-agenda)
|
||||
(package! emacsql :pin "c1a4407")
|
||||
(package! org-roam-ui)
|
||||
(package! org-transclusion)
|
||||
(package! org-download)
|
||||
(package! org-yt)
|
||||
(package! toc-org)
|
||||
(package! lister)
|
||||
(package! all-the-icons-ibuffer)
|
||||
(package! all-the-icons-dired)
|
||||
(package! all-the-icons-completion)
|
||||
(package! ox-reveal)
|
||||
(package! magit-todos)
|
||||
(package! hledger-mode)
|
||||
(package! rainbow-mode)
|
||||
(package! crdt)
|
||||
(package! ess)
|
||||
(package! openwith)
|
||||
(package! ob-mermaid)
|
||||
(package! focus)
|
||||
(package! olivetti)
|
||||
(package! async)
|
||||
(package! centered-cursor-mode)
|
||||
(package! elfeed)
|
||||
(package! elfeed-protocol)
|
||||
(package! docker-tramp :disable t)
|
||||
(package! org-ql)
|
||||
(package! persist)
|
||||
(package! sudo-edit)
|
||||
(package! solaire-mode :disable t)
|
||||
(package! el-patch)
|
||||
(package! devdocs)
|
||||
@@ -1,24 +0,0 @@
|
||||
{ stdenv, fetchFromGitHub, pkgs, ... }:
|
||||
let name = "clj-org-analyzer";
|
||||
version = "1.0.2";
|
||||
in stdenv.mkDerivation
|
||||
{
|
||||
inherit name version;
|
||||
|
||||
src = builtins.fetchurl {
|
||||
url = "https://github.com/rksm/clj-org-analyzer/releases/download/1.0.2/org-analyzer-1.0.2.jar";
|
||||
sha256 = "sha256:1j5c688yg6f5y6n86rf6vkwd1csn1y4dc716d5bczmyr2sgi9c67";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out $out/bin;
|
||||
cp $src $out/bin/org-analyzer.jar;
|
||||
echo "#!/bin/sh
|
||||
${pkgs.jdk}/bin/java -jar $out/bin/org-analyzer.jar $@" > $out/bin/org-analyzer
|
||||
chmod +x $out/bin/org-analyzer.jar
|
||||
chmod +x $out/bin/org-analyzer
|
||||
'';
|
||||
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
#!/bin/sh
|
||||
if [ $(echo $XDG_SESSION_TYPE) == "wayland" ]; then
|
||||
FILENAME="$(wl-paste)"
|
||||
FILTEREDFILENAME=$(echo "$FILENAME" | sed "s+file:+./+")
|
||||
echo "$FILTEREDFILENAME"
|
||||
if [[ -f "$FILTEREDFILENAME" ]]; then
|
||||
wl-copy < "$FILTEREDFILENAME"
|
||||
fi
|
||||
elif [ $(echo $XDG_SESSION_TYPE) == "x11" ]; then
|
||||
FILENAME="$(xclip -o)"
|
||||
FILTEREDFILENAME=$(echo "$FILENAME" | sed "s+file:+./+")
|
||||
if [[ -f "$FILTEREDFILENAME" ]]; then
|
||||
TYPE=$(file -b --mime-type "$FILTEREDFILENAME")
|
||||
xclip -selection clipboard -t "$TYPE" -i "$FILTEREDFILENAME"
|
||||
exit
|
||||
fi
|
||||
else
|
||||
exit
|
||||
fi
|
||||
exit
|
||||
@@ -1,177 +0,0 @@
|
||||
;;; doom-stylix-theme.el --- stylix template created from doom-one -*- lexical-binding: t; no-byte-compile: t; -*-
|
||||
;;
|
||||
;; Author: Emmet K <https://gitlab.com/librephoenix>
|
||||
;; Maintainer: Emmet K <https://gitlab.com/librephoenix>
|
||||
;; Source: https://github.com/doomemacs/themes
|
||||
;;
|
||||
;;; Commentary:
|
||||
;;
|
||||
;; Stylix template for Doom Emacs.
|
||||
;;
|
||||
;;; Code:
|
||||
|
||||
(require 'doom-themes)
|
||||
|
||||
;;
|
||||
;;; Variables
|
||||
|
||||
(defgroup doom-stylix-theme nil
|
||||
"Options for the `doom-one' theme."
|
||||
:group 'doom-themes)
|
||||
|
||||
(defcustom doom-stylix-brighter-modeline nil
|
||||
"If non-nil, more vivid colors will be used to style the mode-line."
|
||||
:group 'doom-stylix-theme
|
||||
:type 'boolean)
|
||||
|
||||
(defcustom doom-stylix-brighter-comments nil
|
||||
"If non-nil, comments will be highlighted in more vivid colors."
|
||||
:group 'doom-stylix-theme
|
||||
:type 'boolean)
|
||||
|
||||
(defcustom doom-stylix-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-stylix-theme
|
||||
:type '(choice integer boolean))
|
||||
|
||||
|
||||
;;
|
||||
;;; Theme definition
|
||||
|
||||
(def-doom-theme doom-stylix
|
||||
"A theme generated from current stylix theme."
|
||||
|
||||
;; name default 256 16
|
||||
((bg '("#{{base00-hex}}" "black" "black" ))
|
||||
(fg '("#{{base05-hex}}" "#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 '("#{{base01-hex}}" "black" "black" ))
|
||||
(fg-alt '("#{{base07-hex}}" "#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 '("#{{base00-hex}}" "black" "black" ))
|
||||
(base1 '("#{{base01-hex}}" "#1e1e1e" "brightblack" ))
|
||||
(base2 '("#{{base01-hex}}" "#2e2e2e" "brightblack" ))
|
||||
(base3 '("#{{base02-hex}}" "#262626" "brightblack" ))
|
||||
(base4 '("#{{base03-hex}}" "#3f3f3f" "brightblack" ))
|
||||
(base5 '("#{{base04-hex}}" "#525252" "brightblack" ))
|
||||
(base6 '("#{{base05-hex}}" "#6b6b6b" "brightblack" ))
|
||||
(base7 '("#{{base06-hex}}" "#979797" "brightblack" ))
|
||||
(base8 '("#{{base07-hex}}" "#dfdfdf" "white" ))
|
||||
|
||||
(grey base4)
|
||||
(red '("#{{base08-hex}}" "#ff6655" "red" ))
|
||||
(orange '("#{{base09-hex}}" "#dd8844" "brightred" ))
|
||||
(green '("#{{base0B-hex}}" "#99bb66" "green" ))
|
||||
(teal '("#{{base0C-hex}}" "#44b9b1" "brightgreen" ))
|
||||
(yellow '("#{{base0A-hex}}" "#ECBE7B" "yellow" ))
|
||||
(blue '("#{{base0E-hex}}" "#51afef" "brightblue" ))
|
||||
(dark-blue '("#{{base0E-hex}}" "#2257A0" "blue" ))
|
||||
(magenta '("#{{base0F-hex}}" "#c678dd" "brightmagenta"))
|
||||
(violet '("#{{base0F-hex}}" "#a9a1e1" "magenta" ))
|
||||
(cyan '("#{{base0D-hex}}" "#46D9FF" "brightcyan" ))
|
||||
(dark-cyan '("#{{base0C-hex}}" "#5699AF" "cyan" ))
|
||||
|
||||
;; 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 blue)
|
||||
(vertical-bar (doom-darken base1 0.1))
|
||||
(selection dark-blue)
|
||||
(builtin magenta)
|
||||
(comments (if doom-stylix-brighter-comments dark-cyan base5))
|
||||
(doc-comments (doom-lighten (if doom-stylix-brighter-comments dark-cyan base5) 0.25))
|
||||
(constants violet)
|
||||
(functions magenta)
|
||||
(keywords blue)
|
||||
(methods cyan)
|
||||
(operators blue)
|
||||
(type yellow)
|
||||
(strings green)
|
||||
(variables (doom-lighten magenta 0.4))
|
||||
(numbers orange)
|
||||
(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 doom-stylix-brighter-modeline
|
||||
(doom-darken blue 0.45)
|
||||
(doom-darken bg-alt 0.1)))
|
||||
(modeline-bg-alt (if doom-stylix-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 doom-stylix-padded-modeline
|
||||
(if (integerp doom-stylix-padded-modeline) doom-stylix-padded-modeline 4))))
|
||||
|
||||
|
||||
;;;; Base theme face overrides
|
||||
(((line-number &override) :foreground base4)
|
||||
((line-number-current-line &override) :foreground fg)
|
||||
((font-lock-comment-face &override)
|
||||
:background (if doom-stylix-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 doom-stylix-brighter-modeline base8 highlight))
|
||||
|
||||
;;;; css-mode <built-in> / scss-mode
|
||||
(css-proprietary-property :foreground orange)
|
||||
(css-property :foreground green)
|
||||
(css-selector :foreground blue)
|
||||
;;;; doom-modeline
|
||||
(doom-modeline-bar :background (if doom-stylix-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 "#{{base01-hex}}" :foreground "#{{base06-hex}}")
|
||||
;;;; 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))
|
||||
;;;; org-mode
|
||||
(org-block :background (doom-darken bg 0.05 ) :extend t)
|
||||
(org-code :background (doom-darken bg 0.05 ) :extend t)
|
||||
;;;; 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-
|
||||
())
|
||||
|
||||
;;; doom-stylix-theme.el ends here
|
||||
@@ -1,8 +0,0 @@
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
home.packages = [
|
||||
inputs.emacsng.packages.${pkgs.system}.emacsngWRPgtk
|
||||
pkgs.source-code-pro
|
||||
];
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
# THIS DOES NOT WORK YET!
|
||||
{ stdenv, pkgs, ... }:
|
||||
|
||||
let name = "rogauracore";
|
||||
owner = "wroberts";
|
||||
version = "1.6";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name owner version;
|
||||
src = fetchTarball {
|
||||
url = "https://github.com/"+owner+"/"+name+"/releases/download/"+version+"/rogauracore-"+version+".tar.gz";
|
||||
sha256 = "0vpypcq71yv0v8vbgpkn8xy77j22g55aw6i83s30mpbpjjna2lm9";
|
||||
};
|
||||
buildInputs = [ pkgs.udev
|
||||
pkgs.libusb
|
||||
];
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{ inputs, config, lib, pkgs, userSettings, systemSettings, pkgs-nwg-dock-hyprland, ... }: let
|
||||
{ inputs, config, lib, pkgs, userSettings, systemSettings, ... }: let
|
||||
pkgs-hyprland = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||
in
|
||||
{
|
||||
@@ -109,7 +109,6 @@ in
|
||||
bind=SUPERSHIFT,T,exec,screenshot-ocr
|
||||
bind=CTRLALT,Delete,exec,hyprctl kill
|
||||
bind=SUPERSHIFT,K,exec,hyprctl kill
|
||||
bind=SUPER,W,exec,nwg-dock-wrapper
|
||||
|
||||
bind=,code:172,exec,lollypop -t
|
||||
bind=,code:208,exec,lollypop -t
|
||||
@@ -420,24 +419,23 @@ in
|
||||
rustPlatform = oldAttrs.rustPlatform // {
|
||||
buildRustPackage = args: oldAttrs.rustPlatform.buildRustPackage (args // {
|
||||
pname = "hyprnome";
|
||||
version = "unstable-2024-05-06";
|
||||
version = "0.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "donovanglover";
|
||||
repo = "hyprnome";
|
||||
rev = "f185e6dbd7cfcb3ecc11471fab7d2be374bd5b28";
|
||||
hash = "sha256-tmko/bnGdYOMTIGljJ6T8d76NPLkHAfae6P6G2Aa2Qo=";
|
||||
rev = "a4597387e777fde8f8a79090cce418843e5b85d1";
|
||||
hash = "sha256-GZn7qS1J6QSanWdy17sMBbwJ77iMij2jKRgPdrjt6tM=";
|
||||
};
|
||||
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs: rec {
|
||||
name = "${pname}-vendor.tar.gz";
|
||||
inherit src;
|
||||
outputHash = "sha256-cQwAGNKTfJTnXDI3IMJQ2583NEIZE7GScW7TsgnKrKs=";
|
||||
outputHash = "sha256-oxIZTp5ZJRUjXLpMw2nOnPHYHhHN03HWFRhBZ82Ac10=";
|
||||
});
|
||||
cargoHash = "sha256-cQwAGNKTfJTnXDI3IMJQ2583NEIZE7GScW7TsgnKrKs=";
|
||||
cargoHash = "sha256-oxIZTp5ZJRUjXLpMw2nOnPHYHhHN03HWFRhBZ82Ac10=";
|
||||
});
|
||||
};
|
||||
})
|
||||
)
|
||||
gnome.zenity
|
||||
wlr-randr
|
||||
wtype
|
||||
ydotool
|
||||
@@ -472,15 +470,6 @@ in
|
||||
tesseract $imgname $txtname;
|
||||
wl-copy -n < $txtfname
|
||||
'')
|
||||
(pkgs.writeScriptBin "nwg-dock-wrapper" ''
|
||||
#!/bin/sh
|
||||
if pgrep -x ".nwg-dock-hyprl" > /dev/null
|
||||
then
|
||||
nwg-dock-hyprland
|
||||
else
|
||||
nwg-dock-hyprland -f -x -i 64 -nolauncher -a start -ml 8 -mr 8 -mb 8
|
||||
fi
|
||||
'')
|
||||
(pkgs.writeScriptBin "sct" ''
|
||||
#!/bin/sh
|
||||
killall wlsunset &> /dev/null;
|
||||
@@ -509,74 +498,12 @@ in
|
||||
if pgrep -x nixos-rebuild > /dev/null || pgrep -x home-manager > /dev/null || pgrep -x kdenlive > /dev/null || pgrep -x FL64.exe > /dev/null || pgrep -x blender > /dev/null || pgrep -x flatpak > /dev/null;
|
||||
then echo "Shouldn't suspend"; sleep 10; else echo "Should suspend"; systemctl suspend; fi
|
||||
'')
|
||||
])
|
||||
++
|
||||
(with pkgs-hyprland; [ ])
|
||||
++ (with pkgs-nwg-dock-hyprland; [
|
||||
(nwg-dock-hyprland.overrideAttrs (oldAttrs: {
|
||||
patches = ./patches/noactiveclients.patch;
|
||||
}))
|
||||
]);
|
||||
]);
|
||||
home.file.".local/share/pixmaps/hyprland-logo-stylix.svg".source =
|
||||
config.lib.stylix.colors {
|
||||
template = builtins.readFile ../../pkgs/hyprland-logo-stylix.svg.mustache;
|
||||
extension = "svg";
|
||||
};
|
||||
home.file.".config/nwg-dock-hyprland/style.css".text = ''
|
||||
window {
|
||||
background: rgba(''+config.lib.stylix.colors.base00-rgb-r+'',''+config.lib.stylix.colors.base00-rgb-g+'',''+config.lib.stylix.colors.base00-rgb-b+'',0.0);
|
||||
border-radius: 20px;
|
||||
padding: 4px;
|
||||
margin-left: 4px;
|
||||
margin-right: 4px;
|
||||
border-style: none;
|
||||
}
|
||||
|
||||
#box {
|
||||
/* Define attributes of the box surrounding icons here */
|
||||
padding: 10px;
|
||||
background: rgba(''+config.lib.stylix.colors.base00-rgb-r+'',''+config.lib.stylix.colors.base00-rgb-g+'',''+config.lib.stylix.colors.base00-rgb-b+'',0.55);
|
||||
border-radius: 20px;
|
||||
padding: 4px;
|
||||
margin-left: 4px;
|
||||
margin-right: 4px;
|
||||
border-style: none;
|
||||
}
|
||||
button {
|
||||
border-radius: 10px;
|
||||
padding: 4px;
|
||||
margin-left: 4px;
|
||||
margin-right: 4px;
|
||||
background: rgba(''+config.lib.stylix.colors.base03-rgb-r+'',''+config.lib.stylix.colors.base03-rgb-g+'',''+config.lib.stylix.colors.base03-rgb-b+'',0.55);
|
||||
color: #''+config.lib.stylix.colors.base07+'';
|
||||
font-size: 12px
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background: rgba(''+config.lib.stylix.colors.base04-rgb-r+'',''+config.lib.stylix.colors.base04-rgb-g+'',''+config.lib.stylix.colors.base04-rgb-b+'',0.55);
|
||||
}
|
||||
|
||||
'';
|
||||
home.file.".config/nwg-dock-pinned".text = ''
|
||||
nwggrid
|
||||
Alacritty
|
||||
neovide
|
||||
qutebrowser
|
||||
brave-browser
|
||||
writer
|
||||
impress
|
||||
calc
|
||||
draw
|
||||
krita
|
||||
xournalpp
|
||||
obs
|
||||
kdenlive
|
||||
flstudio
|
||||
blender
|
||||
openscad
|
||||
Cura
|
||||
virt-manager
|
||||
'';
|
||||
home.file.".config/hypr/hypridle.conf".text = ''
|
||||
general {
|
||||
lock_cmd = pgrep hyprlock || hyprlock
|
||||
|
||||
Reference in New Issue
Block a user