Lock file maintenance

[m] Fix dunst pos
2024-02-24 01:02:17 +00:00 · 2024-02-22 01:01:19 +00:00 · 2024-02-22 00:04:21 +01:00 · 2024-02-18 10:19:51 +01:00 · 2024-02-18 10:13:33 +01:00 · 2024-02-18 08:44:11 +01:00
26 changed files with 324 additions and 311 deletions
--- a/flake.lock
+++ b/flake.lock
@ -23,11 +23,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706833576,
-        "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
+        "lastModified": 1708655464,
+        "narHash": "sha256-dhi3XXT662o1FtP/Li2dIwcQCco6nhT+Yv71dptTlSw=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
+        "rev": "314a36d99b507892b598da72d0f9d78db084cec9",
        "type": "github"
      },
      "original": {
@ -39,11 +39,11 @@
    },
    "hardware": {
      "locked": {
-        "lastModified": 1706834982,
-        "narHash": "sha256-3CfxA7gZ+DVv/N9Pvw61bV5Oe/mWfxYPyVQGqp9TMJA=",
+        "lastModified": 1708594753,
+        "narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "83e571bb291161682b9c3ccd48318f115143a550",
+        "rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958",
        "type": "github"
      },
      "original": {
@ -59,11 +59,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1707114923,
-        "narHash": "sha256-LDYPWa+BgxHSNEye93SyIPgz5u3RAfh78P9KyO+rQzI=",
+        "lastModified": 1708591310,
+        "narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "afcedcf2c8e424d0465e823cf833eb3adebe1db7",
+        "rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55",
        "type": "github"
      },
      "original": {
@ -75,6 +75,7 @@
    "hyprland": {
      "inputs": {
        "hyprland-protocols": "hyprland-protocols",
+        "hyprlang": "hyprlang",
        "nixpkgs": [
          "nixpkgs"
        ],
@ -83,11 +84,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1707142088,
-        "narHash": "sha256-kyZNkkhLLuhqUIuLPaOUxVRH7IS9IDpijhW0nkEWEW4=",
+        "lastModified": 1708728491,
+        "narHash": "sha256-MSgkR3iRKdVj4EUMwAA0lz77+kdFLF+lazq2Y/1YuM0=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "f9202f791e3690ad248c842158ee9fa9e1105ea6",
+        "rev": "f27054c13e72598e43771cb3f8bfad8ac6c6668f",
        "type": "github"
      },
      "original": {
@ -125,16 +126,19 @@
      "inputs": {
        "nixpkgs": [
          "hyprland",
-          "xdph",
          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
        ]
      },
      "locked": {
-        "lastModified": 1704287638,
-        "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=",
+        "lastModified": 1708681732,
+        "narHash": "sha256-ULZZLZ9C33G13IaXLuAc4oTzHUvnATI8Fj2u6gzMfT0=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97",
+        "rev": "f4466367ef0a92a6425d482050dc2b8840c0e644",
        "type": "github"
      },
      "original": {
@ -149,11 +153,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1706637303,
-        "narHash": "sha256-K6SqE9diWDCoEQ+MzuVlTfNrAKcdIa/dLHBtKfz445U=",
+        "lastModified": 1707825078,
+        "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=",
        "owner": "misterio77",
        "repo": "nix-colors",
-        "rev": "fc080c51d2a219b40d886870e364243783ed5ca1",
+        "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1",
        "type": "github"
      },
      "original": {
@ -164,11 +168,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1706913249,
-        "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=",
+        "lastModified": 1708655239,
+        "narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "e92b6015881907e698782c77641aa49298330223",
+        "rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a",
        "type": "github"
      },
      "original": {
@ -195,11 +199,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1707151471,
-        "narHash": "sha256-1au4c4EKRPNT8zx7sJ1vamevyA0EPjF1938Naz9af/8=",
+        "lastModified": 1708731959,
+        "narHash": "sha256-zneXL4+jxo1e08rSEOTCFaSHYNQicYeV5t26S+seguc=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "2fd6d20bb00f05fc91321c2eebd497c2e5247d74",
+        "rev": "1588531309e9bd3ed51cb280e66e628b53dfb73f",
        "type": "github"
      },
      "original": {
@ -230,11 +234,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1707015547,
-        "narHash": "sha256-YZr0OrqWPdbwBhxpBu69D32ngJZw8AMgZtJeaJn0e94=",
+        "lastModified": 1708500294,
+        "narHash": "sha256-mvJIecY3tDKZh7297mqOtOuAvP7U1rqjfLNfmfkjFpU=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "23f61b897c00b66855074db471ba016e0cda20dd",
+        "rev": "f6b80ab6cd25e57f297fe466ad689d8a77057c11",
        "type": "github"
      },
      "original": {
@ -262,18 +266,18 @@
      "flake": false,
      "locked": {
        "host": "gitlab.freedesktop.org",
-        "lastModified": 1706359063,
-        "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=",
+        "lastModified": 1708558866,
+        "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2",
+        "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
        "type": "gitlab"
      },
      "original": {
        "host": "gitlab.freedesktop.org",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2",
+        "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
        "type": "gitlab"
      }
    },
@ -283,7 +287,10 @@
          "hyprland",
          "hyprland-protocols"
        ],
-        "hyprlang": "hyprlang",
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
        "nixpkgs": [
          "hyprland",
          "nixpkgs"
@ -294,11 +301,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706145785,
-        "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=",
+        "lastModified": 1708696469,
+        "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "5a592647587cd20b9692a347df6939b6d371b3bb",
+        "rev": "1b713911c2f12b96c2574474686e4027ac4bf826",
        "type": "github"
      },
      "original": {
--- a/modules/home/cli/btop/default.nix
+++ b/modules/home/cli/btop/default.nix
@ -6,86 +6,86 @@
    # Theme generated from: ${config.colorScheme.slug}

    # Main background, empty for terminal default, need to be empty if you want transparent background
-    theme[main_bg]="#${config.colorScheme.colors.base00}"
+    theme[main_bg]="#${config.colorScheme.palette.base00}"

    # Main text color
-    theme[main_fg]="#${config.colorScheme.colors.base07}"
+    theme[main_fg]="#${config.colorScheme.palette.base07}"

    # Title color for boxes
-    theme[title]="#${config.colorScheme.colors.base07}"
+    theme[title]="#${config.colorScheme.palette.base07}"

    # Higlight color for keyboard shortcuts
-    theme[hi_fg]="#${config.colorScheme.colors.base0E}"
+    theme[hi_fg]="#${config.colorScheme.palette.base0E}"

    # Background color of selected item in processes box
-    theme[selected_bg]="#${config.colorScheme.colors.base0C}"
+    theme[selected_bg]="#${config.colorScheme.palette.base0C}"

    # Foreground color of selected item in processes box
-    theme[selected_fg]="#${config.colorScheme.colors.base00}"
+    theme[selected_fg]="#${config.colorScheme.palette.base00}"

    # Color of inactive/disabled text
-    theme[inactive_fg]="#${config.colorScheme.colors.base02}"
+    theme[inactive_fg]="#${config.colorScheme.palette.base02}"

    # Color of text appearing on top of graphs, i.e uptime and current network graph scaling
-    theme[graph_text]="#${config.colorScheme.colors.base05}"
+    theme[graph_text]="#${config.colorScheme.palette.base05}"

    # Misc colors for processes box including mini cpu graphs, details memory graph and details status text
-    theme[proc_misc]="#${config.colorScheme.colors.base0C}"
+    theme[proc_misc]="#${config.colorScheme.palette.base0C}"

    # Cpu box outline color
-    theme[cpu_box]="#${config.colorScheme.colors.base02}"
+    theme[cpu_box]="#${config.colorScheme.palette.base02}"

    # Memory/disks box outline color
-    theme[mem_box]="#${config.colorScheme.colors.base02}"
+    theme[mem_box]="#${config.colorScheme.palette.base02}"

    # Net up/down box outline color
-    theme[net_box]="#${config.colorScheme.colors.base02}"
+    theme[net_box]="#${config.colorScheme.palette.base02}"

    # Processes box outline color
-    theme[proc_box]="#${config.colorScheme.colors.base02}"
+    theme[proc_box]="#${config.colorScheme.palette.base02}"

    # Box divider line and small boxes line color
-    theme[div_line]="#${config.colorScheme.colors.base02}"
+    theme[div_line]="#${config.colorScheme.palette.base02}"

    # Temperature graph colors
-    theme[temp_start]="#${config.colorScheme.colors.base0D}"
+    theme[temp_start]="#${config.colorScheme.palette.base0D}"
    theme[temp_mid]=""
-    theme[temp_end]="#${config.colorScheme.colors.base0F}"
+    theme[temp_end]="#${config.colorScheme.palette.base0F}"

    # CPU graph colors
-    theme[cpu_start]="#${config.colorScheme.colors.base0C}"
+    theme[cpu_start]="#${config.colorScheme.palette.base0C}"
    theme[cpu_mid]=""
-    theme[cpu_end]="#${config.colorScheme.colors.base0C}"
+    theme[cpu_end]="#${config.colorScheme.palette.base0C}"

    # Mem/Disk free meter
-    theme[free_start]="#${config.colorScheme.colors.base0A}"
+    theme[free_start]="#${config.colorScheme.palette.base0A}"
    theme[free_mid]=""
-    theme[free_end]="#${config.colorScheme.colors.base0A}"
+    theme[free_end]="#${config.colorScheme.palette.base0A}"

    # Mem/Disk cached meter
-    theme[cached_start]="#${config.colorScheme.colors.base09}"
+    theme[cached_start]="#${config.colorScheme.palette.base09}"
    theme[cached_mid]=""
-    theme[cached_end]="#${config.colorScheme.colors.base09}"
+    theme[cached_end]="#${config.colorScheme.palette.base09}"

    # Mem/Disk available meter
-    theme[available_start]="#${config.colorScheme.colors.base0B}"
+    theme[available_start]="#${config.colorScheme.palette.base0B}"
    theme[available_mid]=""
-    theme[available_end]="#${config.colorScheme.colors.base0B}"
+    theme[available_end]="#${config.colorScheme.palette.base0B}"

    # Mem/Disk used meter
-    theme[used_start]="#${config.colorScheme.colors.base08}"
+    theme[used_start]="#${config.colorScheme.palette.base08}"
    theme[used_mid]=""
-    theme[used_end]="#${config.colorScheme.colors.base08}"
+    theme[used_end]="#${config.colorScheme.palette.base08}"

    # Download graph colors
-    theme[download_start]="#${config.colorScheme.colors.base02}"
+    theme[download_start]="#${config.colorScheme.palette.base02}"
    theme[download_mid]=""
-    theme[download_end]="#${config.colorScheme.colors.base0D}"
+    theme[download_end]="#${config.colorScheme.palette.base0D}"

    # Upload graph colors
-    theme[upload_start]="#${config.colorScheme.colors.base02}"
+    theme[upload_start]="#${config.colorScheme.palette.base02}"
    theme[upload_mid]=""
-    theme[upload_end]="#${config.colorScheme.colors.base0E}"
+    theme[upload_end]="#${config.colorScheme.palette.base0E}"
     
  '';
 }
--- a/modules/home/cli/kitty/default.nix
+++ b/modules/home/cli/kitty/default.nix
@ -2,53 +2,53 @@
  programs.kitty = {
    enable = true;
    settings = {
-      foreground = "#${config.colorScheme.colors.base07}";
-      background = "#${config.colorScheme.colors.base00}";
-      selection_foreground = "#${config.colorScheme.colors.base07}";
-      selection_background = "#${config.colorScheme.colors.base03}";
+      foreground = "#${config.colorScheme.palette.base07}";
+      background = "#${config.colorScheme.palette.base00}";
+      selection_foreground = "#${config.colorScheme.palette.base07}";
+      selection_background = "#${config.colorScheme.palette.base03}";
      background_opacity = "0.9";

-      cursor = "#${config.colorScheme.colors.base05}";
-      cursor_text_color = "#${config.colorScheme.colors.base01}";
+      cursor = "#${config.colorScheme.palette.base05}";
+      cursor_text_color = "#${config.colorScheme.palette.base01}";

-      url_color = "#${config.colorScheme.colors.base05}";
+      url_color = "#${config.colorScheme.palette.base05}";

-      active_border_color = "#${config.colorScheme.colors.base05}";
-      inactive_border_color = "#${config.colorScheme.colors.base03}";
-      bell_border_color = "#${config.colorScheme.colors.base09}";
+      active_border_color = "#${config.colorScheme.palette.base05}";
+      inactive_border_color = "#${config.colorScheme.palette.base03}";
+      bell_border_color = "#${config.colorScheme.palette.base09}";

      wayland_titlebar_color = "system";
      macos_titlebar_color = "system";

-      active_tab_foreground = "#${config.colorScheme.colors.base0C}";
-      active_tab_background = "#${config.colorScheme.colors.base01}";
-      inactive_tab_foreground = "#${config.colorScheme.colors.base06}";
-      inactive_tab_background = "#${config.colorScheme.colors.base00}";
-      tab_bar_background = "#${config.colorScheme.colors.base02}";
+      active_tab_foreground = "#${config.colorScheme.palette.base0C}";
+      active_tab_background = "#${config.colorScheme.palette.base01}";
+      inactive_tab_foreground = "#${config.colorScheme.palette.base06}";
+      inactive_tab_background = "#${config.colorScheme.palette.base00}";
+      tab_bar_background = "#${config.colorScheme.palette.base02}";

-      mark1_foreground = "#${config.colorScheme.colors.base00}";
-      mark1_background = "#${config.colorScheme.colors.base0C}";
-      mark2_foreground = "#${config.colorScheme.colors.base00}";
-      mark2_background = "#${config.colorScheme.colors.base0E}";
-      mark3_foreground = "#${config.colorScheme.colors.base00}";
-      mark3_background = "#${config.colorScheme.colors.base0A}";
+      mark1_foreground = "#${config.colorScheme.palette.base00}";
+      mark1_background = "#${config.colorScheme.palette.base0C}";
+      mark2_foreground = "#${config.colorScheme.palette.base00}";
+      mark2_background = "#${config.colorScheme.palette.base0E}";
+      mark3_foreground = "#${config.colorScheme.palette.base00}";
+      mark3_background = "#${config.colorScheme.palette.base0A}";

-      color0 = "#${config.colorScheme.colors.base01}";
-      color1 = "#${config.colorScheme.colors.base0F}";
-      color2 = "#${config.colorScheme.colors.base0A}";
-      color3 = "#${config.colorScheme.colors.base09}";
-      color4 = "#${config.colorScheme.colors.base0C}";
-      color5 = "#${config.colorScheme.colors.base0D}";
-      color6 = "#${config.colorScheme.colors.base0B}";
-      color7 = "#${config.colorScheme.colors.base07}";
-      color8 = "#${config.colorScheme.colors.base01}";
-      color9 = "#${config.colorScheme.colors.base0F}";
-      color10 = "#${config.colorScheme.colors.base0A}";
-      color11 = "#${config.colorScheme.colors.base09}";
-      color12 = "#${config.colorScheme.colors.base0C}";
-      color13 = "#${config.colorScheme.colors.base0D}";
-      color14 = "#${config.colorScheme.colors.base0B}";
-      color15 = "#${config.colorScheme.colors.base07}";
+      color0 = "#${config.colorScheme.palette.base01}";
+      color1 = "#${config.colorScheme.palette.base0F}";
+      color2 = "#${config.colorScheme.palette.base0A}";
+      color3 = "#${config.colorScheme.palette.base09}";
+      color4 = "#${config.colorScheme.palette.base0C}";
+      color5 = "#${config.colorScheme.palette.base0D}";
+      color6 = "#${config.colorScheme.palette.base0B}";
+      color7 = "#${config.colorScheme.palette.base07}";
+      color8 = "#${config.colorScheme.palette.base01}";
+      color9 = "#${config.colorScheme.palette.base0F}";
+      color10 = "#${config.colorScheme.palette.base0A}";
+      color11 = "#${config.colorScheme.palette.base09}";
+      color12 = "#${config.colorScheme.palette.base0C}";
+      color13 = "#${config.colorScheme.palette.base0D}";
+      color14 = "#${config.colorScheme.palette.base0B}";
+      color15 = "#${config.colorScheme.palette.base07}";

      font_size = 12;
      window-padding-width = 15;
--- a/modules/home/cli/starship/default.nix
+++ b/modules/home/cli/starship/default.nix
@ -10,36 +10,36 @@
    enableZshIntegration = true;
    settings = {
      format = lib.concatStrings [
-        "[░▒▓](#${config.colorScheme.colors.base06})"
+        "[░▒▓](#${config.colorScheme.palette.base06})"
        "$username"
        "$hostname"
-        "[](bg:#${config.colorScheme.colors.base05} fg:#${config.colorScheme.colors.base06})"
+        "[](bg:#${config.colorScheme.palette.base05} fg:#${config.colorScheme.palette.base06})"
        "$directory"
-        "[](bg:#${config.colorScheme.colors.base04} fg:#${config.colorScheme.colors.base05})"
-        "[ ](bg:#${config.colorScheme.colors.base04})"
+        "[](bg:#${config.colorScheme.palette.base04} fg:#${config.colorScheme.palette.base05})"
+        "[ ](bg:#${config.colorScheme.palette.base04})"
        "$env_var"
-        "[](bg:#${config.colorScheme.colors.base00} fg:#${config.colorScheme.colors.base04})"
+        "[](bg:#${config.colorScheme.palette.base00} fg:#${config.colorScheme.palette.base04})"
        " "
      ];
      username = {
        show_always = true;
        style_user =
-          "bg:#${config.colorScheme.colors.base06} fg:#${config.colorScheme.colors.base00}";
+          "bg:#${config.colorScheme.palette.base06} fg:#${config.colorScheme.palette.base00}";
        style_root =
-          "bg:#${config.colorScheme.colors.base06} fg:#${config.colorScheme.colors.base00}";
+          "bg:#${config.colorScheme.palette.base06} fg:#${config.colorScheme.palette.base00}";
        format = "[ $user]($style)";
      };
      hostname = {
        ssh_symbol = "";
        style =
-          "bg:#${config.colorScheme.colors.base06} fg:#${config.colorScheme.colors.base00}";
+          "bg:#${config.colorScheme.palette.base06} fg:#${config.colorScheme.palette.base00}";
        format = "[@$hostname]($style)";
        ssh_only = false;
        disabled = false;
      };
      directory = {
        style =
-          "bg:#${config.colorScheme.colors.base05} fg:#${config.colorScheme.colors.base00}";
+          "bg:#${config.colorScheme.palette.base05} fg:#${config.colorScheme.palette.base00}";
        format = "[ $path ]($style)";
        truncation_length = 3;
        truncation_symbol = "…/";
@ -54,7 +54,7 @@
        variable = "SHELLENVTYPE";
        default = "";
        style =
-          "bg:#${config.colorScheme.colors.base04} fg:#${config.colorScheme.colors.base00}";
+          "bg:#${config.colorScheme.palette.base04} fg:#${config.colorScheme.palette.base00}";
        format = "[$env_value]($style)";
      };
    };
--- a/modules/home/gui/apps/zathura/default.nix
+++ b/modules/home/gui/apps/zathura/default.nix
@ -4,43 +4,43 @@
    programs.zathura = {
      enable = true;
      extraConfig = ''
-        set default-fg                "#${config.colorScheme.colors.base06}"
-        set default-bg 			          "#${config.colorScheme.colors.base00}"
+        set default-fg                "#${config.colorScheme.palette.base06}"
+        set default-bg 			          "#${config.colorScheme.palette.base00}"

-        set completion-bg		          "#${config.colorScheme.colors.base02}"
-        set completion-fg		          "#${config.colorScheme.colors.base06}"
-        set completion-highlight-bg	  "#${config.colorScheme.colors.base03}"
-        set completion-highlight-fg	  "#${config.colorScheme.colors.base06}"
-        set completion-group-bg		    "#${config.colorScheme.colors.base01}"
-        set completion-group-fg		    "#${config.colorScheme.colors.base0C}"
+        set completion-bg		          "#${config.colorScheme.palette.base02}"
+        set completion-fg		          "#${config.colorScheme.palette.base06}"
+        set completion-highlight-bg	  "#${config.colorScheme.palette.base03}"
+        set completion-highlight-fg	  "#${config.colorScheme.palette.base06}"
+        set completion-group-bg		    "#${config.colorScheme.palette.base01}"
+        set completion-group-fg		    "#${config.colorScheme.palette.base0C}"

-        set statusbar-fg		          "#${config.colorScheme.colors.base06}"
-        set statusbar-bg		          "#${config.colorScheme.colors.base01}"
+        set statusbar-fg		          "#${config.colorScheme.palette.base06}"
+        set statusbar-bg		          "#${config.colorScheme.palette.base01}"

-        set notification-bg		        "#${config.colorScheme.colors.base01}"
-        set notification-fg		        "#${config.colorScheme.colors.base06}"
-        set notification-error-bg	    "#${config.colorScheme.colors.base01}"
-        set notification-error-fg	    "#${config.colorScheme.colors.base0F}"
-        set notification-warning-bg	  "#${config.colorScheme.colors.base01}"
-        set notification-warning-fg	  "#${config.colorScheme.colors.base09}"
+        set notification-bg		        "#${config.colorScheme.palette.base01}"
+        set notification-fg		        "#${config.colorScheme.palette.base06}"
+        set notification-error-bg	    "#${config.colorScheme.palette.base01}"
+        set notification-error-fg	    "#${config.colorScheme.palette.base0F}"
+        set notification-warning-bg	  "#${config.colorScheme.palette.base01}"
+        set notification-warning-fg	  "#${config.colorScheme.palette.base09}"

-        set inputbar-fg			          "#${config.colorScheme.colors.base06}"
-        set inputbar-bg 		          "#${config.colorScheme.colors.base01}"
+        set inputbar-fg			          "#${config.colorScheme.palette.base06}"
+        set inputbar-bg 		          "#${config.colorScheme.palette.base01}"

-        set recolor-lightcolor		    "#${config.colorScheme.colors.base00}"
-        set recolor-darkcolor		      "#${config.colorScheme.colors.base06}"
+        set recolor-lightcolor		    "#${config.colorScheme.palette.base00}"
+        set recolor-darkcolor		      "#${config.colorScheme.palette.base06}"

-        set index-fg			            "#${config.colorScheme.colors.base06}"
-        set index-bg			            "#${config.colorScheme.colors.base00}"
-        set index-active-fg		        "#${config.colorScheme.colors.base06}"
-        set index-active-bg		        "#${config.colorScheme.colors.base01}"
+        set index-fg			            "#${config.colorScheme.palette.base06}"
+        set index-bg			            "#${config.colorScheme.palette.base00}"
+        set index-active-fg		        "#${config.colorScheme.palette.base06}"
+        set index-active-bg		        "#${config.colorScheme.palette.base01}"

-        set render-loading-bg		      "#${config.colorScheme.colors.base00}"
-        set render-loading-fg		      "#${config.colorScheme.colors.base06}"
+        set render-loading-bg		      "#${config.colorScheme.palette.base00}"
+        set render-loading-fg		      "#${config.colorScheme.palette.base06}"

-        set highlight-color		        "#${config.colorScheme.colors.base04}"
-        set highlight-fg              "#${config.colorScheme.colors.base0E}"
-        set highlight-active-color	  "#${config.colorScheme.colors.base0E}"
+        set highlight-color		        "#${config.colorScheme.palette.base04}"
+        set highlight-fg              "#${config.colorScheme.palette.base0E}"
+        set highlight-active-color	  "#${config.colorScheme.palette.base0E}"

      '';
    };
--- a/modules/home/gui/theme/gtk-theme-gen.nix
+++ b/modules/home/gui/theme/gtk-theme-gen.nix
@ -35,26 +35,26 @@ in pkgs.stdenv.mkDerivation rec {
    sed -e 's/handle-horz-.*//' -e 's/handle-vert-.*//' -i ./src/gtk-2.0/assets.txt

    cat > /build/gtk-colors << EOF
-      BG=${scheme.colors.base00}
-      FG=${scheme.colors.base07}
-      HDR_BG=${scheme.colors.base00}
-      HDR_FG=${scheme.colors.base07}
-      SEL_BG=${scheme.colors.base03}
-      SEL_FG=${scheme.colors.base07}
-      TXT_BG=${scheme.colors.base01}
-      TXT_FG=${scheme.colors.base07}
-      BTN_BG=${scheme.colors.base01}
-      BTN_FG=${scheme.colors.base07}
-      HDR_BTN_BG=${scheme.colors.base01}
-      HDR_BTN_FG=${scheme.colors.base07}
-      MENU_BG=${scheme.colors.base00}
-      MENU_FG=${scheme.colors.base07}
-      ACCENT_BG=${scheme.colors.base0C}
-      ACCENT_FG=${scheme.colors.base00}
-      MATERIA_SURFACE=${scheme.colors.base01}
-      MATERIA_VIEW=${scheme.colors.base00}
-      WM_BORDER_FOCUS=${scheme.colors.base02}
-      WM_BORDER_UNFOCUS=${scheme.colors.base02}
+      BG=${scheme.palette.base00}
+      FG=${scheme.palette.base07}
+      HDR_BG=${scheme.palette.base00}
+      HDR_FG=${scheme.palette.base07}
+      SEL_BG=${scheme.palette.base03}
+      SEL_FG=${scheme.palette.base07}
+      TXT_BG=${scheme.palette.base01}
+      TXT_FG=${scheme.palette.base07}
+      BTN_BG=${scheme.palette.base01}
+      BTN_FG=${scheme.palette.base07}
+      HDR_BTN_BG=${scheme.palette.base01}
+      HDR_BTN_FG=${scheme.palette.base07}
+      MENU_BG=${scheme.palette.base00}
+      MENU_FG=${scheme.palette.base07}
+      ACCENT_BG=${scheme.palette.base0C}
+      ACCENT_FG=${scheme.palette.base00}
+      MATERIA_SURFACE=${scheme.palette.base01}
+      MATERIA_VIEW=${scheme.palette.base00}
+      WM_BORDER_FOCUS=${scheme.palette.base02}
+      WM_BORDER_UNFOCUS=${scheme.palette.base02}
      UNITY_DEFAULT_LAUNCHER_STYLE=False
      ROUNDNESS=7
      NAME=${scheme.slug}
--- a/modules/home/gui/theme/wallpaper-gen.nix
+++ b/modules/home/gui/theme/wallpaper-gen.nix
@ -2,7 +2,7 @@

 let
  scheme = config.colorScheme;
-  colors = scheme.colors;
+  colors = scheme.palette;
  dither =
    "atkinson"; # none | floyd-steinberg | atkinson | jjn | burkes | sierra | sierra-lite
 in pkgs.stdenv.mkDerivation rec {
--- a/modules/home/wayland/apps/dunst/default.nix
+++ b/modules/home/wayland/apps/dunst/default.nix
@ -12,8 +12,10 @@
          width = "350";
          scale = "0";
          origin = "top-right";
-          offset =
-            "${config.colorScheme.colors.gaps-bar}x${config.colorScheme.colors.gaps-screen}";
+          offset = "${
+              toString ((lib.strings.toInt config.colorScheme.palette.gaps-bar)
+                + (lib.strings.toInt config.colorScheme.palette.gaps-screen))
+            }x${config.colorScheme.palette.gaps-screen}";
          notification_limit = "0";
          progress_bar = "true";
          progress_bar_height = "10";
@ -26,8 +28,8 @@
          padding = "12";
          horizontal_padding = "15";
          text_icon_padding = "0";
-          frame_width = "${config.colorScheme.colors.border-width}";
-          frame_color = "#${config.colorScheme.colors.base04}";
+          frame_width = "${config.colorScheme.palette.border-width}";
+          frame_color = "#${config.colorScheme.palette.base04}";
          separator_color = "auto";
          sort = "yes";
          font = "IBM Plex Mono 14";
@ -57,7 +59,7 @@
          always_run_script = "true";
          title = "Dunst";
          class = "Dunst";
-          corner_radius = "${config.colorScheme.colors.border-radius}";
+          corner_radius = "${config.colorScheme.palette.border-radius}";
          ignore_dbusclose = "false";
          layer = "top";
          force_xwayland = "true";
@ -69,25 +71,25 @@

        };
        urgency_low = {
-          background = "#${config.colorScheme.colors.base01}";
-          foreground = "#${config.colorScheme.colors.base07}";
-          frame_color = "#${config.colorScheme.colors.base03}";
+          background = "#${config.colorScheme.palette.base01}";
+          foreground = "#${config.colorScheme.palette.base07}";
+          frame_color = "#${config.colorScheme.palette.base03}";
          timeout = "3";
-          highlight = "#${config.colorScheme.colors.base0B}";
+          highlight = "#${config.colorScheme.palette.base0B}";
        };
        urgency_normal = {
-          background = "#${config.colorScheme.colors.base01}";
-          foreground = "#${config.colorScheme.colors.base07}";
-          frame_color = "#${config.colorScheme.colors.base04}";
+          background = "#${config.colorScheme.palette.base01}";
+          foreground = "#${config.colorScheme.palette.base07}";
+          frame_color = "#${config.colorScheme.palette.base04}";
          timeout = "5";
-          highlight = "#${config.colorScheme.colors.base0C}";
+          highlight = "#${config.colorScheme.palette.base0C}";
        };
        urgency_critical = {
-          background = "#${config.colorScheme.colors.base01}";
-          foreground = "#${config.colorScheme.colors.base0F}";
-          frame_color = "#${config.colorScheme.colors.base0F}";
+          background = "#${config.colorScheme.palette.base01}";
+          foreground = "#${config.colorScheme.palette.base0F}";
+          frame_color = "#${config.colorScheme.palette.base0F}";
          timeout = "10";
-          highlight = "#${config.colorScheme.colors.base0E}";
+          highlight = "#${config.colorScheme.palette.base0E}";
        };
      };
    };
--- a/modules/home/wayland/apps/eww/bar/modules/sys.yuck
+++ b/modules/home/wayland/apps/eww/bar/modules/sys.yuck
@ -36,6 +36,7 @@
          :visible {battery.visible}
          :style "color: ${battery.color};"
          :thickness 6
+          :tooltip "${battery.status} @ ${battery.wattage}"
          (label :class "icon-text" :text "B"))
      )
    )
