faukah/nichts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

emacs: updates

Browse source
This commit is contained in:
Charlie Root 2024-09-07 22:00:01 +02:00
commit 7f3b115e9e
3 changed files with 26 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

112
flake.lock generated
View file

@ -76,22 +76,6 @@
"type": "github" "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": { "emacs-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -112,30 +96,6 @@
"type": "github" "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-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -351,24 +311,6 @@
"type": "github" "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": { "flakey-profile": {
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1712898590,
@ -904,27 +846,6 @@
"type": "github" "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": { "nix-filter": {
"locked": { "locked": {
"lastModified": 1693833173, "lastModified": 1693833173,
@ -2780,7 +2701,6 @@
"impermanence": "impermanence", "impermanence": "impermanence",
"lix-module": "lix-module", "lix-module": "lix-module",
"neovim-flake": "neovim-flake", "neovim-flake": "neovim-flake",
"nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
"nixpak": "nixpak", "nixpak": "nixpak",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"schizofox": "schizofox", "schizofox": "schizofox",
@ -2852,7 +2772,7 @@
"nixpkgs" "nixpkgs"
], ],
"searx-randomizer": "searx-randomizer", "searx-randomizer": "searx-randomizer",
"systems": "systems_9" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1725210690, "lastModified": 1725210690,
@ -3003,36 +2923,6 @@
} }
}, },
"systems_7": { "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": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",

11
flake.nix
View file

@ -15,12 +15,13 @@
# Unstable nixpkgs baby! # Unstable nixpkgs baby!
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# Sandboxing # Sandboxing for schizofox
nixpak = { nixpak = {
url = "github:nixpak/nixpak"; url = "github:nixpak/nixpak";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Lix, a faster nix fork.
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -46,8 +47,10 @@
inputs.hyprland.follows = "hyprland"; inputs.hyprland.follows = "hyprland";
}; };
# Treefmt provides formatting for all files in my flake.
treefmt-nix.url = "github:numtide/treefmt-nix"; 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"; impermanence.url = "github:nix-community/impermanence";
# I use nvim, helix *and* emacs, cry about it. # I use nvim, helix *and* emacs, cry about it.
@ -60,12 +63,6 @@
emacs-overlay.url = "github:nix-community/emacs-overlay"; 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. # I use schizofox as my personal browser. This is because I am schizophrenic.
schizofox = { schizofox = {
url = "github:schizofox/schizofox"; url = "github:schizofox/schizofox";

24
modules/programs/editors/emacs/module.nix
View file

@ -17,7 +17,7 @@
package package
]); ]);
custom-emacs = with newpkgs; ((emacsPackagesFor (emacs30-pgtk.override { custom-emacs = with newpkgs; ((emacsPackagesFor (emacs-pgtk.override {
withNativeCompilation = true; withNativeCompilation = true;
withTreeSitter = true; withTreeSitter = true;
})) }))
@ -27,38 +27,55 @@
better-jumper better-jumper
catppuccin-theme catppuccin-theme
company company
corfu
crux crux
cmake-font-lock 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 direnv
dirvish
doom-modeline doom-modeline
editorconfig editorconfig
face-explorer face-explorer
flycheck flycheck
frames-only-mode frames-only-mode
fussy fussy
gcmh
groovy-mode groovy-mode
just-mode just-mode
kotlin-mode kotlin-mode
lsp-mode lsp-mode
lsp-treemacs lsp-treemacs
lsp-ui lsp-ui
lsp-java
magit magit
markdown-mode markdown-mode
meow meow
meow-tree-sitter meow-tree-sitter
mode-line-bell
nasm-mode nasm-mode
nix-mode nix-mode
reformatter # required by nix mode reformatter # required by nix mode
projectile projectile
peep-dired peep-dired
persist-state
rainbow-mode rainbow-mode
no-littering no-littering
suggest
string-inflection string-inflection
tldr tldr
treesit-auto
treesit-grammars.with-all-grammars treesit-grammars.with-all-grammars
treemacs treemacs
treemacs-evil
treemacs-projectile treemacs-projectile
treemacs-magit treemacs-magit
undo-tree undo-tree
@ -67,6 +84,7 @@
vterm vterm
which-key which-key
ws-butler ws-butler
zoom
])); ]));
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {