Merge branch 'overhaul' of ssh://solis:34916/Koen/nix-config into overhaul

modules/apps/dev/default.nix

@@ -38,6 +38,7 @@ in {
       uv
 
       haskellPackages.ghc
+      haskellPackages.cabal-install
       tree-sitter-grammars.tree-sitter-haskell
       haskell-language-server
 

modules/apps/terminal/default.nix

@@ -36,6 +36,7 @@ in {
 
     environment.systemPackages = with pkgs; [
       bat
+      btop
       cowsay
       direnv
       docker-compose
@@ -44,8 +45,8 @@ in {
       file
       fzf
       gcc
-      btop
       gnupg
+      jq
       neofetch
       nodejs_22
       pandoc

modules/apps/visual/firefox.nix

@@ -10,6 +10,10 @@
     Value = false;
     Status = "locked";
   };
+  lock-true = {
+    Value = true;
+    Status = "locked";
+  };
 in {
   options = {
     horseman.apps.visual.firefox = {
@@ -118,6 +122,10 @@ in {
           "browser.newtabpage.activity-stream.showSponsored" = lock-false;
           "browser.newtabpage.activity-stream.system.showSponsored" = lock-false;
           "browser.newtabpage.activity-stream.showSponsoredTopSites" = lock-false;
+
+          # Container tabs
+          "privacy.userContext.enabled" = lock-true;
+          "privacy.userContext.ui.enabled" = lock-true;
         };
       };
     };

modules/hardware/wifi.nix

@@ -51,6 +51,16 @@ in {
             phase2="auth=MSCHAPV2"
           '';
         };
+
+        "eduroam" = {
+          authProtocols = ["WPA-EAP"];
+          auth = ''
+            eap=PEAP
+            identity="k.j.deruiter@students.uu.nl"
+            password=ext:psk_uni
+            phase2="auth=MSCHAPV2"
+          '';
+        };
       };
     };
   };

modules/network/syncthing.nix

@@ -57,6 +57,7 @@ in {
             id = "programmingFolder";
             path = "/home/${username}/Programming";
             devices = ["luna" "artemis" "terra" "solis"];
+            # TODO 25.11 add ignore
           };
         };
       };

modules/wm/hyprland/default.nix

@@ -29,23 +29,18 @@ in {
 
     security.polkit.enable = true;
     environment.systemPackages = with pkgs; [
-      brightnessctl
+      brightnessctl # Needed for brightness bindings
-      fortune
+      hypridle # Sleep
-      hypridle
+      hyprlock # Lock
-      hyprlock
+      hyprpaper # Wallpaper
-      hyprpaper
+      hyprpicker # RGB Picker
-      hyprpicker
+      hyprpolkitagent # Authentication popup
-      hyprpolkitagent
+      hyprshot # Screenshot
-      hyprshot
+      playerctl # Media control
-      jq
+      pulsemixer # Audio frontend
-      networkmanagerapplet
+      wl-clipboard # Clipboard
-      playerctl
+      wofi # Launcher
-      pulsemixer
+      xdg-desktop-portal-hyprland # XDG Portal (needed but idk why)
-      python312Packages.gpustat
-      wirelesstools
-      wl-clipboard
-      wofi
-      xdg-desktop-portal-hyprland
     ];
 
     horseman.wm.hyprland.config = {

new-host.md

@@ -7,7 +7,7 @@
 
 # Services
 
-## Tailscale
+## Syncthing
 
 1. Go to [localhost:8384](http://localhost:8384) and copy the device ID.
 2. Create a new machine entry in the [syncthing module](./modules/network/syncthing.nix).
@@ -24,14 +24,13 @@
 1. Open Firefox
 2. Log in to Bitwarden
 
+## Simple logins
 
-## Communication
+- Spotify
+
+### Communication
 
 - Discord
 - Signal
 - Whatsapp Web
 
-
-## Simple logins
-
-- Spotify