--- a/modules/home/wayland/apps/eww/bar/scripts/net/net
+++ b/modules/home/wayland/apps/eww/bar/scripts/net/net
@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh

 function get_time_ms {
  date -u +%s%3N
@ -26,7 +26,8 @@ function gen_wifi() {
  icon=${icons[$level]}
  ip="-"
  class="net-connected"
-  name=$(wpa_cli status | grep \^ssid= | sed 's/ssid=//g')
+  name_raw=$(wpa_cli status | grep \^ssid= | sed 's/ssid=//g')
+  name=$(printf "%s" $name_raw)
 }

 function gen_ethernet() {
--- a/modules/home/wayland/apps/eww/bar/scripts/sys/battery
+++ b/modules/home/wayland/apps/eww/bar/scripts/sys/battery
@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh

 icons=("󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹")
 num_icons=$(awk -v n="${#icons[@]}" 'BEGIN{print 100 / n}')
@ -11,7 +11,7 @@ geticon() {

 status() {
  if [ "$STATE" = "Charging" ]; then
-    echo -n "charging"
+    echo -n "Charging"

    if [ "$RATE" -gt 0 ]; then
      echo ", $(gettime) left"
@ -21,7 +21,7 @@ status() {
  elif [ "$STATE" = "Discharging" ]; then
    echo "$(gettime)h left"
  else
-    echo "fully charged"
+    echo "Fully Charged"
  fi
 }

@ -39,9 +39,9 @@ gettime() {

  if [ "$RATE" -gt 0 ]; then
    if [ "$STATE" = "Discharging" ]; then
-      EX="$NOW / $RATE"
+      EX=$(( ($NOW*1.0) / $RATE))
    else
-      EX="($FULL - $NOW) / $RATE"
+      EX=$(( (($FULL - $NOW)*1.0) / $RATE))
    fi
    date -u -d@"$(awk -v ex="$EX" 'BEGIN{print ex * 3600}')" +%H:%M
  fi
--- a/modules/home/wayland/apps/eww/bar/scripts/sys/cpu
+++ b/modules/home/wayland/apps/eww/bar/scripts/sys/cpu
@ -1 +1 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh
--- a/modules/home/wayland/apps/eww/bar/scripts/sys/gpu
+++ b/modules/home/wayland/apps/eww/bar/scripts/sys/gpu
@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh

 amdgpu_top -J -s 5000 | sed 's/ //g' 
--- a/modules/home/wayland/apps/eww/bar/scripts/sys/memory
+++ b/modules/home/wayland/apps/eww/bar/scripts/sys/memory
@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh

 total="$(free --si | rg Mem | awk '{print $2}')"

--- a/modules/home/wayland/apps/eww/default.nix
+++ b/modules/home/wayland/apps/eww/default.nix
@ -16,22 +16,22 @@

    # colors file
    xdg.configFile."eww/css/_colors.scss".text = ''
-      $base00: #${config.colorScheme.colors.base00};
-      $base01: #${config.colorScheme.colors.base01};
-      $base02: #${config.colorScheme.colors.base02};
-      $base03: #${config.colorScheme.colors.base03};
-      $base04: #${config.colorScheme.colors.base04};
-      $base05: #${config.colorScheme.colors.base05};
-      $base06: #${config.colorScheme.colors.base06};
-      $base07: #${config.colorScheme.colors.base07};
-      $base08: #${config.colorScheme.colors.base08};
-      $base09: #${config.colorScheme.colors.base09};
-      $base0A: #${config.colorScheme.colors.base0A};
-      $base0B: #${config.colorScheme.colors.base0B};
-      $base0C: #${config.colorScheme.colors.base0C};
-      $base0D: #${config.colorScheme.colors.base0D};
-      $base0E: #${config.colorScheme.colors.base0E};
-      $base0F: #${config.colorScheme.colors.base0F};
+      $base00: #${config.colorScheme.palette.base00};
+      $base01: #${config.colorScheme.palette.base01};
+      $base02: #${config.colorScheme.palette.base02};
+      $base03: #${config.colorScheme.palette.base03};
+      $base04: #${config.colorScheme.palette.base04};
+      $base05: #${config.colorScheme.palette.base05};
+      $base06: #${config.colorScheme.palette.base06};
+      $base07: #${config.colorScheme.palette.base07};
+      $base08: #${config.colorScheme.palette.base08};
+      $base09: #${config.colorScheme.palette.base09};
+      $base0A: #${config.colorScheme.palette.base0A};
+      $base0B: #${config.colorScheme.palette.base0B};
+      $base0C: #${config.colorScheme.palette.base0C};
+      $base0D: #${config.colorScheme.palette.base0D};
+      $base0E: #${config.colorScheme.palette.base0E};
+      $base0F: #${config.colorScheme.palette.base0F};


      $fg: $base07;
@ -40,11 +40,11 @@

      $border-color: $base03;
      $border-color-focus: $base04;
-      $border-radius: ${config.colorScheme.colors.border-radius}px;
-      $border-width: ${config.colorScheme.colors.border-width}px;
+      $border-radius: ${config.colorScheme.palette.border-radius}px;
+      $border-width: ${config.colorScheme.palette.border-width}px;

-      $gaps-screen: ${config.colorScheme.colors.gaps-screen}px;
-      $gaps-window: ${config.colorScheme.colors.gaps-window}px;
+      $gaps-screen: ${config.colorScheme.palette.gaps-screen}px;
+      $gaps-window: ${config.colorScheme.palette.gaps-window}px;
    '';
  };
 }
--- a/modules/home/wayland/apps/waybar/default.nix
+++ b/modules/home/wayland/apps/waybar/default.nix
@ -28,23 +28,23 @@ in {
      style = ''
         * {
          border: none;
-          border-radius: ${config.colorScheme.colors.border-radius}pt;
+          border-radius: ${config.colorScheme.palette.border-radius}pt;
          font-family:'Monospace','Material Design Icons','Openmoji';
          font-size: 13pt;
-          color: #${config.colorScheme.colors.base07};
+          color: #${config.colorScheme.palette.base07};
        }

        window#waybar {
          background: transparent;
-          padding-top: ${config.colorScheme.colors.gaps-screen}pt;
-          padding-bottom: ${config.colorScheme.colors.gaps-screen}pt;
+          padding-top: ${config.colorScheme.palette.gaps-screen}pt;
+          padding-bottom: ${config.colorScheme.palette.gaps-screen}pt;
        }

        tooltip {
-          background: #${config.colorScheme.colors.base01};
-          border-radius: ${config.colorScheme.colors.border-radius}pt;
-          border-color: #${config.colorScheme.colors.base03};
-          border-width: ${config.colorScheme.colors.border-width}pt;
+          background: #${config.colorScheme.palette.base01};
+          border-radius: ${config.colorScheme.palette.border-radius}pt;
+          border-color: #${config.colorScheme.palette.base03};
+          border-width: ${config.colorScheme.palette.border-width}pt;
          border-style: solid;
          font-size: 13pt;
        }
@ -64,19 +64,19 @@ in {
        }

        #workspaces button.focused {
-          color: #${config.colorScheme.colors.base0C};
+          color: #${config.colorScheme.palette.base0C};
        }

        #workspaces button.active {
-          color: #${config.colorScheme.colors.base0C};
+          color: #${config.colorScheme.palette.base0C};
        }

        #workspaces button.urgent {
-          color: #${config.colorScheme.colors.base08};
+          color: #${config.colorScheme.palette.base08};
        }

        #workspaces button:hover icon {
