Compare commits

...

3 Commits

Author SHA1 Message Date
Tom Alexander
20c1c46d12
Set up fonts. 2024-12-20 16:07:12 -05:00
Tom Alexander
3b133ed86c
Do not launch alacritty at the start. 2024-12-20 15:34:02 -05:00
Tom Alexander
0aad0c39f4
Enable wayland support for emacs.
This unfortunately means pinning to a specific version (or using 3rd party emacs-overlay).
2024-12-20 15:30:51 -05:00
5 changed files with 131 additions and 7 deletions

View File

@ -12,6 +12,7 @@
./roles/sway ./roles/sway
./roles/emacs ./roles/emacs
./roles/git ./roles/git
./roles/fonts
]; ];
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
@ -79,9 +80,9 @@
file file
usbutils # for lsusb usbutils # for lsusb
pciutils # for lspci pciutils # for lspci
mesa-demos # for glxgears mesa-demos # for glxgears TODO move to better role
vulkan-tools # for vkcube vulkan-tools # for vkcube TODO move to better role
xorg.xeyes # to test which windows are using x11 xorg.xeyes # to test which windows are using x11 TODO move to better role
]; ];
services.openssh = { services.openssh = {

View File

@ -0,0 +1,7 @@
{ config, lib, pkgs, ... }:
{
imports = [];
}

View File

@ -29,7 +29,7 @@ INIT_SCRIPT=$(cat <<EOF
EOF EOF
) )
exec ${pkgs.emacs-gtk}/bin/emacs -q --eval "$INIT_SCRIPT" "''${@}" exec ${pkgs.emacs29-pgtk}/bin/emacs -q --eval "$INIT_SCRIPT" "''${@}"
''; '';
in in
{ {
@ -37,7 +37,7 @@ in
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
plainmacs plainmacs
emacs-gtk emacs29-pgtk
clang # To compile tree-sitter grammars clang # To compile tree-sitter grammars
]; ];

View File

@ -0,0 +1,118 @@
{ config, lib, pkgs, ... }:
{
imports = [];
fonts = {
enableDefaultPackages = true;
packages = with pkgs; [
cascadia-code
source-sans-pro
source-serif-pro
];
fontconfig = {
localConf = ''
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- reject all bitmap fonts, with the exception of 'terminus' -->
<selectfont>
<!-- <acceptfont> -->
<!-- <pattern> -->
<!-- <patelt name="family"> <string>Terminus</string> </patelt> -->
<!-- </pattern> -->
<!-- </acceptfont> -->
<rejectfont>
<pattern>
<patelt name="scalable"> <bool>false</bool> </patelt>
</pattern>
</rejectfont>
<rejectfont>
<!-- You don't want ghostscript fonts in your web browsing because of annoying ligatures like ffi -->
<glob>/usr/share/fonts/gsfonts/*</glob>
</rejectfont>
</selectfont>
<!-- preferred aliases -->
<alias>
<family>serif</family>
<prefer>
<family>Source Serif Pro</family>
<family>Source Sans Pro</family>
</prefer>
</alias>
<!-- preferred aliases -->
<alias>
<family>sans-serif</family>
<prefer>
<family>Source Sans Pro</family>
<family>Source Serif Pro</family>
</prefer>
</alias>
<!-- preferred aliases -->
<alias>
<family>monospace</family>
<prefer>
<family>Cascadia Mono</family>
<family>Cascadia Code</family>
</prefer>
</alias>
<!-- Screw it. Force Liberation Mono to be source code pro. -->
<match target="pattern">
<test qual="any" name="family"><string>Liberation Mono</string></test>
<edit name="family" mode="assign" binding="same"><string>Cascadia Mono</string></edit>
</match>
<!-- Dejavu Sans Mono keeps coming back when I query "monospace". Doesn't happen when I'm using Souce Code Pro but does happen with cascadia... force it to cascadia -->
<match target="pattern">
<test qual="any" name="family"><string>monospace</string></test>
<edit name="family" mode="assign" binding="same"><string>Cascadia Mono</string></edit>
</match>
<!-- Disable ligatures in monospace fonts. -->
<match target="font">
<test name="family" compare="eq" ignore-blanks="true">
<string>Cascadia Code</string>
</test>
<edit name="fontfeatures" mode="append">
<string>liga off</string>
<string>dlig off</string>
</edit>
</match>
<!-- Font Display Settings -->
<match target="font" >
<edit mode="assign" name="rgba" >
<const>rgb</const>
</edit>
</match>
<match target="font" >
<edit mode="assign" name="hinting" >
<bool>true</bool>
</edit>
</match>
<match target="font" >
<edit mode="assign" name="hintstyle" >
<const>hintslight</const>
</edit>
</match>
<match target="font" >
<edit mode="assign" name="antialias" >
<bool>true</bool>
</edit>
</match>
<match target="font" >
<edit mode="assign" name="lcdfilter" >
<const>lcddefault</const>
</edit>
</match>
</fontconfig>
'';
};
};
}

View File

@ -32,8 +32,6 @@ default_border pixel 2
bindsym $mod+grave exec $term bindsym $mod+grave exec $term
exec ${pkgs.alacritty}/bin/alacritty
include ${base-hotkeys} include ${base-hotkeys}
include ${display-configs} include ${display-configs}
include ${window-management} include ${window-management}