Compare commits
No commits in common. "20c1c46d1262baea248b06df96b26fe88746e865" and "fe1033fa4b060022930647e7df2933f3f95ab8d1" have entirely different histories.
20c1c46d12
...
fe1033fa4b
@ -12,7 +12,6 @@
|
|||||||
./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" ];
|
||||||
@ -80,9 +79,9 @@
|
|||||||
file
|
file
|
||||||
usbutils # for lsusb
|
usbutils # for lsusb
|
||||||
pciutils # for lspci
|
pciutils # for lspci
|
||||||
mesa-demos # for glxgears TODO move to better role
|
mesa-demos # for glxgears
|
||||||
vulkan-tools # for vkcube TODO move to better role
|
vulkan-tools # for vkcube
|
||||||
xorg.xeyes # to test which windows are using x11 TODO move to better role
|
xorg.xeyes # to test which windows are using x11
|
||||||
];
|
];
|
||||||
|
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
|
@ -1,7 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports = [];
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
@ -29,7 +29,7 @@ INIT_SCRIPT=$(cat <<EOF
|
|||||||
EOF
|
EOF
|
||||||
)
|
)
|
||||||
|
|
||||||
exec ${pkgs.emacs29-pgtk}/bin/emacs -q --eval "$INIT_SCRIPT" "''${@}"
|
exec ${pkgs.emacs-gtk}/bin/emacs -q --eval "$INIT_SCRIPT" "''${@}"
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
@ -37,7 +37,7 @@ in
|
|||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
plainmacs
|
plainmacs
|
||||||
emacs29-pgtk
|
emacs-gtk
|
||||||
clang # To compile tree-sitter grammars
|
clang # To compile tree-sitter grammars
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -1,118 +0,0 @@
|
|||||||
{ 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>
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
@ -32,6 +32,8 @@ 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}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user