Compare commits

...

2 commits

Author SHA1 Message Date
Evie Litherland-Smith eb93485d55 Build custom version of Emacs to include both PGTK and Imagemagick support
Install Emacs by default instead just for desktop environment
2024-11-14 13:50:55 +00:00
Evie Litherland-Smith cc8bf2c589 Switch hyprland to dwindle layout 2024-11-14 13:20:46 +00:00
4 changed files with 21 additions and 41 deletions

View file

@ -135,6 +135,7 @@
./home/shell/default.nix ./home/shell/default.nix
./home/scripts/default.nix ./home/scripts/default.nix
./home/password-store/default.nix ./home/password-store/default.nix
./home/emacs/default.nix
]; ];
home = { home = {
inherit username; inherit username;

View file

@ -120,11 +120,10 @@
{ {
imports = [ imports = [
./home/hyprland.nix ./home/hyprland.nix
./home/terminal/default.nix
./home/browser/default.nix
./home/email/default.nix ./home/email/default.nix
./home/calendar/default.nix ./home/calendar/default.nix
./home/terminal/default.nix
./home/emacs/default.nix
./home/browser/default.nix
]; ];
home.file.${config.gtk.gtk2.configLocation}.force = true; home.file.${config.gtk.gtk2.configLocation}.force = true;
services = { services = {

View file

@ -17,7 +17,10 @@
programs.emacs = { programs.emacs = {
# Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git # Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git
enable = true; enable = true;
package = pkgs.emacs29-pgtk; package = pkgs.emacs29.override {
withImageMagick = true;
withPgtk = true;
};
extraConfig = extraConfig =
let let
fixed-font-family = "${config.stylix.fonts.monospace.name}"; fixed-font-family = "${config.stylix.fonts.monospace.name}";
@ -62,19 +65,15 @@
]; ];
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
# Emacs requirements
imagemagick
languagetool
wordnet
# Plugin requirements # Plugin requirements
gcc gcc
sqlite sqlite
languagetool
wordnet
pandoc pandoc
ghostscript ghostscript
poppler_utils poppler_utils
graphviz graphviz-nox
mp3info
# Customised LaTeX install # Customised LaTeX install
(texlive.combine { (texlive.combine {

View file

@ -176,41 +176,22 @@
"sleep 5; ${pkgs.dex}/bin/dex -a" "sleep 5; ${pkgs.dex}/bin/dex -a"
]; ];
gestures.workspace_swipe = true; gestures.workspace_swipe = true;
general = {
layout = "dwindle";
gaps_in = 2.5;
gaps_out = 5;
"col.active_border" = lib.mkForce "rgb(${config.lib.stylix.scheme.magenta})";
};
dwindle = {
force_split = 2;
smart_resizing = false;
special_scale_factor = 0.95;
};
input = { input = {
kb_layout = osConfig.services.xserver.xkb.layout; kb_layout = osConfig.services.xserver.xkb.layout;
follow_mouse = 1; follow_mouse = 1;
touchpad.natural_scroll = "yes"; touchpad.natural_scroll = "yes";
}; };
dwindle = {
force_split = 2;
preserve_split = false;
smart_split = false;
smart_resizing = false;
special_scale_factor = 0.95;
no_gaps_when_only = 0;
use_active_for_splits = true;
default_split_ratio = 1.0;
};
master = {
allow_small_split = true;
special_scale_factor = 0.95;
mfact = 0.5;
# new_is_master = false;
new_on_top = false;
no_gaps_when_only = 0;
orientation = "left";
inherit_fullscreen = false;
smart_resizing = false;
drop_at_cursor = true;
};
general = {
"col.active_border" = lib.mkForce "rgb(${config.lib.stylix.scheme.magenta})";
gaps_in = 2.5;
gaps_out = 5;
border_size = 1;
# cursor_inactive_timeout = 0;
layout = "master";
};
decoration = { decoration = {
rounding = 5; rounding = 5;
"col.shadow" = lib.mkForce "rgba(${config.lib.stylix.scheme.base00}0d)"; "col.shadow" = lib.mkForce "rgba(${config.lib.stylix.scheme.base00}0d)";