Compare commits

...

4 Commits

7 changed files with 40 additions and 20 deletions

View File

@ -43,9 +43,6 @@
home.file.".Xresources" = { home.file.".Xresources" = {
recursive = true; recursive = true;
text = '' text = ''
! scale
Xft.dpi: 192
! st ! st
st.alpha: 0.8 st.alpha: 0.8
St.font: monospace:pixelsize=31:antialias=true:autohint=true; St.font: monospace:pixelsize=31:antialias=true:autohint=true;

View File

@ -4,10 +4,10 @@
(writeShellScriptBin "sb-updates" '' (writeShellScriptBin "sb-updates" ''
# Gets number of flake inputs that are ready for update # Gets number of flake inputs that are ready for update
# Checks every 60 minutes # Checks every 60 minutes
inputs=$(cd /etc/nixos && # inputs=$(cd /etc/nixos &&
nix flake update --output-lock-file <(cat flake.nix) 2> /tmp/update && # nix flake update --output-lock-file <(cat flake.nix) 2> /tmp/update &&
cat /tmp/update | grep -c Update) # cat /tmp/update | grep -c Update)
printf "[ $inputs] " # printf "[ $inputs] "
'') '')
]; ];
} }

View File

@ -1,8 +1,4 @@
{ config, ... }: { config, ... }:
let
monitor = "${toString (builtins.map (m: "xrandr --output ${ m.name } --mode ${ toString( m.width )}x${ toString( m.height )} --pos ${ toString( m.x)}x${ toString( m.y)}" ) config.monitors)}";
in
{ {
# TODO: configure x11 to look in .config/x11 # TODO: configure x11 to look in .config/x11
home.file.".xinitrc" = { home.file.".xinitrc" = {
@ -12,8 +8,6 @@ in
picom -b --config ~/.config/picom/picom.conf picom -b --config ~/.config/picom/picom.conf
xrdb ~/.Xresources xrdb ~/.Xresources
${monitor}
autostart="clipboard-save dwmblocks feh-wallpaper-changer sxhkd" autostart="clipboard-save dwmblocks feh-wallpaper-changer sxhkd"
for program in $autostart; do for program in $autostart; do

View File

@ -43,9 +43,6 @@
home.file.".Xresources" = { home.file.".Xresources" = {
recursive = true; recursive = true;
text = '' text = ''
! scale
Xft.dpi: 144
! st ! st
st.alpha: 0.8 st.alpha: 0.8
St.font: monospace:pixelsize=21:antialias=true:autohint=true; St.font: monospace:pixelsize=21:antialias=true:autohint=true;

View File

@ -46,6 +46,23 @@ in
}; };
}; };
services = {
libinput.touchpad.accelSpeed = "0.5";
xserver = {
xkb.options = "caps:swapescape";
dpi = 196;
upscaleDefaultCursor = true;
};
};
environment.variables = {
GDK_SCALE = "2.2";
GDK_DPI_SCALE = "0.8";
_JAVA_OPTIONS = "-Dsun.java2d.uiScale=2.2";
QT_AUTO_SCREEN_SCALE_FACTOR = "1";
XCURSOR_SIZE = "64";
};
hardware = { hardware = {
enableRedistributableFirmware = true; enableRedistributableFirmware = true;
firmware = [ firmware = [

View File

@ -3,8 +3,8 @@
services = { services = {
libinput.enable = true; libinput.enable = true;
xserver = { xserver = {
autoRepeatDelay = 250; autoRepeatDelay = 300;
autoRepeatInterval = 30; autoRepeatInterval = 15;
enable = true; enable = true;
xkb.layout = "gb"; xkb.layout = "gb";
displayManager.startx.enable = true; displayManager.startx.enable = true;

View File

@ -45,6 +45,21 @@ in
}; };
}; };
services = {
xserver = {
dpi = 144;
upscaleDefaultCursor = true;
};
};
environment.variables = {
GDK_SCALE = "1.8";
GDK_DPI_SCALE = "0.4";
_JAVA_OPTIONS = "-Dsun.java2d.uiScale=1.8";
QT_AUTO_SCREEN_SCALE_FACTOR = "1";
XCURSOR_SIZE = "32";
};
hardware.firmware = [ hardware.firmware = [
pkgs.sof-firmware pkgs.sof-firmware
]; ];