Fixed build issues by including guard rails; Merged configs

flake.lock

@@ -188,11 +188,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775247674,
+        "lastModified": 1775360939,
-        "narHash": "sha256-MCaiC3iWarAsmu8KJXgJHb1H8lf+BD9gymvxkbmNVdc=",
+        "narHash": "sha256-XUBlSgUFdvTh6+K5LcI5mJu5F5L8scmJDMRiZM484TM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "03bdcf84f092956943dcf9ef164481e463512716",
+        "rev": "2097a5c82bdc099c6135eae4b111b78124604554",
         "type": "github"
       },
       "original": {
@@ -301,11 +301,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1775165818,
+        "lastModified": 1775343634,
-        "narHash": "sha256-Bkb1ha9bB8IiWIBW2Z6shj2Erqx08VH1I9ljYl8zxGU=",
+        "narHash": "sha256-y5X04LWh/RDH7FE3y1xEDD+RP8mkfGGiXXZ9u0hky2g=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "f25473b21b45ab8ded4a0dbba69eb6b6660d568e",
+        "rev": "3a7bd8fea2ca9711da5523dc185c05ea30ec0f35",
         "type": "github"
       },
       "original": {
@@ -656,11 +656,11 @@
         "nixpkgs-nixcord": "nixpkgs-nixcord"
       },
       "locked": {
-        "lastModified": 1775215862,
+        "lastModified": 1775318803,
-        "narHash": "sha256-YoFvBMHRE4jCUoAk73bsUOo20j1sQV2NQm4BgQCKqSA=",
+        "narHash": "sha256-oas+Aq3lRrasp8N8RA6JF1ATj7Nn4S3NynaR4qlZY3A=",
         "owner": "kaylorben",
         "repo": "nixcord",
-        "rev": "164e25500dcda5261d23242788ece7ab4f0a4619",
+        "rev": "cad6925837d79126d8557955901c926ce96df2c3",
         "type": "github"
       },
       "original": {
@@ -725,11 +725,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1774802402,
+        "lastModified": 1775307257,
-        "narHash": "sha256-L1UJ/zxKTyyaGGmytH6OYlgQ0HGSMhvPkvU+iz4Mkb8=",
+        "narHash": "sha256-y9hEecHH4ennFwIcw1n480YCGh73DkEmizmQnyXuvgg=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "cbd8536a05d1aae2593cb5c9ace1010c8c5845cb",
+        "rev": "2e008bb941f72379d5b935d5bfe70ed8b7c793ff",
         "type": "github"
       },
       "original": {
@@ -784,11 +784,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775188331,
+        "lastModified": 1775365543,
-        "narHash": "sha256-/0BoSi0Dg0ON7IW0oscM12WSPBaMSCn36XTt0lHZoy8=",
+        "narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8f093d0d2f08f37317778bd94db5951d6cce6c46",
+        "rev": "a4ee2de76efb759fe8d4868c33dec9937897916f",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -1,4 +1,13 @@
-{ config, primaryUser, inputs, self, pkgs, lib, ... }: {
+{
+  config,
+  primaryUser,
+  inputs,
+  self,
+  pkgs,
+  lib,
+  ...
+}:
+{
   imports = [
 
     ./packages.nix
@@ -16,9 +25,11 @@
     ./obsidian.nix
 
     ./desktop
-
+    ./xdg.nix
     inputs.sops-nix.homeManagerModules.sops
-  ] ++ lib.optionals (!pkgs.stdenv.isDarwin) [ ./xdg.nix ];
+  ];
+
+  nixpkgs.config.allowUnfree = true;
 
   catppuccin = {
     enable = false;
@@ -100,7 +111,8 @@
   sops = {
     defaultSopsFile = ../secrets/secrets.yaml;
     defaultSopsFormat = "yaml";
-    age.keyFile = if pkgs.stdenv.isDarwin then
+    age.keyFile =
+      if pkgs.stdenv.isDarwin then
         "/Users/${primaryUser}/.config/nix/secrets/keys.txt"
       else
         "/home/${primaryUser}/.config/nix/secrets/keys.txt";
@@ -109,10 +121,8 @@
       GROQ_API_KEY = { };
       OPENWEATHER_API_KEY = { };
       ssh_private_key = {
-        path = if pkgs.stdenv.isDarwin then
+        path =
-          "/Users/${primaryUser}/.ssh/ssh"
+          if pkgs.stdenv.isDarwin then "/Users/${primaryUser}/.ssh/ssh" else "/home/${primaryUser}/.ssh/ssh";
-        else
-          "/home/${primaryUser}/.ssh/ssh";
         mode = "0600";
       };
     };

home/desktop/default.nix

@@ -1,23 +1,32 @@
-{ pkgs, inputs, ... }: {
+{
-  imports = [ inputs.catppuccin.homeModules.catppuccin ]
+  pkgs,
-    ++ pkgs.lib.optionals (!pkgs.stdenv.isDarwin) [
+  inputs,
+  lib,
+  ...
+}:
+{
+  imports = [
+    inputs.catppuccin.homeModules.catppuccin
     ./hyprland
     ./rofi
     ./waybar
     ./gtk.nix
     ./qt.nix
-    ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ ./sketchybar.nix ];
+    ./sketchybar.nix
+  ];
 
-  _module.args.compositor =
+  _module.args.compositor = if pkgs.stdenv.isDarwin then "quartz" else "hyprland";
-    if pkgs.stdenv.isDarwin then "quartz" else "hyprland";
 
-  home = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) {
+  home = lib.mkIf (!pkgs.stdenv.isDarwin) {
-    packages = with pkgs; [ waypaper swww ];
+    packages = with pkgs; [
+      waypaper
+      awww
+    ];
     file.".config/waypaper/config.ini".source = ./waypaper.ini;
   };
 
   # TODO: Qutebrowser install
-  programs = pkgs.lib.mkIf (!pkgs.stdenv.isDarwin) {
+  programs = lib.mkIf (!pkgs.stdenv.isDarwin) {
     mangohud = {
       enable = true;
       settings = {

home/desktop/gtk.nix

@@ -4,7 +4,7 @@ let
   theme_name = "Catppuccin-GTK-Dark";
 in
 {
-  home = {
+  home = lib.mkIf (!pkgs.stdenv.isDarwin) {
     packages = with pkgs; [
       adwaita-icon-theme
     ];
@@ -20,7 +20,7 @@ in
       ".config/gtk-4.0/assets".source = "${theme}/share/themes/${theme_name}/gtk-4.0/assets";
     };
   };
-  gtk = {
+  gtk = lib.mkIf (!pkgs.stdenv.isDarwin) {
     enable = true;
     font = {
       name = "FiraCode Nerd Font Propo";
@@ -41,7 +41,7 @@ in
     };
     gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
   };
-  dconf = {
+  dconf = lib.mkIf (!pkgs.stdenv.isDarwin) {
     enable = true;
     settings = {
       "org/gnome/desktop/interface" = {

home/desktop/hyprland/default.nix

@@ -196,7 +196,7 @@ in
       #     ];
 
       exec-once = [
-        "swww-daemon & disown"
+        "awww-daemon & disown"
         "waybar &"
       ];
 

home/desktop/qt.nix

@@ -1,12 +1,15 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
-  qt = {
+  qt = lib.mkIf (!pkgs.stdenv.isDarwin) {
     enable = true;
     style.name = "kvantum";
     platformTheme.name = "kvantum";
   };
-  home.packages = with pkgs; [
+  home.packages = lib.mkIf (!pkgs.stdenv.isDarwin) (
+    with pkgs;
+    [
       kdePackages.qt6ct
       kdePackages.qtstyleplugin-kvantum
-  ];
+    ]
+  );
 }

home/desktop/sketchybar.nix

@@ -1,5 +1,6 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }:
-  programs.sketchybar = {
+{
+  programs.sketchybar = lib.mkIf pkgs.stdenv.isDarwin {
     enable = true;
     configType = "lua";
     sbarLuaPackage = pkgs.sbarlua;

home/desktop/waybar/configs/mako.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+if makoctl mode | grep -q do-not-disturb; then
+  echo '{"text":"󰂛","class":"disabled"}'
+else
+  echo '{"text":"󰂚","class":"enabled"}'
+fi

home/desktop/waybar/waybar/common.nix

@@ -0,0 +1,181 @@
+{
+  widgets = {
+    "group/media" = {
+      orientation = "horizontal";
+
+      modules = [
+        "mpris"
+        "custom/cava"
+        "wireplumber"
+      ];
+    };
+
+    mpris = {
+      format = "{player_icon}";
+      format-paused = "{status_icon}";
+      max-length = 100;
+      player-icons = {
+        default = "||";
+        mpv = "||";
+      };
+      status-icons = {
+        paused = "▶";
+      };
+    };
+
+    "custom/cava" = {
+      exec = "sh ~/.config/waybar/cava.sh";
+      format = "{} ♪";
+      on-click = "hyprctl dispatch focuswindow class:spotify";
+    };
+
+    wireplumber = {
+      format = "{volume}%";
+      format-muted = "";
+      max-volume = 110;
+      scroll-step = 0.2;
+    };
+
+    "group/hardware" = {
+      orientation = "horizontal";
+      modules = [
+        "cpu"
+        "network"
+        "memory"
+        "disk"
+        "temperature"
+      ];
+    };
+
+    network = {
+      # Wifi
+      tooltip = true;
+      format-wifi = "{icon} ";
+      format-icons = [
+        "󰤟"
+        "󰤢"
+        "󰤥"
+      ];
+      rotate = 0;
+
+      # Ethernet
+      format-ethernet = "⇵{bandwidthTotalBits}";
+      tooltip-format = "Network: <big><b>{essid}</b></big>\nSignal strength: <b>{signaldBm}dBm ({signalStrength}%)</b>\nFrequency: <b>{frequency}MHz</b>\nInterface: <b>{ifname}</b>\nIP: <b>{ipaddr}/{cidr}</b>\nGateway: <b>{gwaddr}</b>\nNetmask: <b>{netmask}</b>\nCurrent󰈀 : <b>{bandwidthTotalBits}</b>\nUp 󰶣: <b>{bandwidthUpBits}</b>\nDown 󰶡: <b>{bandwidthDownBits}</b>";
+      format-linked = "󰈀 {ifname} (No IP)";
+      format-disconnected = " ";
+      tooltip-format-disconnected = "Disconnected";
+      interval = 2;
+    };
+
+    memory = {
+      interval = 1;
+      #rotate = 270;
+      format = "{icon} {percentage}%";
+      format-icons = [
+        "󰝦"
+        "󰪞"
+        "󰪟"
+        "󰪠"
+        "󰪡"
+        "󰪢"
+        "󰪣"
+        "󰪤"
+        "󰪥"
+      ];
+      max-length = 10;
+    };
+
+    cpu = {
+      interval = 1;
+      format = "{icon} {usage}%";
+      #rotate = 270;
+      format-icons = [
+        "󰝦"
+        "󰪞"
+        "󰪟"
+        "󰪠"
+        "󰪡"
+        "󰪢"
+        "󰪣"
+        "󰪤"
+        "󰪥"
+      ];
+    };
+
+    temperature = {
+      format = " {temperatureC}°C";
+      thermal-zone = 0;
+      hwmon-path = "/sys/class/thermal/thermal_zone1/temp";
+      critical-threshold = 80;
+    };
+
+    disk = {
+      format = " {percentage_free}%";
+      tooltip = true;
+      tooltip-format = "{free} / {total} ({percentage_free})";
+    };
+
+    clock = {
+      format = "{:%a %b %d, %I:%M %p}";
+      rotate = 0;
+      on-click = " ";
+      tooltip-format = "<tt>{calendar}</tt>";
+      calendar = {
+        mode = "month";
+        mode-mon-col = 3;
+        on-scroll = 1;
+        on-click-right = "mode";
+        format = {
+          months = "<span color='#cba6f7'><b>{}</b></span>";
+          weekdays = "<span color='#74c7ec'><b>{}</b></span>";
+          today = "<span color='#f38ba8'><b>{}</b></span>";
+        };
+      };
+      actions = {
+        on-click-right = "mode";
+        on-click-forward = "tz_up";
+        on-click-backward = "tz_down";
+        on-scroll-up = "shift_up";
+        on-scroll-down = "shift_down";
+      };
+    };
+
+    "custom/nixicon" = {
+      format = " ";
+      on-click = "rofi -show drun -theme $HOME/.config/rofi/custom.rasi";
+      tooltip = false;
+    };
+
+    "custom/weather" = {
+      format = "{}";
+      return-type = "json";
+      exec = ''
+        curl -s -X GET "https://api.openweathermap.org/data/2.5/weather?lat=52.281311&lon=10.527029&appid=$(cat $OPENWEATHER_API_KEY)&units=metric&lang=en" | jq -c '{text: "\(.name) \(.main.temp)C°"}'
+      '';
+      interval = 120;
+      on-click = ''
+        data=$(curl -s -X GET "https://api.openweathermap.org/data/2.5/weather?lat=52.281311&lon=10.527029&appid=$(cat $OPENWEATHER_API_KEY)&units=metric&lang=en")
+        city=$(echo "$data" | jq -r '.name')
+        temp=$(echo "$data" | jq -r '.main.temp')
+        feels=$(echo "$data" | jq -r '.main.feels_like')
+        humidity=$(echo "$data" | jq -r '.main.humidity')
+        wind=$(echo "$data" | jq -r '.wind.speed')
+        clouds=$(echo "$data" | jq -r '.clouds.all')
+        sunrise=$(echo "$data" | jq -r '.sys.sunrise | strftime("%H:%M")')
+        sunset=$(echo "$data" | jq -r '.sys.sunset | strftime("%H:%M")')
+        notify-send "$city" "Temperature: $temp °C\nFeels Like: $feels °C\nHumidity: $humidity%\nWind: $wind m/s\nClouds: $clouds%\nSunrise at: $sunrise\nSunset at: $sunset" -u normal --icon="$HOME/Pictures/Avatar/avatar_weather_no_bg.png"
+      '';
+    };
+
+    "custom/wallpaper" = {
+      format = "【{} 】";
+      exec = "basename $(swww query | grep -oP 'image: \\K.*')";
+      interval = 5;
+      on-click = "waypaper";
+      tooltip = true;
+      tooltip-format = "{}";
+      max-length = 30;
+    };
+  };
+
+}

home/desktop/waybar/waybar/configs/cava.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Not my own work. Credit to original author
+
+#----- Optimized bars animation without much CPU usage increase --------
+bar="▁▂▃▄▅▆▇█"
+dict="s/;//g"
+
+# Calculate the length of the bar outside the loop
+bar_length=${#bar}
+
+# Create dictionary to replace char with bar
+for ((i = 0; i < bar_length; i++)); do
+    dict+=";s/$i/${bar:$i:1}/g"
+done
+
+# Create cava config
+config_file="/tmp/bar_cava_config"
+cat >"$config_file" <<EOF
+[general]
+# Older systems show significant CPU use with default framerate
+# Setting maximum framerate to 30  
+# You can increase the value if you wish
+framerate = 60
+bars = 14
+
+[input]
+method = pulse
+source = auto
+
+[output]
+method = raw
+raw_target = /dev/stdout
+data_format = ascii
+ascii_max_range = 7
+EOF
+
+# Kill cava if it's already running
+pkill -f "cava -p $config_file"
+
+# Read stdout from cava and perform substitution in a single sed command
+cava -p "$config_file" | sed -u "$dict"

home/desktop/waybar/waybar/configs/mako.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+if makoctl mode | grep -q do-not-disturb; then
+  echo '{"text":"󰂛","class":"disabled"}'
+else
+  echo '{"text":"󰂚","class":"enabled"}'
+fi

home/desktop/waybar/waybar/configs/nix-snowflake.svg

@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="535"
+   height="535"
+   viewBox="0 0 501.56251 501.56249"
+   id="svg2"
+   version="1.1"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
+   sodipodi:docname="nix-snowflake.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5562">
+      <stop
+         style="stop-color:#699ad7;stop-opacity:1"
+         offset="0"
+         id="stop5564" />
+      <stop
+         id="stop5566"
+         offset="0.24345198"
+         style="stop-color:#7eb1dd;stop-opacity:1" />
+      <stop
+         style="stop-color:#7ebae4;stop-opacity:1"
+         offset="1"
+         id="stop5568" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5053">
+      <stop
+         style="stop-color:#415e9a;stop-opacity:1"
+         offset="0"
+         id="stop5055" />
+      <stop
+         id="stop5057"
+         offset="0.23168644"
+         style="stop-color:#4a6baf;stop-opacity:1" />
+      <stop
+         style="stop-color:#5277c3;stop-opacity:1"
+         offset="1"
+         id="stop5059" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5960"
+       inkscape:collect="always">
+      <stop
+         id="stop5962"
+         offset="0"
+         style="stop-color:#637ddf;stop-opacity:1" />
+      <stop
+         style="stop-color:#649afa;stop-opacity:1"
+         offset="0.23168644"
+         id="stop5964" />
+      <stop
+         id="stop5966"
+         offset="1"
+         style="stop-color:#719efa;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5867">
+      <stop
+         style="stop-color:#7363df;stop-opacity:1"
+         offset="0"
+         id="stop5869" />
+      <stop
+         id="stop5871"
+         offset="0.23168644"
+         style="stop-color:#6478fa;stop-opacity:1" />
+      <stop
+         style="stop-color:#719efa;stop-opacity:1"
+         offset="1"
+         id="stop5873" />
+    </linearGradient>
+    <linearGradient
+       y2="515.97058"
+       x2="282.26105"
+       y1="338.62445"
+       x1="213.95642"
+       gradientTransform="translate(-197.75174,-337.1451)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5855-8"
+       xlink:href="#linearGradient5867"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="247.58188"
+       x2="-702.75317"
+       y1="102.74675"
+       x1="-775.20807"
+       gradientTransform="translate(983.36076,601.38885)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4544"
+       xlink:href="#linearGradient5960"
+       inkscape:collect="always" />
+    <clipPath
+       id="clipPath4501"
+       clipPathUnits="userSpaceOnUse">
+      <circle
+         r="241.06563"
+         cy="686.09473"
+         cx="335.13995"
+         id="circle4503"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#adadad;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </clipPath>
+    <clipPath
+       id="clipPath5410"
+       clipPathUnits="userSpaceOnUse">
+      <circle
+         r="241.13741"
+         cy="340.98975"
+         cx="335.98114"
+         id="circle5412"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5053"
+       id="linearGradient5137"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(864.55062,-2197.497)"
+       x1="-584.19934"
+       y1="782.33563"
+       x2="-496.29703"
+       y2="937.71399" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5053"
+       id="linearGradient5147"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(864.55062,-2197.497)"
+       x1="-584.19934"
+       y1="782.33563"
+       x2="-496.29703"
+       y2="937.71399" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5562"
+       id="linearGradient5162"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(70.505061,-1761.3076)"
+       x1="200.59668"
+       y1="351.41116"
+       x2="290.08701"
+       y2="506.18814" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5562"
+       id="linearGradient5172"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(70.505061,-1761.3076)"
+       x1="200.59668"
+       y1="351.41116"
+       x2="290.08701"
+       y2="506.18814" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5562"
+       id="linearGradient5182"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(70.505061,-1761.3076)"
+       x1="200.59668"
+       y1="351.41116"
+       x2="290.08701"
+       y2="506.18814" />
+    <linearGradient
+       y2="506.18814"
+       x2="290.08701"
+       y1="351.41116"
+       x1="200.59668"
+       gradientTransform="translate(70.505061,-1761.3076)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5201"
+       xlink:href="#linearGradient5562"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="937.71399"
+       x2="-496.29703"
+       y1="782.33563"
+       x1="-584.19934"
+       gradientTransform="translate(864.55062,-2197.497)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5205"
+       xlink:href="#linearGradient5053"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5562"
+       id="linearGradient4328"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(70.650339,-1055.1511)"
+       x1="200.59668"
+       y1="351.41116"
+       x2="290.08701"
+       y2="506.18814" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5053"
+       id="linearGradient4330"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(864.69589,-1491.3405)"
+       x1="-584.19934"
+       y1="782.33563"
+       x2="-496.29703"
+       y2="937.71399" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.70904368"
+     inkscape:cx="99.429699"
+     inkscape:cy="195.33352"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer3"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1050"
+     inkscape:window-x="1920"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="gradient-logo"
+     style="display:inline;opacity:1"
+     transform="translate(-156.41121,933.30685)">
+    <g
+       id="g2"
+       transform="matrix(0.99994059,0,0,0.99994059,-0.06321798,33.188377)"
+       style="stroke-width:1.00006">
+      <path
+         sodipodi:nodetypes="cccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3336-6"
+         d="m 309.54892,-710.38827 122.19683,211.67512 -56.15706,0.5268 -32.6236,-56.8692 -32.85645,56.5653 -27.90237,-0.011 -14.29086,-24.6896 46.81047,-80.4901 -33.22946,-57.8257 z"
+         style="opacity:1;fill:url(#linearGradient4328);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.00018;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <use
+         height="100%"
+         width="100%"
+         transform="rotate(60,407.11155,-715.78724)"
+         id="use3439-6"
+         inkscape:transform-center-y="151.59082"
+         inkscape:transform-center-x="124.43045"
+         xlink:href="#path3336-6"
+         y="0"
+         x="0"
+         style="stroke-width:1.00006" />
+      <use
+         height="100%"
+         width="100%"
+         transform="rotate(-60,407.31177,-715.70016)"
+         id="use3445-0"
+         inkscape:transform-center-y="75.573958"
+         inkscape:transform-center-x="-168.20651"
+         xlink:href="#path3336-6"
+         y="0"
+         x="0"
+         style="stroke-width:1.00006" />
+      <use
+         height="100%"
+         width="100%"
+         transform="rotate(180,407.41868,-715.7565)"
+         id="use3449-5"
+         inkscape:transform-center-y="-139.94592"
+         inkscape:transform-center-x="59.669705"
+         xlink:href="#path3336-6"
+         y="0"
+         x="0"
+         style="stroke-width:1.00006" />
+      <path
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4330);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.00018;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m 309.54892,-710.38827 122.19683,211.67512 -56.15706,0.5268 -32.6236,-56.8692 -32.85645,56.5653 -27.90237,-0.011 -14.29086,-24.6896 46.81047,-80.4901 -33.22946,-57.8256 z"
+         id="path4260-0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccc" />
+      <use
+         height="100%"
+         width="100%"
+         transform="rotate(120,407.33916,-716.08356)"
+         id="use4354-5"
+         xlink:href="#path4260-0"
+         y="0"
+         x="0"
+         style="display:inline;stroke-width:1.00006" />
+      <use
+         height="100%"
+         width="100%"
+         transform="rotate(-120,407.28823,-715.86995)"
+         id="use4362-2"
+         xlink:href="#path4260-0"
+         y="0"
+         x="0"
+         style="display:inline;stroke-width:1.00006" />
+    </g>
+  </g>
+</svg>

home/desktop/waybar/waybar/configs/style.css

@@ -0,0 +1,191 @@
+@import "catppuccin.css";
+
+* {
+  border: none;
+  font-family: "FiraCode Nerd Font";
+  font-size: 15px;
+  min-height: 10px;
+}
+
+window#waybar {
+  background: @crust;
+}
+
+window#waybar.hidden {
+  opacity: 0.2;
+}
+󠀰
+/* - Genera rules for visible modules -- */
+#media,
+#clock,
+#cpu,
+#memory,
+#disk,
+#temperature,
+#network,
+#custom-wallpaper,
+#media,
+#custom-weather {
+  color: @crust;
+  margin-top: 6px;
+  margin-bottom: 6px;
+  padding-left: 10px;
+  padding-right: 10px;
+  transition: none;
+}
+
+/* Separation to the left */
+#custom-nixicon,
+#cpu {
+  margin-left: 5px;
+  border-top-left-radius: 10px;
+  border-bottom-left-radius: 10px;
+}
+
+/* Separation to the rigth */
+#clock,
+#temperature {
+  margin-right: 20px;
+  border-top-right-radius: 10px;
+  border-bottom-right-radius: 10px;
+}
+
+/* -- Specific styles -- */
+
+#custom-nixicon {
+  background-image: url("nix-snowflake.svg");
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+  min-height: 24px;
+  min-width: 24px;
+
+  padding: 0px;
+  padding-right: 15px;
+  padding-left: 10px;
+  margin-top: 6px;
+  margin-bottom: 6px;
+  margin-left: 15px;
+}
+
+/* Hardware Group */
+#clock {
+  background: @yellow;
+}
+
+#cpu {
+  background: @blue;
+}
+
+#memory {
+  background: @red;
+}
+
+#disk {
+  background: @peach;
+}
+
+#temperature {
+  background: @sky;
+}
+
+#network {
+  background: @lavender;
+  padding-right: 13px;
+}
+
+/* Workspace */
+#workspaces {
+  border-radius: 10px;
+  margin: 6px 5px;
+  padding: 0px 6px;
+}
+
+#workspaces button {
+  color: @text;
+  background: transparent;
+  padding: 4px 4px;
+  transition: color 0.3s ease, text-shadow 0.3s ease, transform 0.3s ease;
+  border: none;
+}
+
+#workspaces button.occupied {
+  color: @red;
+}
+
+#workspaces button.active {
+  color: @green;
+  text-shadow: 0 0 4px @green;
+}
+
+#workspaces button:hover {
+  color: @teal;
+  border: none;
+}
+
+#workspaces button.active:hover {}
+
+
+
+/* Media Group */
+#media {
+  background: @overlay2;
+  border-radius: 10px;
+  color: @crust;
+  margin-left: 20px;
+}
+
+#custom-cava {
+	color: @sky;
+}
+
+#wireplumber, #custom-cava, #mpris {
+    margin-left: 10px;
+    margin-right: 5px;
+}
+
+#wireplumber {
+    margin-right: 5px;
+}
+
+
+/* Weather */ 
+#custom-weather {
+   background: @sky;
+   color: @crust;
+   border-radius: 10px;
+   margin-right: 20px;
+}
+
+#custom-mako {
+  color: @red;
+  margin-top: 6px;
+  margin-bottom: 6px;
+  padding-left: 6px;
+  padding-right: 6px;
+}
+
+#custom-mako.enabled {
+  color: @red;
+}
+
+#custom-mako.disabled {
+  color: @overlay1;
+}
+
+/* SwayNC */ 
+#custom-notification {
+  font-family: "NotoSansMono Nerd Font";
+  background: @green;
+  border-radius: 10px;
+  padding-left: 10px;
+  padding-right: 5px;
+}
+
+/* Wallpaper */ 
+#custom-wallpaper {
+  background: @red;
+  color: @mantle;
+  border-radius: 10px;
+  margin-left: 5px;
+}

