Lots of theming stuff

common/themes/default.nix

@@ -13,13 +13,24 @@ let
 
     catppuccin-latte = {
       stylix = {
-        # image = ./wallpapers/eye.png;
+        image = ./wallpapers/needygirloverdose.jpg;
-        image = ./wallpapers/watercag.png;
         base16Scheme = "${inputs.catppuccin-base16}/base16/latte.yaml";
         polarity = "light";
       };
       satellite = {
-        transparency.value = 0.6;
+        transparency.alpha = 0.6;
+        rounding.radius = 8.0;
+      };
+    };
+
+    catppuccin-macchiato = {
+      stylix = {
+        image = ./wallpapers/spaceship.jpg;
+        base16Scheme = "${inputs.catppuccin-base16}/base16/macchiato.yaml";
+        polarity = "dark";
+      };
+      satellite = {
+        transparency.alpha = 0.7;
         rounding.radius = 8.0;
       };
     };
@@ -34,12 +45,25 @@ let
       satellite = { };
     };
     # }}}
+    # {{{ Bluloco variants
+    bluloco-light = {
+      stylix = {
+        image = ./wallpapers/watercag.png;
+        base16Scheme = ./schemes/bluloco-light.yaml;
+        polarity = "light";
+      };
+      satellite = {
+        transparency.alpha = 0.6;
+        rounding.radius = 8.0;
+      };
+    };
+    # }}}
     # {{{ Experiment: AI generated themes
     gpt = {
       monopurple-light = {
         stylix = {
           image = ./wallpapers/auto/catppuccin-latte-city.png;
-          base16Scheme = ./gpt-themes/monopurple-light.yaml;
+          base16Scheme = ./schemes/gpt-themes/monopurple-light.yaml;
           polarity = "light";
         };
         satellite = { };
@@ -47,18 +71,21 @@ let
 
       purplepink-light = {
         stylix = {
-          image = ./wallpapers/auto/catppuccin-latte-city.png;
+          image = ./wallpapers/needygirloverdose.jpg;
-          base16Scheme = ./gpt-themes/purplepink-light.yaml;
+          base16Scheme = ./schemes/gpt-themes/purplepink-light.yaml;
           polarity = "light";
         };
-        satellite = { };
+        satellite = {
+          transparency.alpha = 0.6;
+          rounding.radius = 8.0;
+        };
       };
     };
     # }}}
   };
 
   # Select your current theme here!
