chore: moved wayland packages to a higher level

home/modules/gui/desktop/wayland/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/gui/desktop/wayland/dunst/config/settings.nix

@@ -0,0 +1,59 @@
+{
+  flake,
+  config,
+  ...
+}:
+let
+
+  inherit (flake.config.aesthetics.themes)
+    currentTheme
+    palettes
+    fonts
+    ;
+
+  inherit (flake.config.people) user0 user1 user2;
+
+  user = config.home.username;
+
+  themeLogic =
+    if user == user0 then
+      currentTheme.theme0
+    else if user == user1 then
+      currentTheme.theme1
+    else if user == user2 then
+      currentTheme.theme2
+    else
+      currentTheme.theme0;
+
+  el = palettes.${themeLogic}.colours;
+
+  makeColor = c: "#" + c;
+in
+{
+  global = {
+    font = "${fonts.names.name0} ${builtins.toString fonts.sizes.popups.size0}";
+    background = makeColor el.base01;
+    frame_color = makeColor el.base0E;
+    foreground = makeColor el.base05;
+    corner_radius = 10;
+    fade_in_duration = 1000;
+    frame = 10000;
+    frame_width = 1;
+    icon_corner_radius = 10;
+    monitor = 1;
+    offset = "20x20";
+    origin = "bottom-right";
+    progress_bar_corner_radius = 4;
+    timeout = 10;
+    transparecncy = true;
+  };
+
+  urgency_critical = {
+    frame_color = makeColor el.base09;
+    timeout = 0;
+  };
+  skip-rule = {
+    appname = "flameshot";
+    skip_display = true;
+  };
+}

home/modules/gui/desktop/wayland/dunst/default.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  flake,
+  ...
+}:
+let
+  configPath = ./config;
+  settingsPath = import (configPath + /settings.nix) { inherit config flake; };
+in
+{
+  services.dunst = {
+    enable = true;
+    settings = settingsPath;
+  };
+}

home/modules/gui/desktop/wayland/easyEffects/default.nix

@@ -0,0 +1,3 @@
+{
+  services.easyeffects.enable = true;
+}

home/modules/gui/desktop/wayland/gammastep/default.nix

@@ -0,0 +1,13 @@
+{
+  services.gammastep = {
+    enable = true;
+    tray = true;
+    provider = "geoclue2";
+    temperature = {
+      day = 6500;
+      night = 3500;
+    };
+    dawnTime = "8:00-8:30";
+    duskTime = "20:30-21:00";
+  };
+}

home/modules/gui/desktop/wayland/network/default.nix

@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}:
+{
+  services.network-manager-applet.enable = true;
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      networkmanagerapplet
+      ;
+  };
+}

home/modules/gui/desktop/wayland/nwgLook/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      nwg-look
+      ;
+  };
+}

home/modules/gui/desktop/wayland/plasmaNm/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs.kdePackages)
+      plasma-nm
+      ;
+  };
+}

home/modules/gui/desktop/wayland/swaylock/config/settings.nix

@@ -0,0 +1,69 @@
+{
+  config,
+  flake,
+  ...
+}:
+let
+  inherit (flake.config.aesthetics.themes)
+    currentTheme
+    palettes
+    fonts
+    ;
+
+  inherit (flake.config.people) user0 user1 user2;
+
+  user = config.home.username;
+
+  themeLogic =
+    if user == user0 then
+      currentTheme.theme0
+    else if user == user1 then
+      currentTheme.theme1
+    else if user == user2 then
+      currentTheme.theme2
+    else
+      currentTheme.theme0;
+
+  el = palettes.${themeLogic}.colours;
+in
+{
+  font = fonts.names.name0;
+  font-size = fonts.sizes.desktop.size0;
+  indicator-idle-visible = true;
+  indicator-radius = 100;
+  indicator-thickness = 20;
+  show-failed-attempts = true;
+
+  bs-hl-color = el.base08;
+  color = el.base01;
+  key-hl-color = el.base0E;
+
+  caps-lock-bs-hl-color = el.base08;
+  caps-lock-key-hl-color = el.base0E;
+
+  inside-color = el.base01;
+  inside-clear-color = el.base01;
+  inside-caps-lock-color = el.base01;
+  inside-ver-color = el.base01;
+  inside-wrong-color = el.base01;
+
+  line-color = el.base01;
+  line-clear-color = el.base01;
+  line-caps-lock-color = el.base01;
+  line-ver-color = el.base01;
+  line-wrong-color = el.base01;
+
+  ring-color = el.base00;
+  ring-clear-color = el.base00;
+  ring-caps-lock-color = el.base00;
+  ring-ver-color = el.base00;
+  ring-wrong-color = el.base00;
+
+  separator-color = "00000000";
+
+  text-color = el.base05;
+  text-clear-color = el.base05;
+  text-caps-lock-color = el.base05;
+  text-ver-color = el.base05;
+  text-wrong-color = el.base05;
+}

