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

modules/desktop/creative.nix

@@ -24,11 +24,9 @@
       fspy
       scribus
 
-      onlyoffice-bin
+      libreoffice
       typst
 
-      digikam
-      darktable
       rawtherapee
     ];
   };

modules/desktop/default.nix

@@ -79,7 +79,7 @@ in
 
     programs.xss-lock = {
       enable = true;
-      lockerCommand = "${pkgs.i3lock}/bin/i3lock";
+      lockerCommand = "${pkgs.i3lock}/bin/i3lock -c 1d2021";
     };
 
     services.illum.enable = true;
@@ -141,8 +141,6 @@ in
         uhk-agent
         cool-retro-term
         xdg-desktop-portal-gtk
-        obsidian
-        zettlr
         virt-manager
         ddccontrol-db
         firebird-emu

modules/desktop/polybar.nix

@@ -6,12 +6,6 @@
 }: {
   config = {
     home-manager.users.jade = {pkgs, ...}: {
-      #xsession.windowManager.i3.config.startup = [
-      #{
-      #command = "pkill polybar; polybar";
-      #always = true;
-      #}
-      #];
       services.polybar = {
         enable = true;
         package = pkgs.polybarFull;
@@ -29,6 +23,7 @@
           };
           "bar/status" = {
             # Style
+            bottom = true;
             width = "100%";
             height = "24px";
             radius = 0;
@@ -44,7 +39,7 @@
             separator-foreground = "\${colors.disabled}";
             font-0 = "FiraCode Nerd Font";
             modules-left = "xworkspaces xwindow";
-            modules-right = "memory cpu wlan battery date";
+            modules-right = "memory cpu wlan battery";
             cursor-click = "pointer";
             cursor-scroll = "ns-resize";
             enable-ipc = true;
@@ -137,14 +132,6 @@
             ];
           };
 
-          "module/date" = {
-            type = "internal/date";
-            interval = 1;
-            date = "%Y%{F#7c6f64}-%{F#ebdbb2}%m%{F#7c6f64}-%{F#ebdbb2}%d";
-            time = "%H%{F#7c6f64}:%{F#ebdbb2}%M%{F#7c6f64}:%{F#ebdbb2}%S";
-            label = "%{F#d65d0e}󰃭%{F#ebdbb2} %date% %{F#d65d0e}󱑌%{F#ebdbb2} %time%";
-          };
-
           "settings" = {
             screenchange-reload = true;
             pseudo-transparency = true;

modules/desktop/social.nix

@@ -14,7 +14,8 @@ in
       home-manager.users.jade = {pkgs, ...}: {
         home.packages = with pkgs; [
           evolutionWithPlugins
-          schildichat-desktop
+          cinny-desktop
+          signal-desktop
           mumble
         ];
       };

modules/desktop/xmonad.nix

@@ -1,11 +1,28 @@
 {
-  config,
   lib,
   pkgs,
   ...
-}:
-with lib; {
-  home-manager.users.jade = {pkgs, ...}: {
+}: {
+  home-manager.users.jade = {
+    config,
+    pkgs,
+    ...
+  }: let
+    xmobarGhc = pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [xmobar]);
+  in {
+    home.packages = [xmobarGhc pkgs.xmonadctl];
+    programs.xmobar = {
+      enable = true;
+    };
+    home.file."xmobar.hs" = rec {
+      source = ../../haskell/xmobar/xmobar.hs;
+      target = ".config/xmobar/xmobar.hs";
+      onChange = ''
+        ${xmobarGhc}/bin/ghc -threaded ${target}
+        ${pkgs.busybox}/bin/pkill xmobar
+        ${pkgs.haskellPackages.xmonad}/bin/xmonad --restart
+      '';
+    };
     xsession.windowManager.xmonad = {
       enable = true;
       enableContribAndExtras = true;