-          color: #${config.colorScheme.colors.base04};
+          color: #${config.colorScheme.palette.base04};
        }

        #workspaces,
@ -88,16 +88,16 @@ in {
        #custom-powermenu,
        #clock, #clock.date, #clock.time
        { 
-          background: #${config.colorScheme.colors.base01};
-          margin-bottom: ${config.colorScheme.colors.gaps-window}pt;
+          background: #${config.colorScheme.palette.base01};
+          margin-bottom: ${config.colorScheme.palette.gaps-window}pt;
          padding-top: 2px;
          padding-left: 2px;
          padding-bottom: 2px;
          border-top-right-radius: 0px;
          border-bottom-right-radius: 0px;
-          border-top: ${config.colorScheme.colors.border-width}px solid #${config.colorScheme.colors.base03};
-          border-left: ${config.colorScheme.colors.border-width}px solid #${config.colorScheme.colors.base03};
-          border-bottom: ${config.colorScheme.colors.border-width}px solid #${config.colorScheme.colors.base03};
+          border-top: ${config.colorScheme.palette.border-width}px solid #${config.colorScheme.palette.base03};
+          border-left: ${config.colorScheme.palette.border-width}px solid #${config.colorScheme.palette.base03};
+          border-bottom: ${config.colorScheme.palette.border-width}px solid #${config.colorScheme.palette.base03};
        }

        #custom-powermenu {          
--- a/modules/home/wayland/apps/waylock/default.nix
+++ b/modules/home/wayland/apps/waylock/default.nix
@ -12,43 +12,43 @@
      ignore-empty-password
      font=IBM Plex Mono

-      color=${config.colorscheme.colors.base00}00
+      color=${config.colorScheme.palette.base00}00

      indicator-radius=100
      indicator-thickness=30

-      separator-color=${config.colorscheme.colors.base00}00
+      separator-color=${config.colorScheme.palette.base00}00

-      inside-color=${config.colorscheme.colors.base0C}00
-      inside-clear-color=${config.colorscheme.colors.base08}FF
-      inside-caps-lock-color=${config.colorscheme.colors.base09}00
-      inside-ver-color=${config.colorscheme.colors.base0C}FF
-      inside-wrong-color=${config.colorscheme.colors.base0F}FF
+      inside-color=${config.colorScheme.palette.base0C}00
+      inside-clear-color=${config.colorScheme.palette.base08}FF
+      inside-caps-lock-color=${config.colorScheme.palette.base09}00
+      inside-ver-color=${config.colorScheme.palette.base0C}FF
+      inside-wrong-color=${config.colorScheme.palette.base0F}FF


-      ring-color=${config.colorscheme.colors.base00}00
-      ring-clear-color=${config.colorscheme.colors.base00}00
-      ring-caps-lock-color=${config.colorscheme.colors.base00}00
-      ring-ver-color=${config.colorscheme.colors.base00}00
-      ring-wrong-color=${config.colorscheme.colors.base00}00
+      ring-color=${config.colorScheme.palette.base00}00
+      ring-clear-color=${config.colorScheme.palette.base00}00
+      ring-caps-lock-color=${config.colorScheme.palette.base00}00
+      ring-ver-color=${config.colorScheme.palette.base00}00
+      ring-wrong-color=${config.colorScheme.palette.base00}00

-      line-color=${config.colorscheme.colors.base00}00
-      line-clear-color=${config.colorscheme.colors.base00}00
-      line-caps-lock-color=${config.colorscheme.colors.base00}00
-      line-ver-color=${config.colorscheme.colors.base00}00
-      line-wrong-color=${config.colorscheme.colors.base00}00
+      line-color=${config.colorScheme.palette.base00}00
+      line-clear-color=${config.colorScheme.palette.base00}00
+      line-caps-lock-color=${config.colorScheme.palette.base00}00
+      line-ver-color=${config.colorScheme.palette.base00}00
+      line-wrong-color=${config.colorScheme.palette.base00}00

-      text-color=${config.colorscheme.colors.base00}00
-      text-clear-color=${config.colorscheme.colors.base00}00
-      text-caps-lock-color=${config.colorscheme.colors.base00}00
-      text-ver-color=${config.colorscheme.colors.base00}00
-      text-wrong-color=${config.colorscheme.colors.base00}00
+      text-color=${config.colorScheme.palette.base00}00
+      text-clear-color=${config.colorScheme.palette.base00}00
+      text-caps-lock-color=${config.colorScheme.palette.base00}00
+      text-ver-color=${config.colorScheme.palette.base00}00
+      text-wrong-color=${config.colorScheme.palette.base00}00


-      key-hl-color=${config.colorscheme.colors.base0C}FF
-      bs-hl-color=${config.colorscheme.colors.base08}FF
-      caps-lock-key-hl-color=${config.colorscheme.colors.base09}FF
-      caps-lock-bs-hl-color=${config.colorscheme.colors.base09}FF
+      key-hl-color=${config.colorScheme.palette.base0C}FF
+      bs-hl-color=${config.colorScheme.palette.base08}FF
+      caps-lock-key-hl-color=${config.colorScheme.palette.base09}FF
+      caps-lock-bs-hl-color=${config.colorScheme.palette.base09}FF
    '';
  };
 }