home/desktop/waybar/waybar/configs/style.min.css

@@ -0,0 +1 @@
+*{border:none;min-height:10px;font-family:FiraCode Nerd Font;font-size:15px}window#waybar{background:@crust}window#waybar.hidden{opacity:.2}󠀰 #media,#clock,#cpu,#memory,#disk,#temperature,#network,#custom-wallpaper,#media,#custom-weather{color:@crust;margin-top:6px;margin-bottom:6px;padding-left:10px;padding-right:10px;transition:none}#custom-nixicon,#cpu{border-top-left-radius:10px;border-bottom-left-radius:10px;margin-left:5px}#clock,#temperature{border-top-right-radius:10px;border-bottom-right-radius:10px;margin-right:20px}#custom-nixicon{background-image:url(nix-snowflake.svg);background-position:50%;background-repeat:no-repeat;background-size:contain;min-width:24px;min-height:24px;margin-top:6px;margin-bottom:6px;margin-left:15px;padding:0 15px 0 10px}#clock{background:@yellow}#cpu{background:@blue}#memory{background:@red}#disk{background:@peach}#temperature{background:@sky}#network{background:@lavender;padding-right:13px}#workspaces{border-radius:10px;margin:6px 5px;padding:0 6px}#workspaces button{color:@text;background:0 0;border:none;padding:4px;transition:color .3s,text-shadow .3s,transform .3s}#workspaces button.occupied{color:@red}#workspaces button.active{color:@green;text-shadow:0 0 4px @green}#workspaces button:hover{color:@teal;border:none}#media{background:@overlay2;color:@crust;border-radius:10px;margin-left:20px}#custom-cava{color:@green}#wireplumber,#custom-cava,#mpris{margin-left:10px;margin-right:5px}#wireplumber{margin-right:5px}#custom-weather{background:@sky;color:@crust;border-radius:10px;margin-right:20px}#custom-notification{background:@green;border-radius:10px;padding-left:10px;padding-right:5px;font-family:NotoSansMono Nerd Font}#custom-wallpaper{background:@red;color:@mantle;border-radius:10px;margin-left:5px}

