diff --git a/flake.lock b/flake.lock index c96a0f8..fa4658c 100644 --- a/flake.lock +++ b/flake.lock @@ -60,11 +60,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1675071250, - "narHash": "sha256-MrNYL8XGyKdcCaUHCVm2VTtHHZ/3MpwVYX514mw88SQ=", + "lastModified": 1674900203, + "narHash": "sha256-oBEBvGPkHT31+VxxzHy6KOUrfv16D7dDReltJ7AXebg=", "ref": "main", - "rev": "2d2c401dc225dcbc9c13943062dbc2542059b050", - "revCount": 69, + "rev": "9406d9d62b5f0781c68a006b0ec975f5bbb740a5", + "revCount": 64, "type": "git", "url": "ssh://git@gitea.moritzboeh.me/moritz/emacs.git" }, @@ -93,6 +93,27 @@ "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": false, "locked": { @@ -140,6 +161,21 @@ } }, "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": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -154,7 +190,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -169,7 +205,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -244,7 +280,7 @@ }, "howdy": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], @@ -524,7 +560,7 @@ "pre-commit-hooks_2": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "gitignore": "gitignore", "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable" @@ -549,6 +585,7 @@ "arkenfox-userjs": "arkenfox-userjs", "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver", "emacs": "emacs", + "emacs-overlay": "emacs-overlay_2", "forgit-git": "forgit-git", "home-manager": "home-manager", "howdy": "howdy", @@ -595,7 +632,7 @@ }, "utils_2": { "inputs": { - "flake-utils": "flake-utils_5" + "flake-utils": "flake-utils_6" }, "locked": { "lastModified": 1657226504, diff --git a/flake.nix b/flake.nix index fb43cfe..5efa2d3 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + emacs-overlay = { + url = "github:nix-community/emacs-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -71,7 +76,7 @@ channels.nixpkgs.overlaysBuilder = channels: [ inputs.agenix.overlay - inputs.emacs.overlays.default + inputs.emacs-overlay.overlay inputs.howdy.overlays.default inputs.hypr-contrib.overlays.default inputs.hyprland.overlays.default diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 705d0e3..54fb43a 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -9,6 +9,10 @@ with lib; { yubikey.enable = true; wallpapers.enable = true; theming.enable = true; + shell.aliases = { + feh = "feh --auto-zoom --scale-down"; + }; + virtualisation = { podman.enable = true; libvirtd.enable = true; diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix index 0d7128d..6c51425 100644 --- a/modules/programs/emacs.nix +++ b/modules/programs/emacs.nix @@ -8,7 +8,6 @@ with lib; let cfg = config.my.programs.emacs; - myEmacs = pkgs.emacsPgtkWithPackages; in { options.my.programs.emacs.enable = mkEnableOption "emacs"; @@ -21,12 +20,24 @@ in emacs-all-the-icons-fonts (iosevka-bin.override { variant = "aile"; }) ]; - users.users.moritz.packages = [ myEmacs ]; + users.users.moritz.packages = with pkgs; [ + myEmacs + (ripgrep.override { withPCRE2 = true; }) + # flyspell + (hunspellWithDicts (with hunspellDicts; [ + en_GB-ize + en_US + de_DE + ])) + + # language servers + nil + ]; home-manager.users.moritz = { home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ]; services.emacs = { enable = true; - package = myEmacs; + package = pkgs.myEmacs; }; }; }; diff --git a/overlays/default.nix b/overlays/default.nix index 071a899..f16924d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,6 @@ { inputs }: final: prev: { + myEmacs = inputs.emacs.packages.${prev.system}.default; + logseq-wayland = prev.symlinkJoin { name = "logseq-wayland"; paths = [ prev.logseq ]; diff --git a/secrets/ssh-home.age b/secrets/ssh-home.age index e7b777b..0922fb5 100644 --- a/secrets/ssh-home.age +++ b/secrets/ssh-home.age @@ -1,15 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 CjuqfA dA88zgGLr9EMylHRoamgrDqqjxni4jTZAXQWPQAMTHw -dsYszrArgcNvLxzCSbkCb/4OrWvZZ7/BERm69SZD9II --> ssh-ed25519 QRYDmg 14j0Wsh5Hb8uWRKc4wCFWeUrIUefaxCT2W4QspILpnQ -Q+q5zY4EZlruiWljyTuOMsvWoYhJ4LVrmdINMrqa9xw --> ssh-ed25519 wG6LYg aDUeVm/SxILH4BfumqUGjabmjf88+TIgperG5VwMgFg -tC8eV2qaULDDZ9Salf8Srtkzcj+aBAvS3jrsdoZNPzQ --> ssh-ed25519 ZYd7Zg 4UEmX3MdOc4NnGVFX1Zqh+FFGJxJS4ie8lGg8lvfmQ8 -6jLPInDghRvZjsmjldu+6exhnMfPWpifmduISjhSzXU --> ssh-ed25519 as9VYQ yY0/1f8IIXu5Zm5kkrgESS/5GxUPA/kzA48eXYNzCz8 -ku7+gyCXWO80SBMQcwO33NPaFmRe9otsZ32IypRemd4 --> v'jxs-grease -B$97 qqy -/ta/C5FjOBppsamdGDInwnq3Hv4ha+nlzTwIwTIW8/vkC9U3dVqPP9SoknfKYQ ---- G7m5xnL01qkrRPGWra/FhJK9ij8ONfLUVwlOXhc6MYA -TCŁVĬGĮ7Jyܷ>E? |a}%gAk9P˶ {ުEY/9vd.bmjn܍G78 ]5>)pcV ssh-ed25519 CjuqfA VN681gpv9+BTd6SAhmBuXZ4dnLocdkw3sdoK4sNeggY +lnTROi2cjMdOS34HrOBjydsV2o2i31SZTFOE0w1Z4wQ +-> ssh-ed25519 QRYDmg AEFJbJuGMYRpwFJ0ueCUc+jgU6hgpSqyvEjXnzcCPS4 +It+bPRBNuD6y03HyMkr+u+y1dLKXd/Iv6mpWGTa/ATg +-> ssh-ed25519 wG6LYg 9n101tlrOmWcIMQ+Ejw1MauMdXKVPwh0Wpc6Kvys5TY +Mk6Hp8uSpmClPxweTluUnQ7O+PNOyl4aZJJ++2UG/O0 +-> ssh-ed25519 ZYd7Zg bXnk/Ih6IWbodj6xFPJOw515+/L21xEaPgTy6wBBxlo +0cPd3Pq99x3qJAafPjYUv7+XwncmMqTYIouqjoAQG+k +-> ssh-ed25519 as9VYQ lbIvvkszmYr5ZVqtxR8mCS+bCqskk3+0yf8Mo/RtkX0 +IMY1Gqa7AXyAKCKUW8GTWSWaX3DN4Y5KN5b9JFvMrJI +-> M.`tiyM-grease 4bHP!dW +Bt8cOnxP0TP6pMYKg59Z +--- hIrUz6vpXLb1Jhwlc91amUWXEQVM17TQt7zy24nFNeM +Y\)fo`u+u5<;u IJqTS9S"M .[1