Compare commits

...

4 Commits

6 changed files with 27 additions and 89 deletions

View File

@ -60,11 +60,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1674900203, "lastModified": 1675071250,
"narHash": "sha256-oBEBvGPkHT31+VxxzHy6KOUrfv16D7dDReltJ7AXebg=", "narHash": "sha256-MrNYL8XGyKdcCaUHCVm2VTtHHZ/3MpwVYX514mw88SQ=",
"ref": "main", "ref": "main",
"rev": "9406d9d62b5f0781c68a006b0ec975f5bbb740a5", "rev": "2d2c401dc225dcbc9c13943062dbc2542059b050",
"revCount": 64, "revCount": 69,
"type": "git", "type": "git",
"url": "ssh://git@gitea.moritzboeh.me/moritz/emacs.git" "url": "ssh://git@gitea.moritzboeh.me/moritz/emacs.git"
}, },
@ -93,27 +93,6 @@
"type": "github" "type": "github"
} }
}, },
"emacs-overlay_2": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1673086123,
"narHash": "sha256-0gm7Zo/hR860E9MzTkSnr91gBg+GTpmE3EcNc9GFp3c=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "f5f51705d5d8886d2c9aba5e6a19484711175e3f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "emacs-overlay",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -161,21 +140,6 @@
} }
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -190,7 +154,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": { "flake-utils_4": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -205,7 +169,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_6": { "flake-utils_5": {
"locked": { "locked": {
"lastModified": 1644229661, "lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@ -280,7 +244,7 @@
}, },
"howdy": { "howdy": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -560,7 +524,7 @@
"pre-commit-hooks_2": { "pre-commit-hooks_2": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_7",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
@ -585,7 +549,6 @@
"arkenfox-userjs": "arkenfox-userjs", "arkenfox-userjs": "arkenfox-userjs",
"asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver", "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
"emacs": "emacs", "emacs": "emacs",
"emacs-overlay": "emacs-overlay_2",
"forgit-git": "forgit-git", "forgit-git": "forgit-git",
"home-manager": "home-manager", "home-manager": "home-manager",
"howdy": "howdy", "howdy": "howdy",
@ -632,7 +595,7 @@
}, },
"utils_2": { "utils_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6" "flake-utils": "flake-utils_5"
}, },
"locked": { "locked": {
"lastModified": 1657226504, "lastModified": 1657226504,

View File

@ -19,11 +19,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs-overlay = {
url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -76,7 +71,7 @@
channels.nixpkgs.overlaysBuilder = channels: [ channels.nixpkgs.overlaysBuilder = channels: [
inputs.agenix.overlay inputs.agenix.overlay
inputs.emacs-overlay.overlay inputs.emacs.overlays.default
inputs.howdy.overlays.default inputs.howdy.overlays.default
inputs.hypr-contrib.overlays.default inputs.hypr-contrib.overlays.default
inputs.hyprland.overlays.default inputs.hyprland.overlays.default

View File

@ -9,10 +9,6 @@ with lib; {
yubikey.enable = true; yubikey.enable = true;
wallpapers.enable = true; wallpapers.enable = true;
theming.enable = true; theming.enable = true;
shell.aliases = {
feh = "feh --auto-zoom --scale-down";
};
virtualisation = { virtualisation = {
podman.enable = true; podman.enable = true;
libvirtd.enable = true; libvirtd.enable = true;

View File

@ -8,6 +8,7 @@
with lib; with lib;
let let
cfg = config.my.programs.emacs; cfg = config.my.programs.emacs;
myEmacs = pkgs.emacsPgtkWithPackages;
in in
{ {
options.my.programs.emacs.enable = mkEnableOption "emacs"; options.my.programs.emacs.enable = mkEnableOption "emacs";
@ -20,24 +21,12 @@ in
emacs-all-the-icons-fonts emacs-all-the-icons-fonts
(iosevka-bin.override { variant = "aile"; }) (iosevka-bin.override { variant = "aile"; })
]; ];
users.users.moritz.packages = with pkgs; [ users.users.moritz.packages = [ myEmacs ];
myEmacs
(ripgrep.override { withPCRE2 = true; })
# flyspell
(hunspellWithDicts (with hunspellDicts; [
en_GB-ize
en_US
de_DE
]))
# language servers
nil
];
home-manager.users.moritz = { home-manager.users.moritz = {
home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ]; home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ];
services.emacs = { services.emacs = {
enable = true; enable = true;
package = pkgs.myEmacs; package = myEmacs;
}; };
}; };
}; };

View File

@ -1,6 +1,4 @@
{ inputs }: final: prev: { { inputs }: final: prev: {
myEmacs = inputs.emacs.packages.${prev.system}.default;
logseq-wayland = prev.symlinkJoin { logseq-wayland = prev.symlinkJoin {
name = "logseq-wayland"; name = "logseq-wayland";
paths = [ prev.logseq ]; paths = [ prev.logseq ];

View File

@ -1,18 +1,15 @@
age-encryption.org/v1 age-encryption.org/v1
-> ssh-ed25519 CjuqfA VN681gpv9+BTd6SAhmBuXZ4dnLocdkw3sdoK4sNeggY -> ssh-ed25519 CjuqfA dA88zgGLr9EMylHRoamgrDqqjxni4jTZAXQWPQAMTHw
lnTROi2cjMdOS34HrOBjydsV2o2i31SZTFOE0w1Z4wQ dsYszrArgcNvLxzCSbkCb/4OrWvZZ7/BERm69SZD9II
-> ssh-ed25519 QRYDmg AEFJbJuGMYRpwFJ0ueCUc+jgU6hgpSqyvEjXnzcCPS4 -> ssh-ed25519 QRYDmg 14j0Wsh5Hb8uWRKc4wCFWeUrIUefaxCT2W4QspILpnQ
It+bPRBNuD6y03HyMkr+u+y1dLKXd/Iv6mpWGTa/ATg Q+q5zY4EZlruiWljyTuOMsvWoYhJ4LVrmdINMrqa9xw
-> ssh-ed25519 wG6LYg 9n101tlrOmWcIMQ+Ejw1MauMdXKVPwh0Wpc6Kvys5TY -> ssh-ed25519 wG6LYg aDUeVm/SxILH4BfumqUGjabmjf88+TIgperG5VwMgFg
Mk6Hp8uSpmClPxweTluUnQ7O+PNOyl4aZJJ++2UG/O0 tC8eV2qaULDDZ9Salf8Srtkzcj+aBAvS3jrsdoZNPzQ
-> ssh-ed25519 ZYd7Zg bXnk/Ih6IWbodj6xFPJOw515+/L21xEaPgTy6wBBxlo -> ssh-ed25519 ZYd7Zg 4UEmX3MdOc4NnGVFX1Zqh+FFGJxJS4ie8lGg8lvfmQ8
0cPd3Pq99x3qJAafPjYUv7+XwncmMqTYIouqjoAQG+k 6jLPInDghRvZjsmjldu+6exhnMfPWpifmduISjhSzXU
-> ssh-ed25519 as9VYQ lbIvvkszmYr5ZVqtxR8mCS+bCqskk3+0yf8Mo/RtkX0 -> ssh-ed25519 as9VYQ yY0/1f8IIXu5Zm5kkrgESS/5GxUPA/kzA48eXYNzCz8
IMY1Gqa7AXyAKCKUW8GTWSWaX3DN4Y5KN5b9JFvMrJI ku7+gyCXWO80SBMQcwO33NPaFmRe9otsZ32IypRemd4
-> M.`tiyM-grease 4bHP!dW -> v'jxs-grease -B$97 qqy
Bt8cOnxP0TP6pMYKg59Z /ta/C5FjOBppsamdGDInwnq3Hv4ha+nlzTwIwTIW8/vkC9U3dVqPP9SoknfKYQ
--- hIrUz6vpXLb1Jhwlc91amUWXEQVM17TQt7zy24nFNeM --- G7m5xnL01qkrRPGWra/FhJK9ij8ONfLUVwlOXhc6MYA
ÃY\)fào‰`§ýuŸ+§À½u†5Û<;u I¦<49>JqíÎçìö<1F>Sƒ9S"MÝ <0C>.[1<T˜ÎSy 7Ї÷îa?PÈ ÏÛÒb[¾“#ýœ ‰$ TCÅ<EFBFBD>VĬG¨çÇÄ®‡7×ÕÀJyÜ·>ùE?Úü×Äí« æ¦|a}%gþþ‡A†k<>9«P˶ž †{ÞªEYæá/¼9vÃd.Ëâ¯ÔbmjnÜ<6E>¾G¤78 £]´í¶À5> ÿ)¡pºcVè<KFüå& `\Ì<>´¾˜ßƒÜàðÍ—½¾2Ë]š²FCpŒ±TøÍ/oº;m(£ñ¸£²Ô-0<>klÐYúÈâø<ÙŠ<>í!a²o?TCô(2ÌfR þV‰ðL<0E>º
H“¨ ±´Økþm¥ lZ±ùBÌâ:UÙ•ü´£Zì{Hù
ž™méßUþÀyÛ !gÚe÷B¢ú"u¦%Niz|5
ÂzÑsàJ±î½ÕȦÅl¡6§þÇ“tà±d¢²” à]ØmêDøu[?=õœ²¥