home/desktop/waybar/waybar/default.nix

@@ -0,0 +1,20 @@
+{
+  pkgs,
+  compositor ? "hyprland",
+  ...
+}:
+{
+
+  programs.waybar = {
+    enable = true;
+    package = pkgs.waybar;
+  }
+  // (import ./dual.nix { inherit compositor; });
+  home = {
+    packages = with pkgs; [ cava ];
+    file.".config/waybar" = {
+      source = ./configs;
+      recursive = true;
+    };
+  };
+}

home/desktop/waybar/waybar/dual.nix

@@ -0,0 +1,51 @@
+{
+  compositor ? "hyprland",
+}:
+let
+  common = import ./common.nix;
+  wm = if compositor == "hyprland" then import ./hyprland-wm.nix else import ./niri-wm.nix;
+  workspaceModule = if compositor == "hyprland" then "hyprland/workspaces" else "niri/workspaces";
+  notificationModule = if compositor == "hyprland" then "custom/mako" else "custom/swaync";
+in
+{
+  enable = true;
+  settings = {
+    mainBar = {
+      layer = "top";
+      position = "top";
+      height = 30;
+      output = [ "DP-1" ];
+      modules-left = [
+        "custom/nixicon"
+        "clock"
+      ];
+      modules-center = [
+        workspaceModule
+        notificationModule
+      ];
+      modules-right = [
+        "group/hardware"
+      ];
+    }
+    // common.widgets
+    // wm.widgets;
+
+    secondBar = {
+      layer = "top";
+      position = "top";
+      height = 30;
+      output = [ "HDMI-A-2" ];
+      modules-left = [
+        "group/media"
+        "custom/wallpaper"
+      ];
+      modules-center = [
+        workspaceModule
+      ];
+      modules-right = [ "custom/weather" ];
+    }
+    // common.widgets
+    // wm.widgets;
+  };
+
+}

