From 7f3b115e9e8e9b99966543ef38f7bd3c87055794 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sat, 7 Sep 2024 22:00:01 +0200 Subject: [PATCH] emacs: updates --- flake.lock | 112 +--------------------- flake.nix | 11 +-- modules/programs/editors/emacs/module.nix | 24 ++++- 3 files changed, 26 insertions(+), 121 deletions(-) diff --git a/flake.lock b/flake.lock index 3039d45..ea8a526 100644 --- a/flake.lock +++ b/flake.lock @@ -76,22 +76,6 @@ "type": "github" } }, - "doomemacs": { - "flake": false, - "locked": { - "lastModified": 1725350669, - "narHash": "sha256-VolWh2VkVydYmOhmALxODhDgUIpIFt3iY7lFGFyHJFQ=", - "owner": "doomemacs", - "repo": "doomemacs", - "rev": "559e5b6a966fa82bf8322f89d78a00ef4181812a", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "doomemacs", - "type": "github" - } - }, "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", @@ -112,30 +96,6 @@ "type": "github" } }, - "emacs-overlay_2": { - "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": [ - "nix-doom-emacs-unstraightened" - ], - "nixpkgs-stable": [ - "nix-doom-emacs-unstraightened" - ] - }, - "locked": { - "lastModified": 1725414491, - "narHash": "sha256-ACM4mb870JVkCQK6q5tvbAzN6h2IizGQSY6Z58oMeTc=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "383c387b3c864d5d28e017c1e0ad6f5d47e53610", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -351,24 +311,6 @@ "type": "github" } }, - "flake-utils_6": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -904,27 +846,6 @@ "type": "github" } }, - "nix-doom-emacs-unstraightened": { - "inputs": { - "doomemacs": "doomemacs", - "emacs-overlay": "emacs-overlay_2", - "nixpkgs": [], - "systems": "systems_8" - }, - "locked": { - "lastModified": 1725438906, - "narHash": "sha256-4GvMzHrV+y2MOIOCmggGAJIIztTKONzj77usty4rSVA=", - "owner": "marienz", - "repo": "nix-doom-emacs-unstraightened", - "rev": "ec4fbc3443ce338e009ad129c53ce32cccf5055c", - "type": "github" - }, - "original": { - "owner": "marienz", - "repo": "nix-doom-emacs-unstraightened", - "type": "github" - } - }, "nix-filter": { "locked": { "lastModified": 1693833173, @@ -2780,7 +2701,6 @@ "impermanence": "impermanence", "lix-module": "lix-module", "neovim-flake": "neovim-flake", - "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nixpak": "nixpak", "nixpkgs": "nixpkgs_6", "schizofox": "schizofox", @@ -2852,7 +2772,7 @@ "nixpkgs" ], "searx-randomizer": "searx-randomizer", - "systems": "systems_9" + "systems": "systems_7" }, "locked": { "lastModified": 1725210690, @@ -3003,36 +2923,6 @@ } }, "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", diff --git a/flake.nix b/flake.nix index 50aa9f4..5a1ee38 100644 --- a/flake.nix +++ b/flake.nix @@ -15,12 +15,13 @@ # Unstable nixpkgs baby! nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # Sandboxing + # Sandboxing for schizofox nixpak = { url = "github:nixpak/nixpak"; inputs.nixpkgs.follows = "nixpkgs"; }; + # Lix, a faster nix fork. lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; @@ -46,8 +47,10 @@ inputs.hyprland.follows = "hyprland"; }; + # Treefmt provides formatting for all files in my flake. treefmt-nix.url = "github:numtide/treefmt-nix"; + # Still have to set up imerimpermanence, that's a thing for the future. impermanence.url = "github:nix-community/impermanence"; # I use nvim, helix *and* emacs, cry about it. @@ -60,12 +63,6 @@ emacs-overlay.url = "github:nix-community/emacs-overlay"; - nix-doom-emacs-unstraightened = { - url = "github:marienz/nix-doom-emacs-unstraightened"; - inputs.nixpkgs.follows = ""; - inputs.doomemacs.url = "github:doomemacs/doomemacs?ref=559e5b6a966fa82bf8322f89d78a00ef4181812a"; - }; - # I use schizofox as my personal browser. This is because I am schizophrenic. schizofox = { url = "github:schizofox/schizofox"; diff --git a/modules/programs/editors/emacs/module.nix b/modules/programs/editors/emacs/module.nix index 78b1c6d..0326e5c 100644 --- a/modules/programs/editors/emacs/module.nix +++ b/modules/programs/editors/emacs/module.nix @@ -17,7 +17,7 @@ package ]); - custom-emacs = with newpkgs; ((emacsPackagesFor (emacs30-pgtk.override { + custom-emacs = with newpkgs; ((emacsPackagesFor (emacs-pgtk.override { withNativeCompilation = true; withTreeSitter = true; })) @@ -27,38 +27,55 @@ better-jumper catppuccin-theme company + corfu crux cmake-font-lock + diminish + (trivialBuild { + pname = "on.el"; + src = pkgs.fetchFromGitLab { + owner = "ajgrf"; + repo = "on.el"; + rev = "3cf623e1"; + sha256 = "sha256-gtSVCpQwv4Ui9VpW7SXnsXIkfHN/6laMLqHTezDcMZg="; + }; + version = "0.1.0"; + }) direnv + dirvish doom-modeline editorconfig face-explorer flycheck frames-only-mode fussy + gcmh groovy-mode just-mode kotlin-mode lsp-mode lsp-treemacs lsp-ui - lsp-java magit markdown-mode meow meow-tree-sitter + mode-line-bell nasm-mode nix-mode reformatter # required by nix mode + projectile peep-dired + persist-state rainbow-mode no-littering + suggest string-inflection tldr + treesit-auto treesit-grammars.with-all-grammars treemacs - treemacs-evil treemacs-projectile treemacs-magit undo-tree @@ -67,6 +84,7 @@ vterm which-key ws-butler + zoom ])); in { config = mkIf cfg.enable {