Merge branch 'main' of ssh://forge.katzen.cafe:2222/schrottkatze/nix-configs

common.nix

@@ -148,6 +148,10 @@ with builtins; {
     # keyboard.uhk.enable = true;
   };
 
+  services.avahi = {
+    enable = true;
+  };
+
   security.rtkit.enable = true;
 
   users.users.jade = {

flake.nix

@@ -36,7 +36,13 @@
     devShells."x86_64-linux".default = pkgs.mkShell {
       buildInputs = [
         (pkgs.haskellPackages.ghcWithPackages
-          (pkgs: with pkgs; [xmonad xmonad-contrib xmobar]))
+          (pkgs:
+            with pkgs; [
+              xmonad
+              xmonad-contrib
+              xmobar
+              statgrab
+            ]))
         pkgs.haskell-language-server
       ];
     };

haskell/xmobar/xmobar.hs

@@ -1,4 +1,5 @@
 import Xmobar
+import System.Statgrab
 
 -- TODOS:
 -- - custom cpu module
@@ -10,12 +11,14 @@ import Xmobar
 -- - mail/message monitoring
 -- - if possible, different bars per workspace
 
-data CustomCpu = CustomCpu 
+data CustomCpu = CustomCpu
   deriving (Read, Show)
 
 instance Exec CustomCpu where
   alias CustomCpu = "cpu"
-  run CustomCpu = return "meow"
+  run CustomCpu = do 
+    -- return (show :: IO String (snapshot :: Stats CPUPercent))
+    return "meow"
 
 fc code content = "<fc=" ++ code ++ ">" ++ content ++ "</fc>"
 
@@ -31,7 +34,7 @@ config =
       bgColor = "#282828",
       fgColor = "#ebdbb2",
       commands =
-        [ Run $ Memory ["t", "Mem: <usedratio>%"] 10,
+        [ Run $ Xmobar.Memory ["t", "Mem: <usedratio>%"] 10,
           Run $ CustomCpu,
           Run $ Date (icon "\983277" ++ " %Y" ++ sep "-" ++ "%m" ++ sep "-" ++ "%d " ++ icon "\988236" ++ " %H" ++ sep ":" ++ "%M" ++ sep ":" ++ "%S ") "date" 10
         ],

hosts/catbook-j/configuration.nix

@@ -43,6 +43,22 @@
   systemd.services."ModemManager".wants = ["NetworkManager.service"];
   systemd.services."ModemManager".wantedBy = ["multi-user.target"];
 
+  environment.variables = {
+    VDPAU_DRIVER = lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
+  };
+
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      intel-ocl
+      intel-media-driver
+      intel-vaapi-driver
+      intel-compute-runtime
+      libvdpau-va-gl
+      mesa.drivers
+    ];
+  };
+
   programs.wireshark.enable = true;
 
   boot.resumeDevice = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";

hosts/catbook-j/hardware-configuration.nix

@@ -13,7 +13,7 @@
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
-  boot.initrd.kernelModules = [];
+  boot.initrd.kernelModules = ["i915"];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 

modules/desktop/creative.nix

@@ -24,6 +24,8 @@
       fspy
       scribus
 
+      fontforge-gtk
+
       libreoffice
       typst
 

modules/desktop/firefox.nix

@@ -29,6 +29,8 @@
           "darkreader"
           "sponsorblock"
           "youtube-mrbeastify"
+          "return-youtube-dislikes"
+          "multi-account-containers"
         ];
         Extensions.Uninstall = [
           "google@search.mozilla.org"

modules/desktop/xmonad.nix

@@ -8,7 +8,11 @@
     pkgs,
     ...
   }: let
-    xmobarGhc = pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [xmobar]);
+    xmobarGhc = pkgs.haskellPackages.ghcWithPackages (pkgs:
+      with pkgs; [
+        xmobar
+        statgrab
+      ]);
   in {
     home.packages = [xmobarGhc pkgs.xmonadctl];
     programs.xmobar = {

other/config.nu

@@ -812,7 +812,7 @@ def ed [
 ] {
     let ext = $file | path parse | get extension;
     match $ext {
-        "typ" => {|| zellij run --direction down -- typst watch $file --open ($cmdargs | str join ' ') }
+        "typ" => {|| zellij run --direction down -- typst watch $file ($cmdargs | prepend '--open' | str join ' ') }
     };
     hx $file
 }
@@ -829,3 +829,8 @@ alias gp = git push;
 alias gl = git pull;
 alias gs = git status;
 alias clip = xclip -selection c;
+
+alias cr = cargo run;
+alias cl = cargo clippy;
+alias cb = cargo build;
+alias cch = cargo check;