home/desktop/waybar/waybar/hyprland-wm.nix

@@ -0,0 +1,19 @@
+{
+  widgets = {
+    "hyprland/workspaces" = {
+      format = "{icon}";
+      format-icons = {
+        default = " ";
+        active = " ";
+      };
+    };
+    "custom/mako" = {
+      tooltip = false;
+      format = "{}";
+      return-type = "json";
+      exec = "sh ~/.config/waybar/mako.sh";
+      on-click = "makoctl mode -t do-not-disturb";
+      interval = 1;
+    };
+  };
+}

home/desktop/waybar/waybar/niri-wm.nix

@@ -0,0 +1,31 @@
+{
+  widgets = {
+    "niri/workspaces" = {
+      format = "{icon}";
+      format-icons = {
+        default = "";
+        active = "";
+      };
+    };
+    "custom/swaync" = {
+      tooltip = false;
+      format = "{icon}";
+      format-icons = {
+        notification = "<span foreground='red'><sup></sup></span>";
+        none = " ";
+        dnd-notification = "<span foreground='red'><sup></sup></span>";
+        dnd-none = " ";
+        inhibited-notification = "<span foreground='red'><sup></sup></span>";
+        inhibited-none = " ";
+        dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
+        dnd-inhibited-none = " ";
+      };
+      return-type = "json";
+      exec-if = "which swaync-client";
+      exec = "swaync-client -swb";
+      on-click = "swaync-client -t -sw";
+      on-click-right = "swaync-client -d -sw";
+      escape = true;
+    };
+  };
+}

