diff --git a/flake.lock b/flake.lock index 2458f3d..37f8a30 100644 --- a/flake.lock +++ b/flake.lock @@ -116,6 +116,152 @@ "type": "github" } }, + "doom-emacs": { + "flake": false, + "locked": { + "lastModified": 1662497747, + "narHash": "sha256-4n7E1fqda7cn5/F2jTkOnKw1juG6XMS/FI9gqODL3aU=", + "owner": "doomemacs", + "repo": "doomemacs", + "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", + "type": "github" + }, + "original": { + "owner": "doomemacs", + "repo": "doomemacs", + "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", + "type": "github" + } + }, + "doom-snippets": { + "flake": false, + "locked": { + "lastModified": 1694887483, + "narHash": "sha256-KlKhruPSLPSKqUnr5/U65arm16VrY9ORzm+XKNZhpTQ=", + "owner": "doomemacs", + "repo": "snippets", + "rev": "f022984ee1318a4015d5d081b3c3dab5a60dc6ff", + "type": "github" + }, + "original": { + "owner": "doomemacs", + "repo": "snippets", + "type": "github" + } + }, + "emacs-overlay": { + "flake": false, + "locked": { + "lastModified": 1676366521, + "narHash": "sha256-i4UAY8t9Au9SJtsgYppa3NHSVf1YkV6yqnNIQd+Km4g=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", + "type": "github" + } + }, + "emacs-so-long": { + "flake": false, + "locked": { + "lastModified": 1575031854, + "narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=", + "owner": "hlissner", + "repo": "emacs-so-long", + "rev": "ed666b0716f60e8988c455804de24b55919e71ca", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "emacs-so-long", + "type": "github" + } + }, + "evil-escape": { + "flake": false, + "locked": { + "lastModified": 1588439096, + "narHash": "sha256-aB2Ge5o/93B18tPf4fN1c+O46CNh/nOqwLJbox4c8Gw=", + "owner": "hlissner", + "repo": "evil-escape", + "rev": "819f1ee1cf3f69a1ae920e6004f2c0baeebbe077", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "evil-escape", + "type": "github" + } + }, + "evil-markdown": { + "flake": false, + "locked": { + "lastModified": 1626852210, + "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=", + "owner": "Somelauw", + "repo": "evil-markdown", + "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477", + "type": "github" + }, + "original": { + "owner": "Somelauw", + "repo": "evil-markdown", + "type": "github" + } + }, + "evil-org-mode": { + "flake": false, + "locked": { + "lastModified": 1607203864, + "narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=", + "owner": "hlissner", + "repo": "evil-org-mode", + "rev": "a9706da260c45b98601bcd72b1d2c0a24a017700", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "evil-org-mode", + "type": "github" + } + }, + "evil-quick-diff": { + "flake": false, + "locked": { + "lastModified": 1575189609, + "narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=", + "owner": "rgrinberg", + "repo": "evil-quick-diff", + "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908", + "type": "github" + }, + "original": { + "owner": "rgrinberg", + "repo": "evil-quick-diff", + "type": "github" + } + }, + "explain-pause-mode": { + "flake": false, + "locked": { + "lastModified": 1595842060, + "narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=", + "owner": "lastquestion", + "repo": "explain-pause-mode", + "rev": "2356c8c3639cbeeb9751744dbe737267849b4b51", + "type": "github" + }, + "original": { + "owner": "lastquestion", + "repo": "explain-pause-mode", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -165,6 +311,22 @@ } }, "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { "locked": { "lastModified": 1688025799, "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", @@ -269,6 +431,41 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "format-all": { + "flake": false, + "locked": { + "lastModified": 1581716637, + "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=", + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", + "type": "github" + }, + "original": { + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -461,6 +658,50 @@ "type": "github" } }, + "nix-doom-emacs": { + "inputs": { + "doom-emacs": "doom-emacs", + "doom-snippets": "doom-snippets", + "emacs-overlay": "emacs-overlay", + "emacs-so-long": "emacs-so-long", + "evil-escape": "evil-escape", + "evil-markdown": "evil-markdown", + "evil-org-mode": "evil-org-mode", + "evil-quick-diff": "evil-quick-diff", + "explain-pause-mode": "explain-pause-mode", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_4", + "format-all": "format-all", + "nix-straight": [ + "nix-straight" + ], + "nixpkgs": "nixpkgs_6", + "nose": "nose", + "ob-racket": "ob-racket", + "org": "org", + "org-contrib": "org-contrib", + "org-yt": "org-yt", + "php-extras": "php-extras", + "revealjs": "revealjs", + "rotate-text": "rotate-text", + "sln-mode": "sln-mode", + "ts-fold": "ts-fold", + "ws-butler": "ws-butler" + }, + "locked": { + "lastModified": 1697814738, + "narHash": "sha256-mwQmykamvRuHmO6I2VTm8+TOIhhmgy2g5YrMjoCHawY=", + "owner": "nix-community", + "repo": "nix-doom-emacs", + "rev": "c1c99cf41694440d76e31126dc394f52faeb691e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-doom-emacs", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -481,6 +722,23 @@ "type": "github" } }, + "nix-straight": { + "flake": false, + "locked": { + "lastModified": 1696948727, + "narHash": "sha256-6fQamWVIyeLoFSJl1WKcIl+LUdZluzFla4H+4Z5Cv2E=", + "owner": "codingkoi", + "repo": "nix-straight.el", + "rev": "c64edbf49598453bd85dae1acef9a0f9d294185d", + "type": "github" + }, + "original": { + "owner": "codingkoi", + "ref": "codingkoi/apply-librephoenixs-fix", + "repo": "nix-straight.el", + "type": "github" + } + }, "nixd": { "inputs": { "flake-parts": "flake-parts_2", @@ -504,8 +762,8 @@ }, "nixos-apple-silicon": { "inputs": { - "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_6", + "flake-compat": "flake-compat_5", + "nixpkgs": "nixpkgs_7", "rust-overlay": "rust-overlay_3" }, "locked": { @@ -637,6 +895,21 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1695806987, + "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixpkgs-unstable", + "type": "indirect" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1690031011, "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=", @@ -652,7 +925,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1698846319, "narHash": "sha256-4jyW/dqFBVpWFnhl0nvP6EN4lP7/ZqPxYRjl6var0Oc=", @@ -668,6 +941,102 @@ "type": "github" } }, + "nose": { + "flake": false, + "locked": { + "lastModified": 1400604510, + "narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=", + "owner": "emacsattic", + "repo": "nose", + "rev": "f8528297519eba911696c4e68fa88892de9a7b72", + "type": "github" + }, + "original": { + "owner": "emacsattic", + "repo": "nose", + "type": "github" + } + }, + "ob-racket": { + "flake": false, + "locked": { + "lastModified": 1584656173, + "narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=", + "owner": "xchrishawk", + "repo": "ob-racket", + "rev": "83457ec9e1e96a29fd2086ed19432b9d75787673", + "type": "github" + }, + "original": { + "owner": "xchrishawk", + "repo": "ob-racket", + "type": "github" + } + }, + "org": { + "flake": false, + "locked": { + "lastModified": 1695726851, + "narHash": "sha256-qgbjspklSoI8M3cbCJOcUdjuijRgsL/+PSyEOW9VX4I=", + "owner": "emacs-straight", + "repo": "org-mode", + "rev": "aa9177e1a8b039c357d369c1c9aaab710bb247a9", + "type": "github" + }, + "original": { + "owner": "emacs-straight", + "repo": "org-mode", + "type": "github" + } + }, + "org-contrib": { + "flake": false, + "locked": { + "lastModified": 1694946041, + "narHash": "sha256-X/HFG6NZe5BY00KvGbcsIuf9R6Lg8x7Uhd0Y5+Q3qZU=", + "owner": "emacsmirror", + "repo": "org-contrib", + "rev": "5eabbf22bdd4523c922a30787e98ee66c24221aa", + "type": "github" + }, + "original": { + "owner": "emacsmirror", + "repo": "org-contrib", + "type": "github" + } + }, + "org-yt": { + "flake": false, + "locked": { + "lastModified": 1527381913, + "narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=", + "owner": "TobiasZawada", + "repo": "org-yt", + "rev": "40cc1ac76d741055cbefa13860d9f070a7ade001", + "type": "github" + }, + "original": { + "owner": "TobiasZawada", + "repo": "org-yt", + "type": "github" + } + }, + "php-extras": { + "flake": false, + "locked": { + "lastModified": 1573312690, + "narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=", + "owner": "arnested", + "repo": "php-extras", + "rev": "d410c5af663c30c01d461ac476d1cbfbacb49367", + "type": "github" + }, + "original": { + "owner": "arnested", + "repo": "php-extras", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -699,6 +1068,22 @@ "type": "github" } }, + "revealjs": { + "flake": false, + "locked": { + "lastModified": 1695738029, + "narHash": "sha256-Z9c9Q41jMkj/DyXOiZYyIa7Gmn8VB8yauTyWrSsT+ps=", + "owner": "hakimel", + "repo": "reveal.js", + "rev": "88fbfc5751ad01e3f6adee5819eabeb9e73c3757", + "type": "github" + }, + "original": { + "owner": "hakimel", + "repo": "reveal.js", + "type": "github" + } + }, "root": { "inputs": { "attic": "attic", @@ -711,16 +1096,34 @@ "hyprpaper": "hyprpaper", "lanzaboote": "lanzaboote", "linkal": "linkal", + "nix-doom-emacs": "nix-doom-emacs", "nix-index-database": "nix-index-database", + "nix-straight": "nix-straight", "nixd": "nixd", "nixos-apple-silicon": "nixos-apple-silicon", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix", "unstable": "unstable", "unstable-plus-patches": "unstable-plus-patches" } }, + "rotate-text": { + "flake": false, + "locked": { + "lastModified": 1322962747, + "narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=", + "owner": "debug-ito", + "repo": "rotate-text.el", + "rev": "48f193697db996855aee1ad2bc99b38c6646fe76", + "type": "github" + }, + "original": { + "owner": "debug-ito", + "repo": "rotate-text.el", + "type": "github" + } + }, "rust-overlay": { "inputs": { "flake-utils": [ @@ -817,6 +1220,22 @@ "type": "gitlab" } }, + "sln-mode": { + "flake": false, + "locked": { + "lastModified": 1423727528, + "narHash": "sha256-XqkqPyEJuTtFslOz1fpTf/Klbd/zA7IGpzpmum/MGao=", + "owner": "sensorflo", + "repo": "sln-mode", + "rev": "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c", + "type": "github" + }, + "original": { + "owner": "sensorflo", + "repo": "sln-mode", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -901,6 +1320,37 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "ts-fold": { + "flake": false, + "locked": { + "lastModified": 1695278494, + "narHash": "sha256-O4NcUC1u08W8ZslqoA/i+iTaLotKwheURXQWBxLLMFc=", + "owner": "jcs-elpa", + "repo": "ts-fold", + "rev": "70b2c79ff4daa7351d4e2917b0343b9a18d4d4f2", + "type": "github" + }, + "original": { + "owner": "jcs-elpa", + "repo": "ts-fold", + "type": "github" + } + }, "unstable": { "locked": { "lastModified": 1698611440, @@ -952,6 +1402,22 @@ "type": "gitlab" } }, + "ws-butler": { + "flake": false, + "locked": { + "lastModified": 1634511126, + "narHash": "sha256-c0y0ZPtxxICPk+eaNbbQf6t+FRCliNY54CCz9QHQ8ZI=", + "owner": "hlissner", + "repo": "ws-butler", + "rev": "572a10c11b6cb88293de48acbb59a059d36f9ba5", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "ws-butler", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index e872452..14ff2cd 100644 --- a/flake.nix +++ b/flake.nix @@ -73,6 +73,16 @@ url = "github:nix-community/lanzaboote/master"; }; + nix-straight = { + url = "github:codingkoi/nix-straight.el?ref=codingkoi/apply-librephoenixs-fix"; + flake = false; + }; + nix-doom-emacs = { + url = "github:nix-community/nix-doom-emacs"; + inputs = { + nix-straight.follows = "nix-straight"; + }; + }; }; outputs = { self, nixpkgs, ... }@inputs: diff --git a/home-manager-modules/emacs/default.nix b/home-manager-modules/emacs/default.nix new file mode 100644 index 0000000..5c24c15 --- /dev/null +++ b/home-manager-modules/emacs/default.nix @@ -0,0 +1,20 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.luj.programs.emacs; +in +with lib; +{ + options.luj.programs.emacs = { + enable = mkEnableOption "Enable Emacs"; + }; + + config = mkIf cfg.enable { + + services.emacs.enable = true; + programs.doom-emacs = { + enable = true; + doomPrivateDir = ./doom.d; + emacsPackage = pkgs.emacs29-pgtk; + }; + }; +} diff --git a/home-manager-modules/emacs/doom.d/config.el b/home-manager-modules/emacs/doom.d/config.el new file mode 100644 index 0000000..326c68d --- /dev/null +++ b/home-manager-modules/emacs/doom.d/config.el @@ -0,0 +1 @@ +(setq doom-theme 'catppuccin) diff --git a/home-manager-modules/emacs/doom.d/init.el b/home-manager-modules/emacs/doom.d/init.el new file mode 100644 index 0000000..8fe5dd1 --- /dev/null +++ b/home-manager-modules/emacs/doom.d/init.el @@ -0,0 +1,192 @@ +;;; 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 + ;;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 + ;;(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 +gmail) + + :app + ;;calendar + ;;emms + ;;everywhere ; *leave* Emacs!? You must be joking + ;;irc ; how neckbeards socialize + ;;(rss +org) ; emacs as an RSS reader + ;;twitter ; twitter client https://twitter.com/vnought + + :config + ;;literate + (default +bindings +smartparens)) + diff --git a/home-manager-modules/emacs/doom.d/packages.el b/home-manager-modules/emacs/doom.d/packages.el new file mode 100644 index 0000000..ceb9170 --- /dev/null +++ b/home-manager-modules/emacs/doom.d/packages.el @@ -0,0 +1 @@ +(package! catppuccin-theme) diff --git a/home-manager-modules/hyprland/default.nix b/home-manager-modules/hyprland/default.nix deleted file mode 100644 index 357063a..0000000 --- a/home-manager-modules/hyprland/default.nix +++ /dev/null @@ -1,200 +0,0 @@ -{ config, pkgs, lib, inputs, ... }: -let - cfg = config.luj.programs.hyprland; - terminal = "${pkgs.kitty}/bin/kitty"; - menu = "${pkgs.rofi-wayland}/bin/rofi -no-lazy-grab -show"; -in -with lib; -{ - options.luj.programs.hyprland = { - enable = mkEnableOption "Enable HyprLand"; - }; - - config = mkIf cfg.enable - { - wayland.windowManager.hyprland = { - enable = true; - package = pkgs.hyprland; - - }; - - xdg.configFile."hypr/hyprland.conf".text = '' - exec-once = waybar & hyprpaper - exec-once=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY - exec-once = nm-applet --indicator - # Monitors - monitor = eDP-1, preferred, auto, auto - - # Input - input { - kb_layout = fr - follow_mouse = 1 - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. - } - - # General - general { - gaps_in = 3 - gaps_out = 5 - border_size = 2 - col.active_border = rgb(11111b) - col.inactive_border = rgb(11111b) - cursor_inactive_timeout = 1 - layout = dwindle - } - - # Misc - misc { - disable_hyprland_logo = true - disable_splash_rendering = true - } - - # Decorations - decoration { - rounding = 4 - } - - animations { - enabled = false - } - - - # Gestures - gestures { - workspace_swipe = true - workspace_swipe_fingers = 4 - } - - - # Variables - $term = ${terminal} - $browser = chromium - $editor = nvim - $files = nemo - $launcher = ${menu} - - # Apps - bind = SUPER, RETURN, exec, kitty - bind = SUPER SHIFT, E, exec, $editor - bind = SUPER SHIFT, F, exec, $files - bind = SUPER SHIFT, B, exec, $browser - bind = SUPER, SPACE, exec, $launcher - bind = SUPER, X, exec, power-menu - - # Function keys - bind = ,XF86MonBrightnessUp, exec, brightnessctl s +10% - bind = ,XF86MonBrightnessDown, exec, brightnessctl s 10%- - - # Screenshots - bind = , Print, exec, $screenshotarea - bind = CTRL, Print, exec, grimblast --notify --cursor copysave output - bind = SUPER SHIFT CTRL, R, exec, grimblast --notify --cursor copysave output - bind = ALT, Print, exec, grimblast --notify --cursor copysave screen - bind = SUPER SHIFT ALT, R, exec, grimblast --notify --cursor copysave screen - - # Misc - bind = CTRL ALT, L, exec, swaylock - - # Window management - bind = SUPER, Q, killactive, - bind = SUPER, M, exit, - bind = SUPER, F, fullscreen, - bind = SUPER, D, togglefloating, - bind = SUPER, P, pseudo, # dwindle - bind = SUPER, J, togglesplit, # dwindle - - # Focus - bind = SUPER, left, movefocus, l - bind = SUPER, right, movefocus, r - bind = SUPER, up, movefocus, u - bind = SUPER, down, movefocus, d - - # Move - bind = SUPER SHIFT, left, movewindow, l - bind = SUPER SHIFT, right, movewindow, r - bind = SUPER SHIFT, up, movewindow, u - bind = SUPER SHIFT, down, movewindow, d - - # Resize - bind = SUPER CTRL, left, resizeactive, -20 0 - bind = SUPER CTRL, right, resizeactive, 20 0 - bind = SUPER CTRL, up, resizeactive, 0 -20 - bind = SUPER CTRL, down, resizeactive, 0 20 - - # Tabbed - bind= SUPER, g, togglegroup - bind= SUPER, tab, changegroupactive - - # Special workspace - bind = SUPER, grave, togglespecialworkspace - bind = SUPERSHIFT, grave, movetoworkspace, special - - # Switch workspaces - bind = SUPER, ampersand, workspace, 1 - bind = SUPER, eacute, workspace, 2 - bind = SUPER, quotedbl, workspace, 3 - bind = SUPER, apostrophe, workspace, 4 - bind = SUPER, parenleft, workspace, 5 - bindm = SUPER, mouse:272, movewindow - bindm = SUPER, mouse:273, resizewindow - bind = SUPER, mouse_down, workspace, e+1 - bind = SUPER, mouse_up, workspace, e-1 - - bind = SUPER SHIFT, ampersand, movetoworkspace, 1 - bind = SUPER SHIFT, eacute, movetoworkspace, 2 - bind = SUPER SHIFT, quotedbl, movetoworkspace, 3 - bind = SUPER SHIFT, apostrophe, movetoworkspace, 4 - bind = SUPER, parenleft, movetoworkspace, 5 - - ''; - xdg.configFile."hypr/hyprpaper.conf".text = '' - preload = ${../../machines/x2100/wallpaper.jpg} - wallpaper = ,${../../machines/x2100/wallpaper.jpg} - ''; - - services.swayidle = { - enable = true; - systemdTarget = "hyprland-session.target"; - events = [ - { event = "before-sleep"; command = "${pkgs.swaylock-effects}/bin/swaylock --config /home/julien/.config/swaylock/config"; } - ]; - }; - - - programs.swaylock = - { - enable = true; - package = pkgs.swaylock-effects; - settings = { - screenshots = true; - clock = true; - indicator = true; - indicator-radius = 200; - indicator-thickness = 20; - grace = 0; - grace-no-mouse = true; - grace-no-touch = true; - line-uses-ring = false; - ignore-empty-password = true; - show-failed-attempts = false; - - font = "Fira Code"; - timestr = "%H:%M"; - datestr = ""; - effect-blur = "8x5"; - effect-vignette = "0.5:0.5"; - color = "00000000"; - - }; - - }; - - - - - home.packages = with pkgs; - [ qt6.qtwayland libsForQt5.qt5.qtwayland hyprpaper ]; - - }; -} - diff --git a/lib/mkmachine.nix b/lib/mkmachine.nix index dc1cdd0..e1e9e37 100644 --- a/lib/mkmachine.nix +++ b/lib/mkmachine.nix @@ -30,7 +30,6 @@ nixpkgs.lib.nixosSystem { host-config home-manager.nixosModules.home-manager inputs.simple-nixos-mailserver.nixosModule - inputs.hyprland.nixosModules.default inputs.attic.nixosModules.atticd inputs.lanzaboote.nixosModules.lanzaboote inputs.nix-index-database.nixosModules.nix-index diff --git a/machines/enigma/default.nix b/machines/enigma/default.nix index a8a1b2a..87412f3 100644 --- a/machines/enigma/default.nix +++ b/machines/enigma/default.nix @@ -39,10 +39,9 @@ # Enable OpenGL hardware.opengl = { enable = true; - driSupport = true; - # driSupport32Bit = true; }; + boot.kernelParams = [ "nvidia-drm.modeset=1" "module_blacklist=nouveau" ]; # Load nvidia driver for Xorg and Wayland services.xserver.videoDrivers = [ "nvidia" ]; @@ -70,11 +69,13 @@ # accessible via `nvidia-settings`. nvidiaSettings = true; + # Optionally, you may need to select the appropriate driver version for your specific GPU. package = config.boot.kernelPackages.nvidiaPackages.beta; }; + boot.initrd.kernelModules = [ "nvidia" ]; boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; @@ -93,6 +94,10 @@ programs.xwayland.enable = true; + nixpkgs.config.permittedInsecurePackages = [ + "zotero-6.0.26" + ]; + time.timeZone = "Europe/Paris"; # Select internationalisation properties. @@ -103,6 +108,10 @@ }; programs.dconf.enable = true; + services.emacs = { + enable = true; + package = pkgs.emacs29; + }; security.polkit.enable = true; @@ -115,6 +124,7 @@ maxJobs = 100; systems = [ "x86_64-linux" ]; sshUser = "root"; + supportedFeatures = [ "kvm" "nixos-test" ]; sshKey = "/home/julien/.ssh/id_ed25519"; speedFactor = 2; } diff --git a/machines/enigma/home-julien.nix b/machines/enigma/home-julien.nix index a86f1b5..d0aef6e 100644 --- a/machines/enigma/home-julien.nix +++ b/machines/enigma/home-julien.nix @@ -9,6 +9,7 @@ luj.programs.git.enable = true; luj.programs.gtk.enable = true; luj.programs.kitty.enable = true; + luj.programs.emacs.enable = true; luj.emails.enable = true; programs.rofi = { @@ -30,6 +31,14 @@ xkb-options = [ ]; }; }; + + + programs.obs-studio = { + enable = true; + plugins = with pkgs; [ obs-studio-plugins.obs-vkcapture ]; + }; + + home.packages = with pkgs; [ du-dust @@ -48,7 +57,6 @@ htop evince mosh - obsidian zotero flameshot albert diff --git a/machines/x2100/home-julien.nix b/machines/x2100/home-julien.nix index 97d4929..9802023 100644 --- a/machines/x2100/home-julien.nix +++ b/machines/x2100/home-julien.nix @@ -9,7 +9,6 @@ luj.programs.git.enable = true; luj.programs.gtk.enable = true; luj.programs.alacritty.enable = true; - luj.programs.hyprland.enable = true; luj.programs.waybar.enable = true; luj.programs.kitty.enable = true; luj.emails.enable = true; diff --git a/modules/hmgr/default.nix b/modules/hmgr/default.nix index 1935663..7e685fd 100644 --- a/modules/hmgr/default.nix +++ b/modules/hmgr/default.nix @@ -14,7 +14,7 @@ with lib; lib.mapAttrs (name: value: { - imports = with builtins; (map (x: ../../home-manager-modules + "/${x}/default.nix") (attrNames (readDir ../../home-manager-modules))); + imports = with builtins; (map (x: ../../home-manager-modules + "/${x}/default.nix") (attrNames (readDir ../../home-manager-modules))) ++ [ inputs.nix-doom-emacs.hmModule ]; home.username = "${name}"; home.homeDirectory = "/home/${name}"; home.stateVersion = "21.05";