Again, small changes, trying out a new theme

modules/home/files/default.nix

@@ -4,11 +4,13 @@
       source = config.lib.file.mkOutOfStoreSymlink "/etc/libvirt/VMs";
     };
     ".face" = {
-      source = ./assets/user-icon.png;
+      source = ./assets/pfp.png;
     };
-    ".wallpapers" = {
+    ".assets/wallpapers" = {
-      source = ./assets/wallpapers;
+      source = ./assets/wallpapers/dogmatica;
-      recursive = true;
+    };
+    ".assets/lockscreen" = {
+      source = ./assets/lockscreens/holymoly;
     };
     ".icons/default" = {
       source = "${pkgs.simp1e-cursors}/share/icons/Simp1e-Dark";

modules/home/sway/default.nix

@@ -10,7 +10,6 @@
     ./waybar
     ./swayshot
     ./swaylock
-    #./swayfx
   ];
 
   # Enable Sway and write some scripts
@@ -20,7 +19,6 @@
     wrapperFeatures.gtk = true;
     checkConfig = false;
     extraConfig = ''
-      # Options I can't find in Nix yet
       default_floating_border pixel ${config.look.border.string}
       hide_edge_borders --i3 smart
       titlebar_padding 10 1

modules/home/sway/hardware/default.nix

@@ -8,25 +8,25 @@
           pos = "1920 405";
           mode = "1920x1080@143.980Hz";
           max_render_time = "3";
-          bg = "~/.wallpapers/1.png fill";
+          bg = "~/.assets/wallpapers/1.png fill";
           adaptive_sync = "on";
-	  #tearing_allowed = "1";
+          #tearing_allowed = "1";
         };
         ${config.displays.d2} = {
           pos = "0 405";
           mode = "1920x1080@60Hz";
           max_render_time = "3";
-          bg = "~/.wallpapers/2.png fill";
+          bg = "~/.assets/wallpapers/2.png fill";
         };
         ${config.displays.d3} = {
           pos = "3840 0";
           mode = "1680x1050@59.883Hz";
           transform = "270";
           max_render_time = "3";
-          bg = "~/.wallpapers/3.png fill";
+          bg = "~/.assets/wallpapers/3.png fill";
         };
         "*" = {
-          bg = "~/.wallpapers/1.png fill";
+          bg = "~/.assets/wallpapers/1.png fill";
         };
       };
 

modules/home/sway/swayfx/default.nix

@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-{
-  wayland.windowManager.sway = {
-    package = pkgs.swayfx;
-    extraConfig = ''
-      blur enable
-      blur_passes 3
-      blur_radius 5
-      layer_effects 'rofi' blur enable
-      layer_effects 'notifications' blur enable; blur_ignore_transparent enable
-    '';
-  };
-}

modules/home/sway/swaylock/default.nix

@@ -33,7 +33,7 @@ let
       \
       --indicator \
       --indicator-radius=80 \
-      --image=~/.wallpapers/lock.png \
+      --image=~/.assets/lockscreen/lock.png \
       --clock \
       --font=${config.look.fonts.main} \
       --font-size=30 \

modules/home/sway/swayshot/default.nix