home/fastfetch.jsonc

@@ -4,9 +4,9 @@
         "type": "kitty-icat",
 		"source": "~/Pictures/Avatar/avatar_no_bg.png",
         // "height": 15,
-        "width": 36,
+        "width": 32,
         "padding": {
-            "top": 0,
+            "top": 2,
             "left": 0
         }
     },
@@ -23,22 +23,22 @@
         },
         {
             "type": "cpu",
-            "key": "│ ├",
+            "key": "├ ",
             "keyColor": "green"
         },
         {
             "type": "gpu",
-            "key": "│ ├󰍛",
+            "key": "├󰍛 ",
             "keyColor": "green"
         },
         {
             "type": "disk",
-            "key": "│ ├",
+            "key": "├ ",
             "keyColor": "green"
         },
 		{
             "type": "memory",
-            "key": "└ └󰍛",
+            "key": "└󰍛 ",
             "keyColor": "green"
         },
         {
@@ -52,53 +52,54 @@
         },
         {
             "type": "os",
-            "key": " OS",
+            "key": "❄ OS",
             "keyColor": "yellow"
         },
         {
             "type": "kernel",
-            "key": "│ ├",
+            "key": "├ ",
             "keyColor": "yellow"
         },
         {
             "type": "bios",
-            "key": "│ ├",
+            "key": "├ ",
             "keyColor": "yellow"
         },
         {
             "type": "packages",
-            "key": "│ ├󰏖",
+            "key": "├󰏖 ",
             "keyColor": "yellow"
         },
         {
             "type": "shell",
-            "key": "└ └",
+            "key": "└ ",
             "keyColor": "yellow"
         },
         "break",
         {
-            "type": "de",
+            "type": "wm",
-            "key": " DE",
+            "key": " WM",
+			"format": "{pretty-name}", 
             "keyColor": "blue"
         },
         {
             "type": "lm",
-            "key": "│ ├",
+            "key": "├ ",
             "keyColor": "blue"
         },
 		{
-            "type": "wm",
+            "type": "font",
-            "key": "│ ├",
+            "key": "├󰉼 ",
             "keyColor": "blue"
         },
         {
-            "type": "wmtheme",
+            "type": "icons",
-            "key": "│ ├󰉼",
+            "key": "├󰉼 ",
             "keyColor": "blue"
         },
         {
             "type": "terminal",
-            "key": "└ └",
+            "key": "└ ",
             "keyColor": "blue"
         },
         {
@@ -112,53 +113,26 @@
         },
         {
             "type": "command",
-            "key": "  OS Age ",
+            "key": "├ OS Age ",
             "keyColor": "magenta",
             "text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
         },
         {
             "type": "uptime",
-            "key": "  Uptime ",
+            "key": "├ Uptime ",
             "keyColor": "magenta"
         },
         {
             "type": "datetime",
-            "key": "  DateTime ",
+            "key": "├ Date Time ",
-            "keyColor": "magenta"
+            "keyColor": "magenta",
+			"format": "{11}.{4}.{1} {14}:{17}:{20}",
         },
         {
             "type": "custom",
             "format": "\u001b[90m└────────────────────────────────────────────────────┘"
         },
 		"break",
