kylekrein/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use my own emacs instead of doom emacs

Browse source 
+ Updated all packages.
This commit is contained in:
Aleksandr Lebedev 2025-01-30 13:38:06 +01:00
parent 6b248c9097
commit f131f4fa2b
4 changed files with 199 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

24
nixos/modules/emacs/default.nix
View file

@ -3,23 +3,15 @@
pkgs,
lib,
inputs,
hwconfig,
...
}:
let
emacs = pkgs.emacs-pgtk; # pkgs.emacs; #pkgs.emacs-pgtk;
in
{
#services.emacs.enable = true;
}: let
emacs = inputs.emacs-kylekrein.packages.${hwconfig.system}.default;
in {
services.emacs.enable = true;
services.emacs.startWithGraphical = true;
#services.emacs.install = true;
services.emacs.package = emacs; # pkgs.emacs-unstable
services.emacs.install = true;
services.emacs.package = emacs;
environment.systemPackages =
(import ./packages.nix {
inherit pkgs;
inherit emacs;
}).packages;
nixpkgs.overlays = [
inputs.emacs-overlay.overlays.default
];
environment.systemPackages = [emacs];
}

37
nixos/modules/hyprland/hyprland.nix
View file

@ -4,12 +4,10 @@
hwconfig,
username,
...
}:
let
}: let
toggle_monitors = ./toggle_monitors.sh;
wallpaper-image = ./wallpaper.jpg;
in
{
in {
imports = [
./waybar.nix
./hyprlock.nix
@ -20,13 +18,13 @@ in
xwayland.enable = true;
settings = {
monitor =
if hwconfig.hostname == "kylekrein-homepc" then
[
"DP-1,2560x1440@75,1600x0,1.6"
"DP-3,2560x1440@75,0x0,1.6"
]
if hwconfig.hostname == "kylekrein-homepc"
then [
"DP-1,2560x1440@75,1600x0,1.6"
"DP-3,2560x1440@75,0x0,1.6"
]
else
[ ",highres,auto,1.6" ]
[",highres,auto,1.6"]
++ [
"FALLBACK,1920x1080@60,auto,1" # to fix crash on hyprlock https://github.com/hyprwm/hyprlock/issues/434#issuecomment-2341710088
];
@ -36,7 +34,11 @@ in
};
exec-once = [
"${if hwconfig.isLaptop then "brightnessctl set 25%" else ""}"
"${
if hwconfig.isLaptop
then "brightnessctl set 25%"
else ""
}"
"dbus-update-activation-environment --systemd --all"
"${pkgs.waybar}/bin/waybar &"
"${pkgs.networkmanagerapplet}/bin/nm-applet &"
@ -47,7 +49,7 @@ in
"${pkgs.clipse}/bin/clipse -listen &"
"${pkgs.swww}/bin/swww-daemon &"
"${pkgs.swww}/bin/swww img ${wallpaper-image} &"
"emacs --daemon &"
#"emacs --daemon &"
#"${pkgs.kando}/bin/kando"
];
exec = [
@ -60,10 +62,9 @@ in
"$fileManager" = "$emacs --eval '(dired \"/home/${username}\")'"; # "$terminal ${pkgs.yazi}/bin/yazi";
"$fileManager2" = "${pkgs.kdePackages.dolphin}/bin/dolphin";
"$browser" = "${pkgs.firefox}/bin/firefox";
"$menu" = "${pkgs.wofi}/bin/wofi --show drun";
"$menu" = "emacsclient -cF '((visibility . nil))' -e '(emacs-run-launcher)'"; #"${pkgs.wofi}/bin/wofi --show drun";
"$clipboardManager" = "$terminal --class clipse -e 'clipse'";
"$makeRegionScreenshot" =
"${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -w 0)\" - | ${pkgs.satty}/bin/satty --early-exit --copy-command 'wl-copy' --filename '-' --initial-tool brush";
"$makeRegionScreenshot" = "${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -w 0)\" - | ${pkgs.satty}/bin/satty --early-exit --copy-command 'wl-copy' --filename '-' --initial-tool brush";
bind = [
"$mod, T, exec, $terminal"
"$mod, Q, killactive,"
@ -204,6 +205,12 @@ in
#for clipboard manager
"float,class:(clipse)"
"size 622 652,class:(clipse)" # set the size of the window as necessary
#emacs run launcher
"float, title:emacs-run-launcher"
"pin, title:emacs-run-launcher"
#emacs
"opaque, class:emacs"
];
decoration = {