stupidcomputer/dot_testing
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

some changes to aristotle

Browse Source
This commit is contained in:
stupidcomputer 2024-12-30 14:13:48 -06:00
parent b3ee4d7ea7
commit c561cbaae1
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
boxes/aristotle/default.nix
View File

@ -22,7 +22,6 @@
}; };
}; };
hardware = { hardware = {
pulseaudio.enable = true;
bluetooth = { bluetooth = {
enable = true; enable = true;
settings.General.ControllerMode = "bredr"; settings.General.ControllerMode = "bredr";
@ -44,16 +43,14 @@
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [ "nix-command" "flakes" ];
}; };
fonts.packages = with pkgs; [
fantasque-sans-mono
];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# x11 # x11
brave brave
(pkgs.st.overrideAttrs (oldAttrs: rec { (callPackage ../../builds/st.nix { aristotle = true; })
patches = [
../../builds/lappy-st/scrollback.patch
../../builds/lappy-st/clipboard.patch
];
conf = builtins.readFile ../../builds/lappy-st/config.h;
}))
(callPackage ../../builds/lappy-utils.nix {}) (callPackage ../../builds/lappy-utils.nix {})
(callPackage ../../builds/dwm.nix {}) (callPackage ../../builds/dwm.nix {})
(callPackage ../../builds/sssg.nix {}) (callPackage ../../builds/sssg.nix {})

2
builds/lappy-utils/rebuild
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
cd $HOME/dots; sudo nixos-rebuild switch --flake .?submodules=1 cd $HOME/dots; sudo nixos-rebuild switch --flake .?submodules=1 $@

11
builds/st.nix
View File

@ -9,6 +9,7 @@
, ncurses , ncurses
, fantasque-sans-mono , fantasque-sans-mono
, lightMode ? false , lightMode ? false
, aristotle ? false
, extraLibs ? [ ] , extraLibs ? [ ]
}: }:
@ -21,10 +22,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config fontconfig freetype ncurses ]; nativeBuildInputs = [ pkg-config fontconfig freetype ncurses ];
buildInputs = [ libX11 libXft ] ++ extraLibs; buildInputs = [ libX11 libXft ] ++ extraLibs;
buildPhase = lib.optionalString (lightMode == true) "cp lightmode.h colors.h;" + buildPhase =
'' lib.optionalString (lightMode == true) "cp lightmode.h colors.h; " +
make lib.optionalString (aristotle == true) "CFLAGS='-DARISTOTLE' " +
''; ''
make
'';
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin

2
builds/st/config.h
View File

@ -5,6 +5,8 @@
*/ */
#ifdef IS_PHONE #ifdef IS_PHONE
static char *font = "Monospace:pixelsize=34:antialias=true:autohint=true"; static char *font = "Monospace:pixelsize=34:antialias=true:autohint=true";
#elif ARISTOTLE
static char *font = "Fantasque Sans Mono:pixelsize=24:antialias=true:autohint=true";
#else #else
static char *font = "Fantasque Sans Mono:pixelsize=14:antialias=true:autohint=true"; static char *font = "Fantasque Sans Mono:pixelsize=14:antialias=true:autohint=true";
#endif #endif