maddie/config
1
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added awesome, new python packages + fixes for xorg

Browse Source
This commit is contained in:
Maddie H 2023-07-18 16:21:26 +01:00
parent 808a3c51a8
commit 28d758442e
Signed by: maddie
GPG Key ID: C296DE8C9053683F
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maddie/common/python.nix
View File

@ -6,6 +6,8 @@ let
pillow pillow
psycopg psycopg
passlib passlib
pyotp
aiosmtplib
argon2_cffi argon2_cffi
python-dotenv python-dotenv
python-lsp-server python-lsp-server

7
maddie/nixos/awesome.nix Normal file
View File

@ -0,0 +1,7 @@
{ config, ... }:
{
xsession.windowManager.awesome = {
enable = true;
};
}

17
maddie/nixos/xorg.nix
View File

@ -2,13 +2,13 @@
{ {
# Run startx on tty1 # Run startx on tty1
programs.zsh.profileExtra = '' /* programs.zsh.profileExtra = ''
# If on /dev/tty1 then run startx automatically # If on /dev/tty1 then run startx automatically
if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
sleep 2 sleep 2
exec ${pkgs.xorg.xinit}/bin/startx exec ${pkgs.xorg.xinit}/bin/startx
fi fi
''; ''; */
# Attempt to set keyboard layout # Attempt to set keyboard layout
home.keyboard = { home.keyboard = {
@ -38,12 +38,17 @@
libnotify libnotify
]; ];
# Set global font
xresources.properties = {
"*.font" = "Iosevka:pixelsize=12:antialias=true:autohint=true";
};
# Configure ~/.xinitrc # Configure ~/.xinitrc
programs.feh.enable = true; programs.feh.enable = true;
home.file.".xinitrc".text = '' home.file.".xinitrc".text = ''
# Monitor configuration # Monitor configuration
${pkgs.xorg.xrandr}/bin/xrandr --output DP-0 --primary --mode 2560x1440 --pos 0x560
${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --noprimary --mode 2560x1440 --pos 2560x0 --rotate right ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --noprimary --mode 2560x1440 --pos 2560x0 --rotate right
${pkgs.xorg.xrandr}/bin/xrandr --output DP-0 --primary --mode 2560x1440 --pos 0x560
# Apply wallpaper # Apply wallpaper
${pkgs.feh}/bin/feh --no-fehbg --bg-fill "$HOME/Pictures/Wallpapers/NixOS/nix-wallpaper-waterfall.png" ${pkgs.feh}/bin/feh --no-fehbg --bg-fill "$HOME/Pictures/Wallpapers/NixOS/nix-wallpaper-waterfall.png"
@ -55,13 +60,9 @@
${pkgs.xorg.xset}/bin/xset r rate 300 50 ${pkgs.xorg.xset}/bin/xset r rate 300 50
# Set keyboard map and remap caps to escape # Set keyboard map and remap caps to escape
${pkgs.xorg.setxkbmap}/bin/setxkbmap -layout gb --option caps:escape ${pkgs.xorg.setxkbmap}/bin/setxkbmap -layout gb -option caps:escape
# Start the window manager # Start the window manager
${pkgs.openssh}/bin/ssh-agent ${pkgs.dwm}/bin/dwm ${pkgs.openssh}/bin/ssh-agent ${pkgs.dwm}/bin/dwm
''; '';
xresources.properties = {
"*.font" = "Iosevka:pixelsize=14:antialias=true:autohint=true";
};
} }

9
systems/mdesktop/xorg.nix
View File

@ -13,8 +13,13 @@
# Use startx for starting window managers # Use startx for starting window managers
startx.enable = true; startx.enable = true;
# Use KDE Plasma 5 # Use sddm for starting KDE
# plasma5.enable = true; # sddm.enable = true;
}; };
# Enable KDE Plasma 5
/* desktopManager = {
plasma5.enable = true;
}; */
}; };
} }