--- a/modules/home/wayland/apps/wofi/default.nix
+++ b/modules/home/wayland/apps/wofi/default.nix
@ -23,8 +23,8 @@
    xdg.configFile."wofi/style.css".text = ''
      window {
        margin: 0px;
-        border-radius: ${config.colorscheme.colors.border-radius}px;
-        background-color: #${config.colorscheme.colors.base00};
+        border-radius: ${config.colorScheme.palette.border-radius}px;
+        background-color: #${config.colorScheme.palette.base00};
      }

      #input {
@ -33,14 +33,14 @@
        padding: 4px 10px;
        margin: 4px;
        border: none;
-        color: #${config.colorscheme.colors.base07};
+        color: #${config.colorScheme.palette.base07};
        font-weight: bold;
-        background-color: #${config.colorscheme.colors.base01};
-        outline: #${config.colorscheme.colors.base04};
+        background-color: #${config.colorScheme.palette.base01};
+        outline: #${config.colorScheme.palette.base04};
      }

      #input:selected {
-        color: #${config.colorscheme.colors.base0C};
+        color: #${config.colorScheme.palette.base0C};
      }

      #inner-box {
@ -51,19 +51,19 @@
      #outer-box {
        margin: 0px;
        padding: 3px;
-        border-radius: ${config.colorscheme.colors.border-radius}px;
-        border-width: ${config.colorscheme.colors.border-width}px;
-        border-color: #${config.colorscheme.colors.base04};
+        border-radius: ${config.colorScheme.palette.border-radius}px;
+        border-width: ${config.colorScheme.palette.border-width}px;
+        border-color: #${config.colorScheme.palette.base04};
        border-style: solid;
      }

      #text:selected {