home/modules/gui/desktop/wayland/swaylock/default.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  flake,
+  ...
+}:
+let
+  configPath = ./config;
+  settingsPath = import (configPath + /settings.nix) { inherit config flake; };
+in
+{
+  programs.swaylock = {
+    enable = true;
+    settings = settingsPath;
+  };
+}

home/modules/gui/desktop/wayland/tofi/config/settings.nix

@@ -0,0 +1,50 @@
+{
+  config,
+  flake,
+  ...
+}:
+let
+  inherit (flake.config.aesthetics.themes) currentTheme palettes fonts;
+
+  inherit (flake.config.people) user0 user1 user2;
+
+  user = config.home.username;
+
+  themeLogic =
+    if user == user0 then
+      currentTheme.theme0
+    else if user == user1 then
+      currentTheme.theme1
+    else if user == user2 then
+      currentTheme.theme2
+    else
+      currentTheme.theme0;
+
+  el = palettes.${themeLogic}.colours;
+in
+{
+  font-size = fonts.sizes.desktop.size0;
+  hint-font = true;
+  background-color = "#${el.base02}";
+  outline-color = "#${el.base0E}";
+  prompt-color = "#${el.base0D}";
+  input-color = "#${el.base07}";
+  default-result-color = "#${el.base05}";
+  selection-color = "#${el.base0C}";
+  prompt-text = "Summon: ";
+
+  width = 400;
+  height = 400;
+
+  outline-width = 1;
+  border-width = 0;
+
+  padding-top = 10;
+  padding-bottom = 10;
+  padding-left = 10;
+  padding-right = 10;
+
+  corner-radius = 10;
+
+  drun-launch = true;
+}

home/modules/gui/desktop/wayland/tofi/default.nix

@@ -0,0 +1,16 @@
+{
+  config,
+  flake,
+  ...
+}:
+let
+  configPath = ./config;
+
+  settingsPath = import (configPath + /settings.nix) { inherit config flake; };
+in
+{
+  programs.tofi = {
+    enable = true;
+    settings = settingsPath;
+  };
+}

home/modules/gui/desktop/wayland/udiskie/default.nix

@@ -0,0 +1,7 @@
+{
+  services.udiskie = {
+    enable = true;
+    automount = true;
+    tray = "always";
+  };
+}

home/modules/gui/desktop/wayland/wallet/default.nix

@@ -0,0 +1,18 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs.kdePackages)
+      kwallet-pam
+      # kwalletmanager
+      ;
+  };
+  programs.gpg = {
+    enable = true;
+  };
+}
+
+# use this to make annoying shit go away:
+# gpg --pinentry-mode loopback --full-generate-key

home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+for i in {1..5}
+do
+    text=$(curl -s "https://wttr.in/$1?format=1")
+    if [[ $? == 0 ]]
+    then
+        text=$(echo "$text" | sed -E "s/\s+/ /g")
+        tooltip=$(curl -s "https://wttr.in/$1?format=4")
+        if [[ $? == 0 ]]
+        then
+            tooltip=$(echo "$tooltip" | sed -E "s/\s+/ /g")
+            echo "{\"text\":\"$text\", \"tooltip\":\"$tooltip\"}"
+            exit
+        fi
+    fi
+    sleep 2
+done
+echo "{\"text\":\"error\", \"tooltip\":\"error\"}"

