pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update to emacs29-pgtk

Browse source 
Updated emacs also using native wayland pgtk build
Stop using server as incompatible with pgtk
This commit is contained in:
Evie Litherland-Smith 2023-08-28 10:38:22 +01:00
parent 3641b99a12
commit 20129bc73d
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
home/emacs/default.nix
View file

@ -1,12 +1,9 @@
{ pkgs, ... }: { { pkgs, ... }:
let package = pkgs.emacs29-pgtk;
in {
imports = [ ./dependencies.nix ]; imports = [ ./dependencies.nix ];
# Emacs28 package programs.emacs = {
home.packages = with pkgs; [ emacs28NativeComp ]; inherit package;
# Emacs server service
services.emacs = {
enable = true; enable = true;
package = pkgs.emacs28NativeComp;
defaultEditor = true;
startWithUserSession = true;
}; };
} }

29
home/hyprland/config.nix
View file

@ -1,5 +1,10 @@
{ pkgs, anyrun, ... }: { pkgs, anyrun, ... }:
let anyrunPackage = anyrun.packages.${pkgs.system}.anyrun; let
anyrunPackage = anyrun.packages.${pkgs.system}.anyrun;
emacsPackage = pkgs.emacs29-pgtk;
firefoxPackage = pkgs.firefox-wayland;
rofiPackage = pkgs.rofi-wayland;
swaylockPackage = pkgs.swaylock-effects;
in '' in ''
source = ./macchiato.conf source = ./macchiato.conf
source = ./display.conf source = ./display.conf
@ -73,12 +78,12 @@ in ''
} }
# See https://wiki.hyprland.org/Configuring/Keywords/ for more # See https://wiki.hyprland.org/Configuring/Keywords/ for more
bind = SUPER, F1, exec, ${pkgs.swaylock-effects}/bin/swaylock bind = SUPER, F1, exec, ${swaylockPackage}/bin/swaylock
bind = SUPER, M, fullscreen, 0 bind = SUPER, M, fullscreen, 0
bind = SUPER SHIFT, M, fullscreen, 1 bind = SUPER SHIFT, M, fullscreen, 1
bind = SUPER SHIFT, Q, killactive, bind = SUPER SHIFT, Q, killactive,
bind = SUPER SHIFT, Space, togglefloating bind = SUPER SHIFT, Space, togglefloating
bind = SUPER SHIFT, P, exec, pkill rofi || ${pkgs.rofi-wayland}/bin/rofi -show power-menu bind = SUPER SHIFT, P, exec, pkill rofi || ${rofiPackage}/bin/rofi -show power-menu
# Common program shortcuts # Common program shortcuts
bind = SUPER, Return, exec, ${pkgs.alacritty}/bin/alacritty bind = SUPER, Return, exec, ${pkgs.alacritty}/bin/alacritty
@ -86,22 +91,22 @@ in ''
bind = SUPER, Space, exec, ${anyrunPackage}/bin/anyrun bind = SUPER, Space, exec, ${anyrunPackage}/bin/anyrun
bind = SUPER ALT, Space, submap, launch bind = SUPER ALT, Space, submap, launch
bind = SUPER ALT, W, exec, ${pkgs.firefox-wayland}/bin/firefox bind = SUPER ALT, E, exec, ${emacsPackage}/bin/emacsclient -c -a 'emacs'
bind = SUPER ALT, F, exec, ${pkgs.xfce.thunar}/bin/thunar bind = SUPER ALT, W, exec, ${firefoxPackage}/bin/firefox
bind = SUPER ALT, Z, exec, ${pkgs.zotero}/bin/zotero bind = SUPER ALT, F, exec, ${pkgs.xfce.thunar}/bin/thunar
bind = SUPER ALT, S, exec, ${pkgs.alacritty}/bin/alacritty -e ncspot bind = SUPER ALT, Z, exec, ${pkgs.zotero}/bin/zotero
bind = SUPER ALT, V, exec, ${pkgs.bitwarden}/bin/bitwarden bind = SUPER ALT, S, exec, ${pkgs.alacritty}/bin/alacritty -e ncspot
bind = SUPER ALT, R, exec, ${pkgs.remmina}/bin/remmina bind = SUPER ALT, V, exec, ${pkgs.bitwarden}/bin/bitwarden
bind = SUPER ALT, E, exec, ${pkgs.emacs}/bin/emacsclient -c -a 'emacs' bind = SUPER ALT, R, exec, ${pkgs.remmina}/bin/remmina
submap = launch submap = launch
bind = , W, exec, [workspace name:browser silent] ${pkgs.firefox-wayland}/bin/firefox bind = , E, exec, [workspace name:editor silent] ${emacsPackage}/bin/emacsclient -c -a 'emacs'
bind = , W, exec, [workspace name:browser silent] ${firefoxPackage}/bin/firefox
bind = , F, exec, [workspace name:files silent] ${pkgs.xfce.thunar}/bin/thunar bind = , F, exec, [workspace name:files silent] ${pkgs.xfce.thunar}/bin/thunar
bind = , Z, exec, [workspace name:library silent] ${pkgs.zotero}/bin/zotero bind = , Z, exec, [workspace name:library silent] ${pkgs.zotero}/bin/zotero
bind = , S, exec, [workspace name:music silent] ${pkgs.alacritty}/bin/alacritty -e ncspot bind = , S, exec, [workspace name:music silent] ${pkgs.alacritty}/bin/alacritty -e ncspot
bind = , V, exec, [workspace name:vault silent] ${pkgs.bitwarden}/bin/bitwarden bind = , V, exec, [workspace name:vault silent] ${pkgs.bitwarden}/bin/bitwarden
bind = , R, exec, [workspace name:remote silent] ${pkgs.remmina}/bin/remmina bind = , R, exec, [workspace name:remote silent] ${pkgs.remmina}/bin/remmina
bind = , E, exec, ${pkgs.emacs}/bin/emacsclient -c -a 'emacs'
bind = , Space, submap, reset bind = , Space, submap, reset
bind = SUPER, Space, submap, reset bind = SUPER, Space, submap, reset
bind = SUPER ALT, Space, submap, reset bind = SUPER ALT, Space, submap, reset