-  currentTheme = themes.catppuccin-latte;
+  currentTheme = themes.catppuccin-macchiato;
 in
 {
   # We apply the current theme here.

common/themes/gpt-themes/monopurple-light.yaml

@@ -1,20 +0,0 @@
-scheme: Monopurple Light
-
-author: OpenAI
-
-base00: "#ffffff"  # Background
-base01: "#f4e8fd"  # Current Line
-base02: "#e3c9f3"  # Selection
-base03: "#c9addf"  # Comments
-base04: "#9976b3"  # Variables
-base05: "#7a589e"  # Normal Text
-base06: "#563c6d"  # String
-base07: "#3d2647"  # Function Calls
-base08: "#d33682"  # Keywords
-base09: "#cb48b7"  # Constants
-base0A: "#b62da6"  # Operators
-base0B: "#9b00a0"  # Numbers
-base0C: "#7a007f"  # Punctuation
-base0D: "#59005e"  # Tag/Markup
-base0E: "#430046"  # Function Definition
-base0F: "#2e002e"  # Deprecated/Obsolete

common/themes/gpt-themes/purplepink-light.yaml

@@ -1,20 +0,0 @@
-scheme: Purplepink Light
-
-author: OpenAI
-
-base00: "#f9f7ff"  # Background
-base01: "#f2e9ff"  # Current line
-base02: "#d9c7eb"  # Selection
-base03: "#b8a4d8"  # Comment
-base04: "#6e579f"  # Foreground
-base05: "#564c74"  # Light Foreground
-base06: "#45385b"  # Dark Foreground
-base07: "#331f33"  # Contrast Foreground
-base08: "#ee8ae5"  # Primary Accent (Pink)
-base09: "#d670c9"  # Secondary Accent (Purple)
-base0A: "#9f70c9"  # Tertiary Accent (Deep Purple)
-base0B: "#61d6cf"  # Bright Aqua
-base0C: "#9fd2e5"  # Light Blue
-base0D: "#4a8ee0"  # Bright Blue
-base0E: "#ed6e61"  # Coral
-base0F: "#e58f79"  # Salmon

common/themes/schemes/bluloco-light.yaml

@@ -0,0 +1,20 @@
+scheme: Bluloco light
+
+author: uloco
+
+base00: "373a41"
+base01: "3cbc66"
+base02: "c5a332"
+base03: "676a77"
+base04: "0099e1"
+base05: "373a41"
+base06: "ce33c0"
+base07: "d3d3d3"
+base08: "23974a"
+base09: "ff6480"
+base0A: "df631c"
+base0B: "23974a"
+base0C: "27618d"
+base0D: "275fe4"
+base0E: "823ff1"
+base0F: "6d93bb"

common/themes/schemes/gpt-themes/monopurple-light.yaml

@@ -0,0 +1,20 @@
+scheme: Monopurple Light
+
+author: OpenAI
+
+base00: "ffffff" # Background
+base01: "f4e8fd" # Current Line
+base02: "e3c9f3" # Selection
+base03: "c9addf" # Comments
+base04: "9976b3" # Variables
+base05: "7a589e" # Normal Text
+base06: "563c6d" # String
+base07: "3d2647" # Function Calls
+base08: "d33682" # Keywords
+base09: "cb48b7" # Constants
+base0A: "b62da6" # Operators
+base0B: "9b00a0" # Numbers
+base0C: "7a007f" # Punctuation
+base0D: "59005e" # Tag/Markup
+base0E: "430046" # Function Definition
+base0F: "2e002e" # Deprecated/Obsolete

common/themes/schemes/gpt-themes/purplepink-light.yaml

@@ -0,0 +1,20 @@
+scheme: Purplepink Light
+
+author: OpenAI
+
+base00: "f9f7ff" # Background
+base01: "f2e9ff" # Current line
+base02: "d9c7eb" # Selection
+base03: "b8a4d8" # Comment
+base04: "6e579f" # Foreground
+base05: "564c74" # Light Foreground
+base06: "45385b" # Dark Foreground
+base07: "331f33" # Contrast Foreground
+base08: "ee8ae5" # Primary Accent (Pink)
+base09: "d670c9" # Secondary Accent (Purple)
+base0A: "9f70c9" # Tertiary Accent (Deep Purple)
+base0B: "61d6cf" # Bright Aqua
+base0C: "9fd2e5" # Light Blue
+base0D: "4a8ee0" # Bright Blue
+base0E: "ed6e61" # Coral
+base0F: "e58f79" # Salmon

dotfiles/neovim/lazy-lock.json

@@ -2,7 +2,7 @@
   "LuaSnip": { "branch": "master", "commit": "409535b8fc54c650eb845b0c35e0cc7f08810284" },
   "abbreinder.nvim": { "branch": "main", "commit": "5b2b5ff08a9ada42238d733aeebc6d3d96314d77" },
   "abbremand.nvim": { "branch": "main", "commit": "d633341f632b0b2666dfc6dfe6b9842ba1610a1d" },
-  "catppuccin": { "branch": "main", "commit": "490078b1593c6609e6a50ad5001e7902ea601824" },
+  "bluloco.nvim": { "branch": "main", "commit": "27ad647f0fc3270e732add1533ad9bcbf702f24e" },
   "clipboard-image.nvim": { "branch": "main", "commit": "af8fdaad7e6fed0741e18dbf2f57bdc7494adaee" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
@@ -33,6 +33,7 @@
   "leap": { "branch": "main", "commit": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c" },
   "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
   "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
+  "lush.nvim": { "branch": "main", "commit": "a8f0f7b9f837887f13a61d67b40ae26188fe4d62" },
   "magma-nvim": { "branch": "main", "commit": "ff3deba8a879806a51c005e50782130246143d06" },
   "mind.nvim": { "branch": "master", "commit": "002137dd7cf97865ebd01b6a260209d2daf2da66" },
   "neoconf.nvim": { "branch": "main", "commit": "08f146d53e075055500dca35e93281faff95716b" },

dotfiles/neovim/lua/my/keymaps.lua

@@ -105,15 +105,15 @@ function M.setup()
   })
   -- }}}
 