home/modules/gui/desktop/wayland/waybar/config/settings.nix

@@ -0,0 +1,162 @@
+{ flake, ... }:
+let
+  inherit (flake.config.people)
+    user0
+    ;
+in
+{
+  mainBar = {
+    position = "bottom";
+    layer = "top";
+    height = 5;
+    margin-top = 0;
+    margin-bottom = 5;
+    margin-left = 5;
+    margin-right = 5;
+    modules-left = [
+      "custom/launcher"
+      "hyprland/workspaces"
+    ];
+
+    modules-center = [
+      "custom/weather"
+    ];
+
+    modules-right = [
+      "tray"
+      "privacy"
+      "cpu"
+      "memory"
+      "disk"
+      "pulseaudio"
+      # "network"
+      "clock"
+    ];
+
+    clock = {
+      calendar = {
+        format = {
+          today = "<span color='#ff6699'><b><u>{}</u></b></span>";
+        };
+      };
+      format = " {:%H:%M}";
+      tooltip = true;
+      tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
+      format-alt = " {:%d/%m}";
+    };
+
+    "hyprland/workspaces" = {
+      active-only = false;
+      disable-scroll = true;
+      format = "{icon}";
+      on-click = "activate";
+      format-icons = {
+        "1" = "◉";
+        "2" = "◉";
+        "3" = "◉";
+        "4" = "◉";
+        urgent = "";
+        default = "◉";
+        sort-by-number = true;
+      };
+      persistent-workspaces = {
+        "1" = [ ];
+        "2" = [ ];
+        "3" = [ ];
+        "4" = [ ];
+      };
+    };
+
+    memory = {
+      format = "󰟜 {}%";
+      format-alt = "󰟜 {used} GiB"; # 
+      interval = 2;
+    };
+
+    cpu = {
+      format = "  {usage}%";
+      format-alt = "  {avg_frequency} GHz";
+      interval = 2;
+    };
+
+    disk = {
+      # path = "/";
+      format = "󰋊 {percentage_used}%";
+      interval = 60;
+    };
+
+    network = {
+      format-wifi = "  {signalStrength}%";
+      format-ethernet = "󰀂 ";
+      tooltip-format = "Connected to {essid} {ifname} via {gwaddr}";
+      format-linked = "{ifname} (No IP)";
+      format-disconnected = "󰖪 ";
+    };
+
+    tray = {
+      icon-size = 12;
+      spacing = 8;
+    };
+
+    pulseaudio = {
+      format = "{icon} {volume}%";
+      tooltip = false;
+      format-muted = " Muted";
+      on-click = "easyeffects";
+      on-scroll-up = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
+      on-scroll-down = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
+      scroll-step = 5;
+      format-icons = {
+        headphone = "";
+        hands-free = "";
+        headset = "";
+        phone = "";
+        portable = "";
+        car = "";
+        default = [
+          ""
+          ""
+          ""
+        ];
+      };
+    };
+    "custom/launcher" = {
+      format = "";
+      on-click = "rm -r /home/$USER/.cache/tofi* ; tofi-drun";
+      # on-click-right = "pkill tofi || wallpaper-picker";
+      tooltip = false;
+    };
+
+    privacy = {
+      icon-spacing = 8;
+      icon-size = 12;
+      transition-duration = 250;
+      modules = {
+        screenshare = {
+          type = "screenshare";
+          tooltip = true;
+          tooltip-icon-size = 12;
+        };
+        audio-out = {
+          type = "audio-out";
+          tooltip = true;
+          tooltip-icon-size = 12;
+        };
+        audio-in = {
+          type = "audio-in";
+          tooltip = true;
+          tooltip-icon-size = 12;
+        };
+      };
+    };
+
+    "custom/weather" = {
+      exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh Winnipeg";
+      return-type = "json";
+      format = "{}";
+      tooltip = true;
+      interval = 3600;
+    };
+  };
+}
+# https://unicodes.jessetane.com/