@@ -31,7 +31,7 @@
       handle_screen() {
         # Take a screenshot and save it to the temporary file
         temp_file=$(mktemp -u).png
-        grim -o $(swaymsg -t get_config | jq -r '.[] | select(.focused) | .name') "$temp_file"
+        grim -o $(swaymsg -t get_outputs | jq -r '.[] | select(.focused) | .name') "$temp_file"
 
         # Check if the screenshot was successfully taken
         if [ $? -eq 0 ]; then

modules/home/sway/waybar/default.nix

@@ -27,7 +27,7 @@
       format-icons = {
         headphone = "󰋋 ";
         headset = "󰋋 ";
-        default = [" " " "];
+        default = [ " " " " ];
       };
       on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
       on-click-middle = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 100%";
@@ -262,7 +262,7 @@
         name = "bar1";
         position = "top";
         layer = "bottom";
-        output = [config.displays.d1 "VGA-1"];
+        output = [ config.displays.d1 "VGA-1" ];
         modules-left = ["sway/workspaces" "sway/window"];
         modules-right = [
           "pulseaudio"
@@ -287,13 +287,13 @@
         "sway/scratchpad" = scratchpadModule;
         "tray" = trayModule;
         "bluetooth" = bluetoothModule;
-        "network" = networkModule // {interface = "enp*";};
+        "network" = networkModule // { interface = "enp*"; };
       };
       display2 = {
         name = "bar2";
         position = "top";
         layer = "bottom";
-        output = [config.displays.d2];
+        output = [ config.displays.d2 ];
         modules-left = ["sway/workspaces" "sway/window"];
         modules-right = [
           "pulseaudio"
@@ -318,7 +318,7 @@
         name = "bar3";
         position = "top";
         layer = "bottom";
-        output = [config.displays.d3];
+        output = [ config.displays.d3 ];
         modules-left = ["sway/workspaces" "sway/window"];
         modules-right = [
           "pulseaudio"
@@ -341,8 +341,8 @@
         name = "laptop";
         position = "top";
         layer = "bottom";
-        output = ["eDP-1" "LVDS-1" "DSI-1" "HDMI-A-1"];
+        output = [ "eDP-1" "LVDS-1" "DSI-1" "HDMI-A-1" ];
-        modules-left = ["sway/workspaces" "sway/window"];
+        modules-left = [ "sway/workspaces" "sway/window" ];
         modules-right = [
           "pulseaudio"
           "custom/media"
@@ -457,13 +457,13 @@
         color: #888;
       }
       #custom-weather {
-        border-bottom: 3px solid #${config.look.colors.prime};
+        border-bottom: 3px solid #3823C4;
       }
       #custom-weather2 {
         border-bottom: 3px solid #c75bd3;
       }
       #custom-notifs {
-        border-bottom: 3px solid #${config.look.colors.prime};
+        border-bottom: 3px solid #3823C4;
       }
       #custom-notifs.disabled {
         color: #888;

variables/look/colors/default.nix

@@ -1,19 +1,6 @@
-{ lib, config, ... }:
+{ ... }:
 {
-  options.look.colors = lib.mkOption {
+  imports = [
-    type = lib.types.attrs;
+    ./red
-    default = {};
+  ];
-  };
-
-  config.look.colors = {
-    prime = ''3823C4''; #3823C4
-    accent = ''1B1F59''; #1B1F59
-    split = ''555B9E''; #555B9E
-    actSplit = ''5980B7''; #5980B7
-    dark = ''101419''; #101419
-    mid = ''171C23''; #171C23
-    light = ''272b33''; #272B33
-    urgent = ''C43823''; #C43823
-    text = ''C7D3E3''; #C7D3E3
-  };
 }

variables/look/colors/purple/default.nix

@@ -0,0 +1,19 @@
+{ lib, config, ... }:
+{
+  options.look.colors = lib.mkOption {
+    type = lib.types.attrs;
+    default = {};
+  };
+
+  config.look.colors = {
+    prime = ''3823C4''; #3823C4
+    accent = ''1B1F59''; #1B1F59
+    split = ''555B9E''; #555B9E
+    actSplit = ''5980B7''; #5980B7
+    dark = ''101419''; #101419
+    mid = ''171C23''; #171C23
+    light = ''272b33''; #272B33
+    urgent = ''C43823''; #C43823
+    text = ''C7D3E3''; #C7D3E3
+  };
+}

variables/look/colors/red/default.nix

@@ -0,0 +1,19 @@
+{ lib, config, ... }:
+{
+  options.look.colors = lib.mkOption {
+    type = lib.types.attrs;
+    default = {};
+  };
+
+  config.look.colors = {
+    prime = ''c91236''; #c91236
+    accent = ''56111f''; #56111f
+    split = ''722d51''; #722d51
+    actSplit = ''754566''; #754566
+    dark = ''191016''; #191016
+    mid = ''23171d''; #23171d
+    light = ''272b33''; #272B33
+    urgent = ''C43823''; #C43823
+    text = ''C7D3E3''; #C7D3E3
+  };
+}