-		{
-            "type": "custom",
-            "format": "\u001b[90m┌─────────────────────Networking─────────────────────┐"
-        },
-		{
-            "type": "publicip",
-            "key": "  Public ",
-            "keyColor": "magenta"
-        },
-		{
-            "type": "localip",
-            "key": "  Local ",
-            "keyColor": "magenta"
-        },
-		{
-            "type": "dns",
-            "key": "  DNS ",
-            "keyColor": "magenta"
-        },
-		{
-            "type": "netio",
-            "key": "  Net I/O ",
-            "keyColor": "magenta"
-        },
-		{
-            "type": "custom",
-            "format": "\u001b[90m└────────────────────────────────────────────────────┘"
-        },
         {
             "type": "colors",
             "paddingLeft": 2,

home/neovim/default.nix

@@ -15,13 +15,13 @@
     ./avante.nix
     ./openscad.nix
     ./molten.nix
-    ./live-server.nix
     ./which-key.nix
   ];
 
   home.packages = with pkgs; [
     nil
     biome
+    gdb
   ];
 
   programs.nixvim = {

home/neovim/lint.nix

@@ -35,7 +35,6 @@
       lua54Packages.luacheck
       statix
       ruff
-      nodePackages.eslint
       clippy
     ];
   };

home/neovim/live-server.nix