-        color: #${config.colorscheme.colors.base00};
+        color: #${config.colorScheme.palette.base00};
        background-color: transparent;
      }

      #entry:selected {
-        background-color: #${config.colorscheme.colors.base07};
+        background-color: #${config.colorScheme.palette.base07};
      }
    '';
  };
--- a/modules/home/wayland/hyprland/config.nix
+++ b/modules/home/wayland/hyprland/config.nix
@ -33,18 +33,18 @@
        }
                        
        general {
-            gaps_in = ${config.colorScheme.colors.gaps-window}
-            gaps_out = ${config.colorScheme.colors.gaps-screen}
-            border_size = ${config.colorScheme.colors.border-width}
+            gaps_in = ${config.colorScheme.palette.gaps-window}
+            gaps_out = ${config.colorScheme.palette.gaps-screen}
+            border_size = ${config.colorScheme.palette.border-width}
                                      
-            col.active_border = rgb(${config.colorScheme.colors.base04})
-            col.inactive_border = rgb(${config.colorScheme.colors.base03})
+            col.active_border = rgb(${config.colorScheme.palette.base04})
+            col.inactive_border = rgb(${config.colorScheme.palette.base03})
                          
            layout = dwindle
        }
                        
        decoration {
-            rounding = ${config.colorScheme.colors.border-radius}
+            rounding = ${config.colorScheme.palette.border-radius}
                          
            blur {
                enabled = true
@ -137,11 +137,11 @@
        windowrulev2 = float,title:^(File Operation Progress)$
        windowrulev2 = float,class:^(firefox)$,title:^(Picture-in-Picture)$
        windowrulev2 = pin,class:^(firefox)$,title:^(Picture-in-Picture)$
-        windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Picture-in-Picture)$
+        windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Picture-in-Picture)$
        windowrulev2 = float,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