home/modules/gui/desktop/wayland/waybar/config/style.nix

@@ -0,0 +1,115 @@
+{
+  config,
+  flake,
+  ...
+}:
+let
+
+  inherit (flake.config.aesthetics.themes) currentTheme palettes fonts;
+
+  inherit (flake.config.people) user0 user1 user2;
+
+  user = config.home.username;
+
+  themeLogic =
+    if user == user0 then
+      currentTheme.theme0
+    else if user == user1 then
+      currentTheme.theme1
+    else if user == user2 then
+      currentTheme.theme2
+    else
+      currentTheme.theme0;
+
+  el = palettes.${themeLogic}.colours;
+
+  custom = {
+    font = fonts.names.name0;
+    font_size = "${builtins.toString fonts.sizes.desktop.size0}px";
+    font_weight = "bold";
+    opacityBg = "0.90";
+    opacityBt = "1";
+    text_color = el.base0E;
+    secondary_accent = el.base07;
+    tertiary_accent = el.base15;
+    button_color = el.base04;
+    background_1 = el.base01;
+    background_2 = el.base00;
+    background_3 = el.base04;
+  };
+in
+''
+
+    * {
+        min-height: 0px;
+        font-family: ${custom.font};
+        font-weight: ${custom.font_weight};
+    }
+
+    window#waybar {
+        background: #${custom.background_2};
+        color: #${custom.background_3};
+        border: 2px solid;
+        border-radius: 30px;
+        border-color: #${custom.text_color};
+        min-height: 100px;
+        opacity: ${custom.opacityBg};
+  }
+
+    #workspaces {
+        font-size: 18px;
+        padding-left: 15px;
+        margin-bottom: 2px;
+    }
+    #workspaces button {
+        color: #${custom.button_color};
+        padding: 5px;
+        opacity: ${custom.opacityBt};
+    }
+    #workspaces button.empty {
+        color: #${custom.background_3};
+    }
+    #workspaces button.active {
+        color: #${custom.text_color};
+    }
+
+    #tray, #pulseaudio, #privacy, #cpu, #memory, #disk, #clock {
+        font-size: ${custom.font_size};
+        color: #${custom.text_color};
+        padding-right: 10px;
+    }
+
+    #privacy {
+    }
+
+    #cpu {
+    }
+
+    #memory {
+    }
+
+    #disk {
+    }
+
+    #tray {
+    }
+
+    #pulseaudio {
+    }
+
+    #clock {
+    }
+
+    #custom-launcher {
+        font-size: 20px;
+        color: #${custom.text_color};
+        font-weight: ${custom.font_weight};
+        padding-left: 10px;
+    }
+
+    #custom-weather {
+        font-size: 14px;
+        color: #${custom.text_color};
+        font-weight: ${custom.font_weight};
+    }
+''

home/modules/gui/desktop/wayland/waybar/default.nix

@@ -0,0 +1,19 @@
+{
+  config,
+  flake,
+  pkgs,
+  ...
+}:
+let
+  configPath = ./config;
+  settingsPath = import (configPath + /settings.nix) { inherit flake; };
+  stylePath = import (configPath + /style.nix) { inherit config flake; };
+in
+{
+  programs.waybar = {
+    enable = true;
+    package = flake.inputs.waybar.packages.${pkgs.system}.default;
+    settings = settingsPath;
+    style = stylePath;
+  };
+}

home/modules/gui/desktop/wayland/wlClipboard/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      wl-clipboard
+      ;
+  };
+}

home/modules/gui/desktop/wayland/wpaperd/default.nix

@@ -0,0 +1,13 @@
+{
+  programs.wpaperd = {
+    enable = true;
+    settings = {
+      "default" = {
+        path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/wayland/wpaperd/wallpaper";
+        apply-shadow = true;
+        duration = "1m";
+        sorting = "random";
+      };
+    };
+  };
+}