@@ -1,14 +1,17 @@
-{ pkgs, ... }: {
+# TODO: Remove; nodePackages is unmaintained inside nixpkgs
+{ pkgs, ... }:
+{
   # Live Server: Auto-reload browser for web development
   # Uses browser-sync for live reload functionality
   programs.nixvim = {
-    keymaps = [{
+    keymaps = [
+      {
         mode = "n";
         key = "<leader>ls";
-      action =
+        action = "<cmd>terminal browser-sync start --server --files '*.html, *.css, *.js' --no-notify<cr>";
-        "<cmd>terminal browser-sync start --server --files '*.html, *.css, *.js' --no-notify<cr>";
         options.desc = "Start live server (browser-sync)";
-    }];
+      }
+    ];
 
     extraPackages = with pkgs; [ nodePackages.browser-sync ];
   };

home/neovim/openscad.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   # OpenSCAD: 3D modeling language support with syntax highlighting,
   # cheatsheet, snippets, offline manual and fuzzy help
   programs.nixvim = {
@@ -8,13 +9,12 @@
       settings = {
         fuzzy_finder = "fzf";
         auto_open = true;
-        cheatsheet_toggle_key = "<leader>os";
+        cheatsheet_toggle_key = "<Enter>";
         default_mappings = true;
-        exec_openscad_trig_key = "<leader>oo";
+        exec_openscad_trig_key = "<A-h>";
-        help_manual_trig_key = "<leader>om";
+        help_manual_trig_key = "<A-m>";
-        help_trig_key = "<leader>oh";
+        help_trig_key = "<A-o>";
-        top_toggle = "<leader>oc";
+        top_toggle = "<A-c>";
-
       };
     };
 
@@ -25,4 +25,5 @@
       fzf
     ];
   };
