added awesome, new python packages + fixes for xorg

maddie/common/python.nix

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

maddie/nixos/awesome.nix

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

maddie/nixos/xorg.nix

@@ -2,13 +2,13 @@
 
 {
   # Run startx on tty1
-  programs.zsh.profileExtra = ''
+  /* programs.zsh.profileExtra = ''
     # If on /dev/tty1 then run startx automatically
     if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
       sleep 2
       exec ${pkgs.xorg.xinit}/bin/startx
     fi
-  '';
+  ''; */
 
   # Attempt to set keyboard layout
   home.keyboard = {
@@ -38,12 +38,17 @@
     libnotify
   ];
 
+  # Set global font
+  xresources.properties = {
+    "*.font" = "Iosevka:pixelsize=12:antialias=true:autohint=true";
+  };
+
   # Configure ~/.xinitrc
   programs.feh.enable = true;
   home.file.".xinitrc".text = ''
     # 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 DP-0 --primary --mode 2560x1440 --pos 0x560
 
     # Apply wallpaper
     ${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
 
     # 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
     ${pkgs.openssh}/bin/ssh-agent ${pkgs.dwm}/bin/dwm
   '';
-
-  xresources.properties = {
-    "*.font" = "Iosevka:pixelsize=14:antialias=true:autohint=true";
-  };
 }

systems/mdesktop/xorg.nix

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