-        windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
+        windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Firefox — Sharing Indicator)$
        windowrulev2 = float,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
-        windowrulev2 = nofullscreenrequest,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
+        windowrulev2 = suppressevent fullscreen,class:^(firefox)$,title:^(Extension:.* Mozilla Firefox)$
        windowrulev2 = float,class:^(org.telegram.desktop)$,title:^(Media viewer)$
        windowrulev2 = center,class:^(org.telegram.desktop)$,title:^(Media viewer)$

--- a/modules/home/xorg/bspwm/xressources.nix
+++ b/modules/home/xorg/bspwm/xressources.nix
@ -4,26 +4,26 @@

      #define white #ffffff
      #define black #000000
-      #define cFG #${config.colorScheme.colors.base07}
-      #define cBG #${config.colorScheme.colors.base00}
-      #define cP #${config.colorScheme.colors.base07}
-      #define cH #${config.colorScheme.colors.base0C}
-      #define c0 #${config.colorScheme.colors.base00}
-      #define c1 #${config.colorScheme.colors.base01}
-      #define c2 #${config.colorScheme.colors.base02}
-      #define c3 #${config.colorScheme.colors.base03}
-      #define c4 #${config.colorScheme.colors.base04}
-      #define c5 #${config.colorScheme.colors.base05}
-      #define c6 #${config.colorScheme.colors.base06}
-      #define c7 #${config.colorScheme.colors.base07}
-      #define c8 #${config.colorScheme.colors.base08}
-      #define c9 #${config.colorScheme.colors.base09}
-      #define cA #${config.colorScheme.colors.base0A}
-      #define cB #${config.colorScheme.colors.base0B}
-      #define cC #${config.colorScheme.colors.base0C}
-      #define cD #${config.colorScheme.colors.base0D}
-      #define cE #${config.colorScheme.colors.base0E}
-      #define cF #${config.colorScheme.colors.base0F}
+      #define cFG #${config.colorScheme.palette.base07}
+      #define cBG #${config.colorScheme.palette.base00}
+      #define cP #${config.colorScheme.palette.base07}
+      #define cH #${config.colorScheme.palette.base0C}
+      #define c0 #${config.colorScheme.palette.base00}
+      #define c1 #${config.colorScheme.palette.base01}
+      #define c2 #${config.colorScheme.palette.base02}
+      #define c3 #${config.colorScheme.palette.base03}
+      #define c4 #${config.colorScheme.palette.base04}
+      #define c5 #${config.colorScheme.palette.base05}
+      #define c6 #${config.colorScheme.palette.base06}
+      #define c7 #${config.colorScheme.palette.base07}
+      #define c8 #${config.colorScheme.palette.base08}
+      #define c9 #${config.colorScheme.palette.base09}
+      #define cA #${config.colorScheme.palette.base0A}
+      #define cB #${config.colorScheme.palette.base0B}
+      #define cC #${config.colorScheme.palette.base0C}
+      #define cD #${config.colorScheme.palette.base0D}
+      #define cE #${config.colorScheme.palette.base0E}
+      #define cF #${config.colorScheme.palette.base0F}

      Xft.dpi: 96

