309 current 1970-01-01 01:00:00 23.11.20240514.9ddcaff 6.1.90 *

hosts/MaxNixosLaptop/home.nix

@@ -7,14 +7,8 @@
     ../../modules/home
   ];
 
-  kanshi.enable = true;
+  sway.enable = true;
-  kanshi.laptop = true;
+  sway.laptop = true;
-
-  waybar.enable = true;
-  waybar.squeekboard = true;
-  waybar.mpd = true;
-  waybar.battery = true;
-  waybar.backlight = true;
 
   # Home Manager needs a bit of information about you and the paths it should
   # manage.

modules/home/sway/default.nix

@@ -4,6 +4,8 @@
   lib,
   ...
 }: let
+  cfg = config.sway;
+
   rotate_lisgd = pkgs.writeShellScriptBin "rotate_lisgd" ''
     # PREV_ORIENTATION and ORIENTATION are given by rot8
 
@@ -47,7 +49,20 @@
     gsettings set $gnome_schema gtk-theme 'Dracula'
   '';
 in {
-  imports = [./kanshi.nix ./waybar.nix];
+  imports = [./kanshi.nix ./waybar.nix ./theme.nix];
+
+  options = {
+    sway.enable = lib.mkEnableOption "sway, a lightweight window manager";
+    sway.laptop = lib.mkEnableOption "laptop config";
+  };
+
+  config = lib.mkIf cfg.enable {
+    sway.kanshi.enable = lib.mkDefault true;
+    sway.waybar.enable = lib.mkDefault true;
+    sway.theming.enable = lib.mkDefault true;
+    sway.waybar.battery = lib.mkDefault cfg.laptop;
+    sway.waybar.backlight = lib.mkDefault cfg.laptop;
+    sway.waybar.squeekboard = lib.mkDefault cfg.laptop;
 
     home.packages = with pkgs; [
       swaylock # screen locking
@@ -69,10 +84,10 @@ in {
 
       config = {
         output = let
-        bgdir = "~/Documents/Blender/desktop background Informatiker";
+          bgdir = ../../../assets;
-        bg1080 = bgdir + "/render 1080p new color.png";
+          bg1080 = bgdir + "/bg1080.png";
-        bg1080vert = bgdir + "/render 1080p hochkant new.png";
+          bg1080vert = bgdir + "/bg1080vert.png";
-        bg4k = bgdir + "/render 4K new color.png";
+          bg4k = bgdir + "/bg4k.png";
         in {
           eDP-1 = {
             bg = "'${bg1080}' fit";
@@ -210,54 +225,6 @@ in {
             output = ["DP-3" "DP-4" "DP-6" "HDMI-A-1" "eDP-1"];
           }
         ];
-
-      colors = {
-        background = "#00000000";
-        focused = {
-          border = "#00FFEE";
-          background = "#4477AA";
-          text = "#F0F0F0";
-          childBorder = "#00FFEE";
-          indicator = "#00AA88";
-        };
-        focusedInactive = {
-          border = "#626262";
-          background = "#444444";
-          text = "#F0F0F0";
-          childBorder = "#626262";
-          indicator = "#00AA88";
-        };
-        placeholder = {
-          border = "#313131";
-          background = "#222222";
-          text = "#F0F0F0";
-          childBorder = "#313131";
-          indicator = "#005544";
-        };
-        unfocused = {
-          border = "#313131";
-          background = "#222222";
-          text = "#F0F0F0";
-          childBorder = "#313131";
-          indicator = "#00AA88";
-        };
-        urgent = {
-          border = "#FF3131";
-          background = "#882222";
-          text = "#F0F0F0";
-          childBorder = "#FF3131";
-          indicator = "#00AA88";
-        };
-      };
-
-      focus.mouseWarping = true;
-
-      gaps = {
-        inner = 5;
-        smartGaps = true;
-        smartBorders = "no_gaps";
-      };
-      window.titlebar = false;
       };
 
       extraConfig = ''
@@ -266,69 +233,6 @@ in {
       '';
     };
 
-  # Theming
-  gtk = {
-    enable = true;
-    cursorTheme = {
-      package = pkgs.capitaine-cursors;
-      name = "capitaine-cursors-white";
-      size = 24;
-    };
-    iconTheme = {
-      package = pkgs.whitesur-icon-theme;
-      name = "WhiteSur-dark";
-    };
-    theme = {
-      package = pkgs.whitesur-gtk-theme;
-      name = "WhiteSur-Dark";
-    };
-    gtk3.extraConfig = {
-      gtk-dialogs-use-header = false;
-      gtk-cursor-theme-size = 0;
-      gtk-toolbar-style = "GTK_TOOLBAR_BOTH_HORIZ";
-      gtk-toolbar-icon-style = "GTK_ICON_SIZE_LARGE_TOOLBAR";
-      gtk-button-images = 0;
-      gtk-menu-images = 0;
-      gtk-enable-event-sounds = 0;
-      gtk-enable-input-feedback-sounds = 1;
-      gtk-xft-antialias = 1;
-      gtk-xft-hinting = 1;
-      gtk-xft-hintstyle = "hintslight";
-      gtk-xft-rgba = "none";
-    };
-  };
-  home.pointerCursor = {
-    package = pkgs.capitaine-cursors;
-    name = "capitaine-cursors-white";
-    size = 24;
-    x11.enable = true;
-    x11.defaultCursor = "capitaine-cursors-white";
-  };
-  xsession.enable = true;
-
-  home.file."tofi" = {
-    enable = true;
-    target = ".config/tofi/config";
-    text = ''
-      # fullscreen theming
-      width = 100%
-      height = 100%
-      border-width = 0
-      outline-width = 0
-      padding-top = 32
-      result-spacing = 25
-      font = FiraCode Nerd Font
-      background-color = #000D
-      text-color = #00FFEE
-      selection-color = #EEFF00
-      hint-font = false
-
-      # search behavior
-      history = true
-      fuzzy-match = true
-    '';
-  };
-
     services.mako = {
       enable = true;
       actions = true;
@@ -353,4 +257,5 @@ in {
       icons = true;
       markup = true;
     };
+  };
 }

modules/home/sway/kanshi.nix

@@ -4,11 +4,11 @@
   pkgs,
   ...
 }: let
-  cfg = config.kanshi;
+  cfg = config.sway.kanshi;
 in {
   options = {
-    kanshi.enable = lib.mkEnableOption "kanshi, a dynamic display recognizer";
+    sway.kanshi.enable = lib.mkEnableOption "kanshi, a dynamic display recognizer";
-    kanshi.laptop = lib.mkEnableOption "laptop workspaces";
+    sway.kanshi.laptop = lib.mkEnableOption "laptop workspaces";
   };
 
   config = lib.mkIf cfg.enable {

modules/home/sway/theme.nix

@@ -0,0 +1,103 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  cfg = config.sway.theming;
+in {
+  options = {
+    sway.theming.enable = lib.mkEnableOption "theming for sway";
+  };
+
+  config = lib.mkIf cfg.enable {
+    wayland.windowManager.sway.config = {
+      colors = {
+        background = "#00000000";
+        focused = {
+          border = "#00FFEE";
+          background = "#4477AA";
+          text = "#F0F0F0";
+          childBorder = "#00FFEE";
+          indicator = "#00AA88";
+        };
+        focusedInactive = {
+          border = "#626262";
+          background = "#444444";
+          text = "#F0F0F0";
+          childBorder = "#626262";
+          indicator = "#00AA88";
+        };
+        placeholder = {
+          border = "#313131";
+          background = "#222222";
+          text = "#F0F0F0";
+          childBorder = "#313131";
+          indicator = "#005544";
+        };
+        unfocused = {
+          border = "#313131";
+          background = "#222222";
+          text = "#F0F0F0";
+          childBorder = "#313131";
+          indicator = "#00AA88";
+        };
+        urgent = {
+          border = "#FF3131";
+          background = "#882222";
+          text = "#F0F0F0";
+          childBorder = "#FF3131";
+          indicator = "#00AA88";
+        };
+      };
+
+      focus.mouseWarping = true;
+
+      gaps = {
+        inner = 5;
+        smartGaps = true;
+        smartBorders = "no_gaps";
+      };
+      window.titlebar = false;
+    };
+
+    gtk = {
+      enable = true;
+      cursorTheme = {
+        package = pkgs.capitaine-cursors;
+        name = "capitaine-cursors-white";
+        size = 24;
+      };
+      iconTheme = {
+        package = pkgs.whitesur-icon-theme;
+        name = "WhiteSur-dark";
+      };
+      theme = {
+        package = pkgs.whitesur-gtk-theme;
+        name = "WhiteSur-Dark";
+      };
+      gtk3.extraConfig = {
+        gtk-dialogs-use-header = false;
+        gtk-cursor-theme-size = 0;
+        gtk-toolbar-style = "GTK_TOOLBAR_BOTH_HORIZ";
+        gtk-toolbar-icon-style = "GTK_ICON_SIZE_LARGE_TOOLBAR";
+        gtk-button-images = 0;
+        gtk-menu-images = 0;
+        gtk-enable-event-sounds = 0;
+        gtk-enable-input-feedback-sounds = 1;
+        gtk-xft-antialias = 1;
+        gtk-xft-hinting = 1;
+        gtk-xft-hintstyle = "hintslight";
+        gtk-xft-rgba = "none";
+      };
+    };
+    home.pointerCursor = {
+      package = pkgs.capitaine-cursors;
+      name = "capitaine-cursors-white";
+      size = 24;
+      x11.enable = true;
+      x11.defaultCursor = "capitaine-cursors-white";
+    };
+    xsession.enable = true;
+  };
+}

modules/home/sway/waybar.nix

@@ -4,7 +4,7 @@
   pkgs,
   ...
 }: let
-  cfg = config.waybar;
+  cfg = config.sway.waybar;
 
   schema = "org.gnome.desktop.a11y.applications";
   key = "screen-keyboard-enabled";
@@ -26,11 +26,11 @@
   '';
 in {
   options = {
-    waybar.enable = lib.mkEnableOption "waybar, a status bar for wayland compositors";
+    sway.waybar.enable = lib.mkEnableOption "waybar, a status bar for wayland compositors";
-    waybar.squeekboard = lib.mkEnableOption "squeekboard";
+    sway.waybar.squeekboard = lib.mkEnableOption "squeekboard";
-    waybar.mpd = lib.mkEnableOption "mpd";
+    sway.waybar.mpd = lib.mkEnableOption "mpd";
-    waybar.battery = lib.mkEnableOption "battery";
+    sway.waybar.battery = lib.mkEnableOption "battery";
-    waybar.backlight = lib.mkEnableOption "backlight";
+    sway.waybar.backlight = lib.mkEnableOption "backlight";
   };
 
   config = lib.mkIf cfg.enable {