-  -- {{{ Winblend
+  -- -- {{{ Winblend
   vim.api.nvim_create_autocmd("FileType", {
-    pattern = { "Telescope*" },
+    pattern = { "*" },
     group = vim.api.nvim_create_augroup("WinblendSettings", {}),
     callback = function()
       vim.opt.winblend = 0
     end,
   })
-  -- }}}
+  -- -- }}}
 
   return M
 end

dotfiles/neovim/lua/my/plugins/themes/bluloco.lua

@@ -0,0 +1,22 @@
+local H = require("my.plugins.themes.helpers")
+local T = require("nix.theme")
+
+local M = {
+  "uloco/bluloco.nvim",
+  lazy = false,
+  dependencies = { "rktjmp/lush.nvim" },
+  enabled = H.theme_contains("Bluloco"),
+}
+
+function M.config()
+  local bluloco = require("bluloco")
+
+  bluloco.setup({
+    transparent = T.transparency.enable,
+    style = H.variant("Bluloco"),
+  })
+
+  vim.cmd("colorscheme bluloco")
+end
+
+return M

dotfiles/neovim/lua/my/plugins/themes/catppuccin.lua

@@ -1,4 +1,5 @@
 local H = require("my.plugins.themes.helpers")
+local T = require("nix.theme")
 
 local M = {
   "catppuccin/nvim",
@@ -12,7 +13,7 @@ function M.config()
   vim.g.catppuccin_flavour = H.variant("Catppuccin")
 
   catppuccin.setup({
-    transparent_background = true,
+    transparent_background = T.transparency.enable,
     integrations = { nvimtree = true, telescope = true },
   })
 
@@ -20,6 +21,10 @@ function M.config()
   vim.cmd([[highlight NotifyINFOTitle guifg=#d6b20f]])
 
   vim.cmd("colorscheme catppuccin")
+
+  if T.transparency.enable then
+    vim.cmd([[highlight FloatBorder blend=0]])
+  end
 end
 
 return M

dotfiles/neovim/lua/my/plugins/themes/init.lua

@@ -1,4 +1,5 @@
 return {
   require("my.plugins.themes.catppuccin"),
   require("my.plugins.themes.rosepine"),
+  require("my.plugins.themes.bluloco"),
 }

home/features/desktop/discord/themes.nix

@@ -2,19 +2,19 @@
 lib.fix (self: {
   "Catppuccin Mocha" = fetchurl {
     url = "https://catppuccin.github.io/discord/dist/catppuccin-mocha.theme.css";
-    sha256 = "0nv36q310mbm0p5v8anvz98bq68p9m3969rlp464m3mqkj8aszg2";
+    sha256 = "1zw1vmksn4hi0mr5w9k23l18agvkis0fih69yjsm7x4a2dqfq35h";
   };
   "Catppuccin Frappe" = fetchurl {
     url = "https://catppuccin.github.io/discord/dist/catppuccin-frappe.theme.css";
-    sha256 = "1d55rxp5z0c4m0g6qn6y28mrps7psfgvag1yf0h2ac3znmmyjrqk";
+    sha256 = "1x94q0k3f3mclkx6hibyjnl8fgjz39snbr8sqm5kjkyavv6hbhif";
   };
   "Catppuccin Latte" = fetchurl {
     url = "https://catppuccin.github.io/discord/dist/catppuccin-latte.theme.css";
-    sha256 = "1m0vjq3bj62rm9n5cabpqhghxyaj1676q9k83z7dabsqq3d4blpv";
+    sha256 = "0884c2yf0rq5rrx4hl42f6kb6kjn1mz6122sf9qzl7lqkgm1d808";
   };
   "Catppuccin Macchiato" = fetchurl {
     url = "https://catppuccin.github.io/discord/dist/catppuccin-macchiato.theme.css";
-    sha256 = "1wnphnzgv90r5zgxrr5w36pm1wa5qmkyb72gylj4j1wrk3h7vfvc";
+    sha256 = "1525shpzslnjxp1yqm98zpicrypy7zh79hi2pr85qcqcfn05v9gh";
   };
   default.dark = self."Catppuccin Macchiato";
   default.light = self."Catppuccin Latte";

home/features/desktop/spotify.nix

@@ -1,16 +1,15 @@
-{ inputs, pkgs, config, ... }:
+{ inputs, pkgs, config, lib, ... }:
 let
   spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
-  themeMap = {
+  themeMap = lib.fix (self: {
-    # TODO: add rosepine themes here
     "Catppuccin Mocha" = spicePkgs.themes.catppuccin-mocha;
     "Catppuccin Latte" = spicePkgs.themes.catppuccin-latte;
     "Catppuccin Frappe" = spicePkgs.themes.catppuccin-frappe;
     "Catppuccin Macchiato" = spicePkgs.themes.catppuccin-macchiato;
 
-    default.light = spicePkgs.themes.catppuccin-mocha;
+    default.light = self."Catppuccin Latte";
-    default.dark = spicePkgs.themes.catppuccin-latte;
+    default.dark = self."Catppuccin Macchiato";
-  };
+  });
 in
 {
   programs.spicetify = {

hosts/nixos/common/global/wireless/default.nix

@@ -20,6 +20,7 @@
 
       "Sailhorse".psk = "@NL_PLACE_0_PASS@";
       "InfoEdu12".psk = "@INFOEDU_PASS@";
+      "ZTE_F7A321".psk = "@MADALINA_PASS@";
 
       # [Working solution](https://bbs.archlinux.org/viewtopic.php?id=271336)
       # [Other interesting link](https://help.itc.rwth-aachen.de/en/service/b3d9a2c8ae5345b8b8f5128143ef4e3c/article/eaf6d69389a74a5a839c1f383c508df7/)

hosts/nixos/tethys/default.nix

@@ -28,6 +28,7 @@
   # {{{ A few ad-hoc hardware settings
   hardware.opengl.enable = true;
   hardware.opentabletdriver.enable = true;
+  hardware.keyboard.qmk.enable = true;
   # }}}
   # {{{ A few ad-hoc programs
   programs.kdeconnect.enable = true;
@@ -46,6 +47,4 @@
     in
     blacklist;
   # }}}
-
-
 }

modules/common/lua-colorscheme.nix

@@ -29,6 +29,14 @@
       fonts = {
         normal = "${config.stylix.fonts.sansSerif.name}",
         monospace = "${config.stylix.fonts.monospace.name}"
+      },
+      transparency = {
+        enable = ${toString config.satellite.theming.transparency.enable} == 1,
+        value = ${toString config.satellite.theming.transparency.alpha},
+      },
+      rounding = {
+        enable = ${toString config.satellite.theming.rounding.enable} == 1,
+        radius = ${toString config.satellite.theming.rounding.radius},
       }
     }
   '';

modules/common/theming.nix

@@ -6,7 +6,7 @@ in
   options.satellite.theming = {
     transparency = {
       enable = lib.mkEnableOption "transparency for desktop apps";
-      value = lib.mkOption {
+      alpha = lib.mkOption {
         description = "How transparent windows should be by default";
         default = 1.0;
         example = 0.6;
@@ -18,7 +18,7 @@ in
       enable = lib.mkEnableOption "rounded corners for desktop apps";
       radius = lib.mkOption {
         description = "How much to round corners by deafault";
-        default = 0;
+        default = 0.0;
         example = 10;
         type = lib.types.float;
       };
@@ -54,7 +54,7 @@ in
   };
 
   config.satellite.theming = {
-    transparency.enable = cfg.transparency.value < 1.0;
+    transparency.enable = cfg.transparency.alpha < 1.0;
     rounding.enable = cfg.rounding.radius > 0.0;
 
     get = themeMap:
@@ -69,6 +69,6 @@ in
       config.lib.stylix.scheme."${color}-rgb-b"
     ];
 
-    colors.rgba = color: "${cfg.colors.rgb color},${toString cfg.transparency.value}";
+    colors.rgba = color: "${cfg.colors.rgb color},${toString cfg.transparency.alpha}";
   };
 }