--- a/modules/nixos/gui/xserver/default.nix
+++ b/modules/nixos/gui/xserver/default.nix
@ -5,8 +5,10 @@ in {
    services.xserver = {
      enable = true;
      videoDrivers = [ "amd" ];
-      layout = "us";
-      xkbVariant = "intl";
+      xkb = {
+        layout = "us";
+        variant = "intl";
+      };
      excludePackages = [ pkgs.xterm ];
      exportConfiguration = true;
      #  libinput.touchpad.tapping = false;
--- a/modules/nixos/system/security/sops/common.yaml
+++ b/modules/nixos/system/security/sops/common.yaml
@ -23,7 +23,7 @@ vpn_ssh_pub: ENC[AES256_GCM,data:K7+ZMxQ=,iv:xp1ghLqP5sk91feAIxC1JpHOkCzBfYBO9rH
 vpn_wg_priv: ENC[AES256_GCM,data:YS2NMqSZdH6gTQq89sWNLna6sLFIzR+uDFurFP1s+3Pe1+QP/SAiX81PZfc=,iv:Ovm3ir8ia5793yYPsKrscpqc4A6B6r270hpx9pWmR1o=,tag:asWYQrENr5ip8kHdb2mkYw==,type:str]
 vpn_wg_pub: ENC[AES256_GCM,data:orLTPlTD5Y6bimDcc+BFJytQFER2POfgcOFEk6zcKkvuq/GyU8bKgKLxuyM=,iv:TVHw+yVhlDJFz/8HYqI3qT85hGzgx+3Bj7mT0mr3dFE=,tag:EKDs8gE8RJMGQVfcYLj9Jw==,type:str]
 pgp_key: ENC[AES256_GCM,data:nEMur/Uq,iv:2KXW/AAAWDX09Ich2S6LQ7618ZBAY61KZcGkIabqCLs=,tag:Q7o8fz3dFFuqeMpzu9U/Fg==,type:str]
-wifi: ENC[AES256_GCM,data:LBDjdh4/Kny4cz7WZ5EGeFH7k0PGdERBq0/2wAWHdZtAhC2avlVNRfV8n/DsRodaUVm/6/tCXmXGOfqkzRgC9drQmDxeJWe5IhjJpOOOAXvLA/BCgzwu/Poi4b2KiXdZ1BgznMBV9+EBNFR55+KAb+GjjEIR96G15wGTfk3D0hPs9sE238OcfKFLv5L7ptUN7qnmAH6M4AIEKk0gv+J9dyu3UAw7qfdr6uiuPsYOoQ95A2q1OpERh7VnfsI6zjJ8vKSKbG/yb0VOhcCOlM1oijqSw+fUIMBlOQ9wWyWN2brqkhACqqIiBWxrqfPHQT2mobMTgE4vw1BruzTnhBrqtCeGG8yHEZnL/8NU4z3NQDG3FfYScVNDAvMrW+06HHKRi43vJ1Zz7HMb6ik8ZOKFI4CvsYingNSD1cAXt3FMet5PvVFfWErsrpO3dST7A0ZSb56N+fXrfBcB8jdxsOZBopfksFpx81J/VLLdAoO0aXtYhZlMM11nuCjkgTFPvwkxy2e/+gZVqPbWEaDeJ5j2bEB7lJ1DpMX88FN9g0zhA6cufVbSanaLCvCDCdxTslZVauO0mlmOBh0GMPD7Oi/l8hdCX74PqjSx0kmH4RWRL6Jei2PPnAEW4scWrhUOKxMaagFsLFyKvy3HYAnTqevlEi8FXmS2hglQzsN3H7343kaV+OSTy50uOG9wr7T3rbztcKDOf9dp1CM4JVk933wOmMdg7nXBrU16ELVYlWuBHgswHiBtZQXVvQBPhxp7giFjduhXlg92wvmV2ZEcVOSiDJp4nJsiIaGmwbq6PsO/1Xy5sIJ0/jh1aJwAnp507xEXl0tvcBXSdaXpHdUnKnBPw9q8Gt9Td+UoLgEb13Dy1op9Fs9iA9LMX1EMQe6d,iv:rxAs2PD9EWNONqU0Hh9DJfECJ93nnRMrbUCwormAwxw=,tag:+n0iICniidi4H0Zv9pCDfA==,type:str]
+wifi: ENC[AES256_GCM,data:Zw1jPS/bDDXuwk+0TV8qGwWgdQp8XcDX254lwByLLyf5YCGdBIxYWdTDkIggxHSgSmovg7TwQnIYcxvpqjzm0/nbaHiRvm1tBnO9KIKs0nQhnIdNmjxGXpW9Nv9ZGrTp9/ymNNbG3AxHUT74Eemy09jP+k3h5AsVuCMsMYv2y1Hj9O6CTzV+yU9+WmqCZaTX0PnyVRGYkhcHYTZM0V7I0zZbS5Uzk6AHXVmdTT0KL/1OJ3UlRAQbYMyYJM8gAOXLub6U3nCREBVIl9DydniWy2YTqKWeJcMTPe5JGDdPaUzOSTxNKVm0C1jkIOyfCgHMZfVlfAMXsDpbi9kl6Bwb41R2uS/w1VNCUUtnD9TJ29pdOW6sqEApbdbXri/P7ZK5ogGUhei8+Se1WJNmV/cKii7YYQpWCuGj1PKUj2NLel6loDO2+bps0ejWOkQgPED5tT0rn9Wst2SQKA6wMVjCB6vrry973Hhp4oi9jZ5b3eLnIg1G95JVT/O/2ygS4PLsS+GH8a7OzL2Vy1kYisphuC8sFp6P/aY1ye6WLR0bjaLYUiXHP95RUEDAwbPP4dwPCpsQSRdAqllWJ51c7GIb+nHOQSlDVNurQhbJXH0SD7o6yTKiEeSXoUt4q5oFSJ8GRFYOf8s7+cluKUUv8y306qHj/rh97benRxUTWmAL5/Nn/v6lez6WIhoNaD+MFg1/e5CjnaozOGXx3Ew6ZyI/avKwVk+ni+/o2+HmxTCKShpH5F7eZb3FMmgzIQNM+3C884GehtM1ffZmLlWOZN+nM+Uq3pQ26jgS3aV4AkgCHsNq+Xq+qnOaS2ocl3u/X9hQNoFqbyoS7nbcH9NMjU8NA4XhX922ij5QANj9I0sGlqI3EQ2zZV9zx2YcpY1qMjoMZXA1g0nIfCd63SWa8l8j/FuUbDknE2meFGqgGdvg2YPrgz0CINeKNwkg82xY1bUQMmkUQSyZV5X4Hs810P4IZIIypsyalEiNoS1VegUtG4a4xDLk6ZCXdhxV8bFbBHDdm9t87G0WCc+dyDZo6gvEQQ1gBBAQ3A==,iv:5mBedTqbzgrLUZ4HZGBrz+h3JAT7DUIP++TI+5j7/M8=,tag:XAWSPoSGepULdfn0W/StzQ==,type:str]
 sops:
    kms: []
    gcp_kms: []
@ -66,8 +66,8 @@ sops:
            STRtTVpVTCtVZ1FUNENqWFFVNTNuaVUKN6HRiZjTdENeif8dJ29urBxPXDaosjjY
            InN4Ko6YUaGfvB1DTrKIzrxOpsHS+XjisoGfT71tJwwEOoREklEO/A==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-08-05T09:52:06Z"
-    mac: ENC[AES256_GCM,data:lIY0q/K772KOiRZ24QgPtWqN67FqOdKScfJ/G8tY/VOe+KquGSIIIIyXZoIjvjEnVZpKleQfqGpcbssZR491r09xDazhadCOtEfY3YGtNUYSDcWfgHjYOYm22Pa/8YK90aAwc/2BAY6X0mXR/zPPTpdALvzIGYaS5EYVLdcdcxI=,iv:kMAgc7e8ATA2ZGRXKt1XdVWlc17OIccnCndBzKVw4T4=,tag:pR+xVV5bnE2nP/7fGWSm3Q==,type:str]
+    lastmodified: "2024-02-18T07:35:26Z"
+    mac: ENC[AES256_GCM,data:jnLJi3ZhQfeLO/GmOnUL/HuWoet83V79GGZzoqxWeImQDN9jjSAqrRPULPAREHFD+hc+n2JAW7MZrZD86jcFFy2F+wGhcDAY+25dV6d2CSi34u/dBG5ETHsn/rRV5aAOQWldna/CEpnyi69Oz/oJcQrkHDyeUWsFG/ele6aPmB4=,iv:z+zSX9W/exvEJa37VlFBJ6S2173x7KQ6qnwZw/QAp7A=,tag:ge9klDIulMFv8Szjj6+gzw==,type:str]
    pgp:
        - created_at: "2023-04-20T10:20:17Z"
          enc: |-
@ -90,4 +90,4 @@ sops:
            -----END PGP MESSAGE-----
          fp: 4E241635F8EDD2919D2FB44CA362EA0491E2EEA0
    unencrypted_suffix: _unencrypted
-    version: 3.7.3
+    version: 3.8.1
--- a/modules/nixos/tools/develop/default.nix
+++ b/modules/nixos/tools/develop/default.nix
@ -9,7 +9,7 @@ in {
  config = lib.mkIf (config.hostcfg.make.develop) {
    environment.systemPackages = with pkgs; [
      android-tools
-      androidStudioPackages.canary
+      androidStudioPackages.stable
    ];
  };
 }
--- a/modules/shared/colors/default.nix
+++ b/modules/shared/colors/default.nix
@ -1,9 +1,9 @@
 { config, ... }: {
  imports = [ ./sorahiro_soft.nix ];

-  colorScheme.colors.border-radius = "#8";
-  colorScheme.colors.border-width = "#2";
-  colorScheme.colors.gaps-screen = "#8";
-  colorScheme.colors.gaps-window = "#4";
-  colorScheme.colors.gaps-bar = "#32";
+  colorScheme.palette.border-radius = "#8";
+  colorScheme.palette.border-width = "#2";
+  colorScheme.palette.gaps-screen = "#8";
+  colorScheme.palette.gaps-window = "#4";
+  colorScheme.palette.gaps-bar = "#32";
 }
--- a/modules/shared/colors/sorahiro_hard.nix
+++ b/modules/shared/colors/sorahiro_hard.nix
@ -1,12 +1,12 @@
 { nix-colors, ... }: {
-  # usage:  a = "#${config.colorScheme.colors.base00}";
+  # usage:  a = "#${config.colorScheme.palette.base00}";

  colorScheme = {
    slug = "sorahiro-hard";
    name = "sorahiro-hard";
    author = "Soraefir @ Helcel";
-    kind = "dark";
-    colors = {
+    variant = "dark";
+    palette = {
      # Format: Name, Pantone, RAL
      base00 = "#030B12"; # Rich Black / 6C / 000-15-00
      base01 = "#0C1D2E"; # Maastricht Blue / 5395C / 270-20-15
--- a/modules/shared/colors/sorahiro_soft.nix
+++ b/modules/shared/colors/sorahiro_soft.nix
@ -1,12 +1,12 @@
 { nix-colors, ... }: {
-  # usage:  a = "#${config.colorScheme.colors.base00}";
+  # usage:  a = "#${config.colorScheme.palette.base00}";

  colorScheme = {
    slug = "sorahiro-soft";
    name = "sorahiro-soft";
    author = "Soraefir @ Helcel";
-    kind = "dark";
-    colors = {
+    variant = "dark";
+    palette = {
      # Format: Name, Pantone, RAL
      base00 = "#030B12"; # Rich Black / 6C / 000-15-00
      base01 = "#0C1D2E"; # Maastricht Blue / 5395C / 270-20-15
Author	SHA1	Message	Date
Renovate Bot	80c3444462	Lock file maintenance	2024-02-24 01:02:17 +00:00
Renovate Bot	008373bdc0	Lock file maintenance	2024-02-22 01:01:19 +00:00
soraefir	6386870219	[m] Fix dunst pos	2024-02-22 00:04:21 +01:00
soraefir	a8b9dd2475	[m] Fixing Eww Scripts	2024-02-18 10:19:51 +01:00
soraefir	f6a80afbd8	[m] Fixing Eww Scripts	2024-02-18 10:13:33 +01:00
soraefir	98da2a2673	Flake update	2024-02-18 08:44:11 +01:00
soraefir	1310943f70	[m] Fix eww	2024-02-18 08:42:26 +01:00
soraefir	03f7ec5402	[m] Wifi & Fixes	2024-02-18 08:36:16 +01:00
soraefir	22cd4b8d29	[m] Added wifi	2024-02-08 20:51:15 +01:00
soraefir	4f7a2fca23	[m] Migrated deprecated options & lock update	2024-02-06 09:33:16 +01:00