+
 }

home/xdg.nix

@@ -1,4 +1,9 @@
-{ pkgs, config, ... }:
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
 let
   browser = [ "floorp.desktop" ];
 
@@ -44,7 +49,7 @@ let
   };
 in
 {
-  xdg = {
+  xdg = lib.mkIf (!pkgs.stdenv.isDarwin) {
     enable = true;
     cacheHome = config.home.homeDirectory + "/.local/cache";
 

nixos/default.nix

@@ -1,4 +1,10 @@
-{ pkgs, inputs, primaryUser, ... }: {
+{
+  pkgs,
+  inputs,
+  primaryUser,
+  ...
+}:
+{
   imports = [
     ./fonts.nix
     ./sops.nix
@@ -34,12 +40,19 @@
   # nix config
   nix = {
     settings = {
-      experimental-features = [ "nix-command" "flakes" ];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
       max-jobs = "auto";
       cores = 0;
-      substituters =
+      substituters = [
-        [ "https://hyprland.cachix.org" "https://nix-community.cachix.org" ];
+        "https://cache.nixos.org"
+        "https://hyprland.cachix.org"
+        "https://nix-community.cachix.org"
+      ];
       trusted-public-keys = [
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
@@ -61,14 +74,15 @@
     info.enable = false; # Skip info pages
   };
 
-  nixpkgs.config = { allowUnfree = true; };
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
 
   programs = {
     fish.enable = true;
     hyprland = {
       enable = true;
-      package =
+      package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-        inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
     };
     steam.enable = true;
     dconf.enable = true;
@@ -94,6 +108,11 @@
     shell = pkgs.fish;
     isNormalUser = true;
     openssh.authorizedKeys.keyFiles = [ ../secrets/ssh-key ];
-    extraGroups = [ "wheel" "video" "audio" "libvirtd" ];
+    extraGroups = [
+      "wheel"
+      "video"
+      "audio"
+      "libvirtd"
+    ];
   };
 }