Clean up laptop env

3 files changed, 51 insertions, 34 deletions

diff --git a/nix/awesome.nix b/nix/awesome.nix
index 5ef2fe5..20d703e 100644
--- a/nix/awesome.nix
+++ b/nix/awesome.nix
@@ -1,20 +1,28 @@
 { pkgs, ... }:
 {
-  environment.systemPackages = with pkgs; let wee-slack = weechat.override {
+  users.users.sea.packages = with pkgs; let wee-slack = weechat.override {
     configure = { ... }: {
       scripts = [ weechatScripts.wee-slack ];
     };
   };
   in [
-    aerc amfora calcurse dante mu ncdu ranger scrot senpai zathura
+    aerc amfora dante mu scrot senpai ueberzugpp zathura
     arandr audacious kid3 qsynth rxvt-unicode
     clipbuzz keynav playerctl pulsemixer xclip xdotool xorg.xkill
+    gnome.adwaita-icon-theme
     libreoffice liferea nheko tor-browser-bundle-bin wee-slack
-    networkmanagerapplet nextcloud-client transmission-gtk
-    gnome.adwaita-icon-theme qt5ct
+    networkmanagerapplet transmission-gtk
+    python3Packages.argostranslate
   ];
 
-  fonts.packages = with pkgs; [ lmodern noto-fonts-cjk-sans noto-fonts-emoji ];
+  fonts = {
+    fontconfig.defaultFonts = {
+      monospace = [ "Latin Modern Mono" ];
+      sansSerif = [ "Latin Modern Sans" ];
+      serif = [ "Latin Modern Roman" ];
+    };
+    packages = with pkgs; [ lmodern noto-fonts-cjk-sans noto-fonts-emoji ];
+  };
 
   hardware.brillo.enable = true;
 
@@ -81,13 +89,17 @@
     slock.enable = true;
   };
 
-  qt = {
-    enable = true;
-    platformTheme = "qt5ct";
-  };
-
   services = {
     autorandr.enable = true;
+    libinput.enable = true; # touchpad
+
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      jack.enable = true;
+      pulse.enable = true;
+    };
+
     xserver = {
       videoDrivers = [ "intel" ];
       deviceSection = ''
@@ -95,13 +107,15 @@
       '';
 
       enable = true;
-      desktopManager.xterm.enable = false;
-      displayManager.startx.enable = true;
+      displayManager.sx.enable = true;
       windowManager.awesome.enable = true;
 
-      layout = "us";
-      xkbOptions = "caps:ctrl_modifier,compose:menu";
-      libinput.enable = true; # Enable touchpad support.
+      xkb = {
+        layout = "us";
+        options = "caps:ctrl_modifier,compose:menu";
+      };
     };
   };
+
+  users.users.sea.extraGroups = [ "video" ]; # for brillo
 }
diff --git a/nix/devel.nix b/nix/devel.nix
index d977dd4..fd3d4b4 100644
--- a/nix/devel.nix
+++ b/nix/devel.nix
@@ -1,13 +1,12 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  users.users.sea.packages = with pkgs; [
     bintools gdb gnumake pkg-config
-    gcc go guile_3_0 lua rakudo zig
+    gcc go janet lua python3 zig
     fd htmlq jq ripgrep rlwrap
-    man-pages man-pages-posix stdman
+    man-pages-posix stdman
     texlive.combined.scheme-full
-    (python3.withPackages (pypkgs: with pypkgs; [ flit rsskey ]))
     (vim_configurable.customize {
       vimrcConfig = {
         customRC = ''
@@ -74,7 +73,9 @@
             autocmd FileType vim,sh,scheme,lua,tex,cmake,plantuml,html,pascal
                   \ setlocal shiftwidth=2
             autocmd FileType cpp
-                  \ setlocal cindent cinoptions=>4,n-2,{2,^-2,:2,=2,g0,h2,p5,t0,+2,(0,u0,w1,m1
+                  \ setlocal cindent tabstop=8
+            autocmd FileType cpp
+                  \ setlocal cinoptions=>4,n-2,{2,^-2,:2,=2,g0,h2,p5,t0,+2,(0,u0,w1,m1
             autocmd FileType rst setlocal shiftwidth=3
             autocmd FileType mail,markdown,rst,tex setlocal spell
             autocmd BufWinEnter *
diff --git a/nix/games.nix b/nix/games.nix
index 7b90d75..0189ca7 100644
--- a/nix/games.nix
+++ b/nix/games.nix
@@ -1,17 +1,19 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
-  environment.systemPackages = with pkgs; [
-    _20kly hedgewars scorched3d # strategy
-    astromenace chromium-bsu # scrolling
-    taisei # shmup
-    bastet moon-buggy n2048 ttyper # text
+  users.users.sea.packages = with pkgs; [
+    _20kly hedgewars # strategy
+    bastet moon-buggy n2048 # text
     blackshades xonotic-glx # fps
-    blobwars superTux teeworlds # platformer
-    bonzomatic # engine
-    extremetuxracer gl117 gltron superTuxKart # vehicle
-    flare freedroidrpg hyperrogue # slash
-    frozen-bubble pinball xbill # coffeebreak
-    neverball # puzzle
+    superTux # platformer
+    pianobooster # engine
+    extremetuxracer superTuxKart # vehicle
+    flare # slash
+    frozen-bubble neverball pinball xbill # coffeebreak
+    steamPackages.steam-fhsenv-without-steam.run
   ];
-  hardware.opengl.driSupport32Bit = true;
+
+  hardware = {
+    opengl.driSupport32Bit = true;
+    pulseaudio.support32Bit = true;
+  };
 }