Added Wallpapers

hosts/m920q/default.nix

@@ -34,44 +34,37 @@
 
   networking = {
     hostName = "nix-desktop";
-    networkmanager.enable = false;
+    networkmanager = {
-    useNetworkd = true;
-    useDHCP = false;
-
-    interfaces.eno1 = {
-      ipv4.addresses = [
-        {
-          address = "192.168.2.40";
-          prefixLength = 24;
-        }
-      ];
-    };
-
-    defaultGateway = {
-      address = "192.168.2.1";
-      interface = "eno1";
-    };
-
-    nameservers = [
-      "192.168.2.2"
-      "1.1.1.1"
-      "8.8.8.8"
-    ];
-
-    wireless = {
       enable = true;
-      userControlled.enable = false;
-      networks = {
-        "LANFRED".psk = "CooleJungsWG";
-      };
     };
-
+    useNetworkd = false;
+    useDHCP = false;
+    wireless = {
+      enable = false; # Disable wpa_supplicant, NetworkManager handles WiFi
+    };
   };
 
-  systemd.services.systemd-networkd-wait-online.enable = lib.mkForce false;
+  # Configure static IP for wired connection via NetworkManager
+  # Create this file: /etc/NetworkManager/system-connections/eno1.nmconnection
+  environment.etc."NetworkManager/system-connections/eno1.nmconnection" = {
+    text = ''
+      [connection]
+      id=eno1
+      type=ethernet
+      interface-name=eno1
+
+      [ipv4]
+      method=manual
+      address1=192.168.2.40/24
+      gateway=192.168.2.1
+      dns=192.168.2.2;1.1.1.1;8.8.8.8;
+
+      [ipv6]
+      method=auto
+    '';
+    mode = "0600";
+  };
 
   hardware.graphics.enable = true;
-
   system.stateVersion = "25.11"; # Did you read the comment?
-
 }

modules/fonts.nix

@@ -1,20 +1,91 @@
 { pkgs, lib, ... }:
 {
-  environment.systemPackages = [ pkgs.noto-fonts-color-emoji ];
+  environment.systemPackages = with pkgs; [
+    font-manager
+    gnome-characters
+  ];
 
   fonts = {
     packages = with pkgs; [
       # icon fonts
       material-icons
-      #      material-black-colors
       material-design-icons
       icomoon-feather
+      nixos-icons
 
+      noto-fonts-color-emoji
+
+      # Microsoft
+      corefonts
+      vista-fonts
+
+      # All Nerd Fonts
+      nerd-fonts._0xproto
+      nerd-fonts._3270
+      nerd-fonts.agave
+      nerd-fonts.anonymice
+      nerd-fonts.arimo
+      nerd-fonts.aurulent-sans-mono
+      nerd-fonts.bigblue-terminal
+      nerd-fonts.bitstream-vera-sans-mono
+      nerd-fonts.blex-mono
+      nerd-fonts.caskaydia-cove
+      nerd-fonts.caskaydia-mono
+      nerd-fonts.code-new-roman
+      nerd-fonts.comic-shanns-mono
+      nerd-fonts.commit-mono
+      nerd-fonts.cousine
+      nerd-fonts.d2coding
+      nerd-fonts.daddy-time-mono
+      nerd-fonts.dejavu-sans-mono
+      nerd-fonts.droid-sans-mono
+      nerd-fonts.envy-code-r
+      nerd-fonts.fantasque-sans-mono
       nerd-fonts.fira-code
       nerd-fonts.fira-mono
-      nerd-fonts.adwaita-mono
+      nerd-fonts.geist-mono
+      nerd-fonts.go-mono
+      nerd-fonts.gohufont
+      nerd-fonts.hack
+      nerd-fonts.hasklug
+      nerd-fonts.heavy-data
+      nerd-fonts.hurmit
+      nerd-fonts.im-writing
+      nerd-fonts.inconsolata
+      nerd-fonts.inconsolata-go
+      nerd-fonts.inconsolata-lgc
+      nerd-fonts.intone-mono
+      nerd-fonts.iosevka
+      nerd-fonts.iosevka-term
+      nerd-fonts.iosevka-term-slab
       nerd-fonts.jetbrains-mono
+      nerd-fonts.lekton
+      nerd-fonts.liberation
+      nerd-fonts.lilex
+      nerd-fonts.martian-mono
+      nerd-fonts.meslo-lg
+      nerd-fonts.monaspace
+      nerd-fonts.monofur
+      nerd-fonts.monoid
+      nerd-fonts.mononoki
       nerd-fonts.noto
+      nerd-fonts.open-dyslexic
+      nerd-fonts.overpass
+      nerd-fonts.profont
+      nerd-fonts.proggy-clean-tt
+      nerd-fonts.recursive-mono
+      nerd-fonts.roboto-mono
+      nerd-fonts.sauce-code-pro
+      nerd-fonts.shure-tech-mono
+      nerd-fonts.space-mono
+      nerd-fonts.symbols-only
+      nerd-fonts.terminess-ttf
+      nerd-fonts.tinos
+      nerd-fonts.ubuntu
+      nerd-fonts.ubuntu-mono
+      nerd-fonts.ubuntu-sans
+      nerd-fonts.victor-mono
+      nerd-fonts.zed-mono
     ];
 
     fontDir.enable = true;
@@ -27,16 +98,16 @@
     # B&W emojis that would sometimes show instead of some Color emojis
     fontconfig.defaultFonts = {
       serif = [
-        "Noto Serif"
+        "FiraCode Nerd Font"
-        "Noto Color Emoji"
+        #"Noto Color Emoji"
       ];
       sansSerif = [
-        "Noto Sans"
+        "FiraCode Nerd Font"
-        "Noto Color Emoji"
+        #"Noto Color Emoji"
       ];
       monospace = [
-        "JetBrainsMono Nerd Font"
+        "FiraCode Nerd Font"
-        "Noto Color Emoji"
+        #"Noto Color Emoji"
       ];
       emoji = [ "Noto Color Emoji" ];
     };

programs/wm/common/neovim/config.lua

@@ -82,16 +82,32 @@ cmp.setup({
 	}),
 })
 
-local lspconfig = require("lspconfig")
 local capabilities = require("cmp_nvim_lsp").default_capabilities()
+
+-- Keymaps
 vim.keymap.set("n", "gd", vim.lsp.buf.definition, {})
 vim.keymap.set("n", "K", vim.lsp.buf.hover, {})
 vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, {})
 vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, {})
 
--- Setup language servers
+-- Set default capabilities for all servers
-lspconfig.lua_ls.setup({
+vim.lsp.config("*", {
 	capabilities = capabilities,
+})
+
+-- Configure lua_ls with specific settings
+vim.lsp.config("lua_ls", {
+	cmd = { "lua-language-server" },
+	root_markers = {
+		".luarc.json",
+		".luarc.jsonc",
+		".luacheckrc",
+		".stylua.toml",
+		"stylua.toml",
+		"selene.toml",
+		"selene.yml",
+		".git",
+	},
 	settings = {
 		Lua = {
 			runtime = { version = "LuaJIT" },
@@ -102,15 +118,20 @@ lspconfig.lua_ls.setup({
 	},
 })
 
-lspconfig.nil_ls.setup({ capabilities = capabilities })
+-- Configure stylelint_lsp with custom cmd and filetypes
-lspconfig.rust_analyzer.setup({ capabilities = capabilities })
+vim.lsp.config("stylelint_lsp", {
-lspconfig.pylsp.setup({ capabilities = capabilities })
-lspconfig.stylelint_lsp.setup({
 	cmd = { "stylelint-lsp", "--stdio" },
 	filetypes = { "css", "scss", "rasi" },
-	capabilities = vim.lsp.protocol.make_client_capabilities(),
+	root_markers = { ".stylelintrc", ".stylelintrc.json", "stylelint.config.js", ".git" },
 })
 
+-- Enable all language servers
+vim.lsp.enable("lua_ls")
+vim.lsp.enable("nil_ls")
+vim.lsp.enable("rust_analyzer")
+vim.lsp.enable("pylsp")
+vim.lsp.enable("stylelint_lsp")
+
 -- Conform
 require("conform").setup({
 	formatters_by_ft = {

programs/wm/common/notifier/mako.nix

@@ -4,9 +4,9 @@
     enable = true;
     settings = {
       font = "FiraCodeNerdFontPropo 12";
-      borderSize = 4;
+      border-size = 4;
-      borderRadius = 8;
+      border-radius = 8;
-      defaultTimeout = 5000;
+      default-timeout = 5000;
     };
   };
 }

programs/wm/common/rofi/configs/config.ini

@@ -0,0 +1,29 @@
+[dmenu]
+dmenu_command = rofi -theme ~/.config/rofi/network.rasi
+active_chars = ==
+highlight = True
+highlight_fg =
+highlight_bg =
+highlight_bold = True
+compact = False
+pinentry =
+wifi_icons = 󰤯󰤟󰤢󰤥󰤨
+format = {name:<{max_len_name}s}  {sec:<{max_len_sec}s} {icon:>4}
+list_saved = False
+prompt = Networks
+
+[dmenu_passphrase]
+obscure = False
+obscure_color = #222222
+
+[pinentry]
+description = Get network password
+prompt = Password:
+
+[editor]
+terminal = kitty
+gui_if_available = True
+gui = nm-connection-editor
+
+[nmdm]
+rescan_delay = 5

programs/wm/common/rofi/configs/network.rasi

@@ -0,0 +1,140 @@
+* {
+  rosewater: #f5e0dc;
+  flamingo: #f2cdcd;
+  pink: #f5c2e7;
+  mauve: #cba6f7;
+  red: #f38ba8;
+  maroon: #eba0ac;
+  peach: #fab387;
+  yellow: #f9e2af;
+  green: #a6e3a1;
+  teal: #94e2d5;
+  sky: #89dceb;
+  sapphire: #74c7ec;
+  blue: #89b4fa;
+  lavender: #b4befe;
+  text: #cdd6f4;
+  subtext1: #bac2de;
+  subtext0: #a6adc8;
+  overlay2: #9399b2;
+  overlay1: #7f849c;
+  overlay0: #6c7086;
+  surface2: #585b70;
+  surface1: #45475a;
+  surface0: #313244;
+  base: #1e1e2e;
+  mantle: #181825;
+  crust: #11111b;
+}
+* {
+    background-color: transparent;
+    text-color: #cdd6f4;
+    font: "JetBrainsMono Nerd Font 12";
+}
+
+window {
+    width: 408px;
+	height: 728px;
+    background-color: @base;
+    border: 2px solid;
+    border-color: @sapphire;
+    border-radius: 12px;
+    padding: 20px;
+    
+    /* Center on screen */
+    location: center;
+    anchor: center;
+    x-offset: 0;
+    y-offset: 0;
+    
+    background-image: url("~/.config/rofi/smoking_girl.png", both);
+	background-color: rgba(0, 0, 0, 0.5);
+}
+
+mainbox {
+    spacing: 15px;
+    children: [ "inputbar", "message", "listview" ];
+}
+
+inputbar {
+    padding: 12px;
+    border-radius: 8px;
+    background-color: @mantle;
+    children: [ "prompt", "entry" ];
+    spacing: 10px;
+}
+
+prompt {
+    text-color: @sky;
+    font: "JetBrainsMono Nerd Font Bold 13";
+}
+
+entry {
+    placeholder: "Search networks...";
+    placeholder-color: @surface2;
+    text-color: @text;
+}
+
+message {
+    padding: 10px;
+    border-radius: 8px;
+    background-color: @mantle;
+    text-color: @text;
+}
+
+listview {
+    lines: 10;
+    scrollbar: true;
+    spacing: 5px;
+    padding: 5px;
+}
+
+scrollbar {
+    width: 4px;
+    handle-width: 4px;
+    handle-color: @blue;
+    border-radius: 4px;
+    background-color: @mantle;
+}
+
+element {
+    padding: 12px 15px;
+    border-radius: 2px;
+    background-color: rgba(30, 30, 46, 0.6);
+    text-color: @text;
+    spacing: 12px;
+}
+
+element selected {
+    background-color: @blue;
+    border: 2px solid;
+    border-color: @teal;
+    text-color: @mantle;
+}
+
+element-text {
+    background-color: transparent;
+    text-color: inherit;
+    vertical-align: 0.5;
+}
+
+element-icon {
+    size: 20px;
+    background-color: transparent;
+}
+
+/* Active/Connected network highlight */
+element selected.active {
+    background-color: @sapphire;
+    border-color: @sky;
+}
+
+/* Urgent (disconnected/error) state */
+element.urgent {
+    background-color: @red;
+}
+
+element selected.urgent {
+    background-color: @red;
+    border-color: @peach;
+}

programs/wm/common/rofi/default.nix

@@ -7,6 +7,7 @@
   home.packages = with pkgs; [
     rofi-power-menu
     rofi-calc
+    networkmanager_dmenu
   ];
 
   programs.rofi = {
@@ -25,4 +26,8 @@
     # copy the scripts directory recursively
     recursive = true;
   };
+
+  home.file.".config/networkmanager-dmenu/config.ini" = {
+    source = ./configs/config.ini;
+  };
 }

programs/wm/common/wallpaper/waypaper.ini

@@ -0,0 +1,24 @@
+[Settings]
+# Which backend to use
+backend = swww
+
+# Wallpaper directory to browse
+wallpaper_dirs = ~/Pictures/Wallpapers/
+
+# Transition settings for swww
+swww_transition = wave
+swww_fps = 30
+swww_duration = 0.7
+
+# Restore wallpaper on startup
+restore_last = true
+
+# Fit options: fill | contain | cover | center | tile
+mode = fill
+
+# Enable preview thumbnails
+show_thumbnails = true
+
+# Random wallpaper button
+random = true
+

programs/wm/common/wallpaper/waypaper.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [ waypaper ];
+
+  home.file = {
+    ".config/waypaper/config.ini" = {
+      source = ./waypaper.ini;
+      force = true;
+      recursive = false;
+    };
+  };
+
+}

programs/wm/common/waybar/common.nix

@@ -26,6 +26,7 @@
     "custom/cava" = {
       exec = "sh ~/.config/waybar/cava.sh";
       format = "{} ♪";
+      on-click = "hyprctl dispatch focuswindow class:spotify";
     };
 
     wireplumber = {
@@ -58,19 +59,19 @@
       rotate = 0;
 
       # Ethernet
-      format-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";
-      on-click = "/usr/local/bin/ags -t ControlPanel";
+      on-click = "networkmanager_dmenu";
       interval = 2;
     };
 
     memory = {
       interval = 1;
-      rotate = 270;
+      #rotate = 270;
-      format = "{icon}";
+      format = "{icon} {percentage}%";
       format-icons = [
         "󰝦"
         "󰪞"
@@ -87,8 +88,8 @@
 
     cpu = {
       interval = 1;
-      format = "{icon}";
+      format = "{icon} {usage}%";
-      rotate = 270;
+      #rotate = 270;
       format-icons = [
         "󰝦"
         "󰪞"
@@ -103,14 +104,14 @@
     };
 
     temperature = {
-      format = "{temperatureC}°C ";
+      format = " {temperatureC}°C";
       thermal-zone = 0;
-      hwmon-path = "/sys/class/hwmon/hwmon0/temp1_input";
+      hwmon-path = "/sys/class/thermal/thermal_zone1/temp";
       critical-threshold = 80;
     };
 
     disk = {
-      format = "{percentage_free}% ";
+      format = " {percentage_free}%";
       tooltip = true;
       tooltip-format = "{free} / {total} ({percentage_free})";
     };
@@ -141,16 +142,30 @@
     };
 
     "custom/nixicon" = {
-      format = "";
+      format = " ";
       on-click = "rofi -show drun -theme $HOME/.config/rofi/custom.rasi";
       tooltip = false;
     };
 
     "custom/weather" = {
       format = "{}";
-      exec = "curl -s 'wttr.in/52.281311,10.527029?format=2'";
+      return-type = "json";
-      interval = 60;
+      exec = ''
-      tooltip = false;
+        curl -s -X GET "https://api.openweathermap.org/data/2.5/weather?lat=52.281311&lon=10.527029&appid=7c70fbfd89c7be3d5c8c552ec52064f8&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=7c70fbfd89c7be3d5c8c552ec52064f8&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/weather-side" = {
@@ -180,6 +195,16 @@
       on-click-right = "swaync-client -d -sw";
       escape = true;
     };
+
+    "custom/wallpaper" = {
+      format = "【{} 】";
+      exec = "basename $(swww query | grep -oP 'image: \\K.*')";
+      interval = 5;
+      on-click = "waypaper";
+      tooltip = true;
+      tooltip-format = "{}";
+      max-length = 30;
+    };
   };
 
 }

programs/wm/common/waybar/configs/nix-snowflake-white.svg

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   inkscape:export-ydpi="600"
+   inkscape:export-xdpi="600"
+   inkscape:export-filename="/Users/samuel/Projects/nixos/nixos-artwork/logo/white.png"
+   sodipodi:docname="white.svg"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 501.56252 501.56251"
+   height="535"
+   width="535"
+   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="main">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop915" />
+      <stop
+         id="stop917"
+         offset="0.23168644"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop919" />
+    </linearGradient>
+    <linearGradient
+       y2="880.37714"
+       x2="-414.38654"
+       y1="782.33563"
+       x1="-584.19934"
+       gradientTransform="translate(864.69589,-1491.3405)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1299"
+       xlink:href="#main"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="460.51822"
+       x2="389.57562"
+       y1="351.41116"
+       x1="200.59668"
+       gradientTransform="translate(210.82018,-765.27605)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1713"
+       xlink:href="#main"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:showpageshadow="false"
+     borderlayer="true"
+     inkscape:pagecheckerboard="false"
+     units="px"
+     inkscape:document-rotation="0"
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     fit-margin-left="0"
+     fit-margin-top="0"
+     inkscape:snap-global="true"
+     inkscape:window-maximized="1"
+     inkscape:window-y="30"
+     inkscape:window-x="1920"
+     inkscape:window-height="1050"
+     inkscape:window-width="1920"
+     showgrid="false"
+     inkscape:current-layer="layer3"
+     inkscape:document-units="px"
+     inkscape:cy="474.1579"
+     inkscape:cx="21"
+     inkscape:zoom="0.45238095"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#000000"
+     id="base"
+     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
+     transform="translate(-156.48372,537.56136)"
+     style="display:inline;opacity:1"
+     inkscape:label="gradient-logo"
+     id="layer3"
+     inkscape:groupmode="layer">
+    <g
+       style="stroke-width:11.0512"
+       transform="matrix(0.09048806,0,0,0.09048806,142.32381,-419.8252)"
+       id="g955">
+      <g
+         transform="matrix(11.047619,0,0,11.047619,-1572.2888,9377.7107)"
+         id="g869">
+        <g
+           transform="rotate(-60,226.35754,-449.37199)"
+           id="g932"
+           style="stroke-width:11.0512">
+          <path
+             sodipodi:nodetypes="cccccccccc"
+             inkscape:connector-curvature="0"
+             id="path3336-6"
+             d="m 449.71876,-420.51322 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(#linearGradient1713);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:33.1535;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        </g>
+        <path
+           sodipodi:nodetypes="cccccccccc"
+           inkscape:connector-curvature="0"
+           id="path4260-0"
+           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"
+           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(#linearGradient1299);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:33.1535;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" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#path3336-6"
+           inkscape:transform-center-x="124.43045"
+           inkscape:transform-center-y="151.59082"
+           id="use3439-6"
+           transform="rotate(60,728.23563,-692.24036)"
+           width="100%"
+           height="100%"
+           style="stroke-width:11.0512" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#path3336-6"
+           inkscape:transform-center-x="59.669705"
+           inkscape:transform-center-y="-139.94592"
+           id="use3449-5"
+           transform="rotate(180,477.5036,-570.81898)"
+           width="100%"
+           height="100%"
+           style="stroke-width:11.0512" />
+        <use
+           style="display:inline;stroke-width:11.0512"
+           x="0"
+           y="0"
+           xlink:href="#path4260-0"
+           id="use4354-5"
+           transform="rotate(120,407.33916,-716.08356)"
+           width="100%"
+           height="100%" />
+        <use
+           style="display:inline;stroke-width:11.0512"
+           x="0"
+           y="0"
+           xlink:href="#path4260-0"
+           id="use4362-2"
+           transform="rotate(-120,407.28823,-715.86995)"
+           width="100%"
+           height="100%" />
+      </g>
+    </g>
+  </g>
+</svg>

programs/wm/common/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>

programs/wm/common/waybar/configs/style.css

@@ -23,7 +23,10 @@ window#waybar.hidden {
 #memory,
 #disk,
 #temperature,
-#network {
+#network,
+#custom-wallpaper,
+#media,
+#custom-weather {
   color: @crust;
   margin-top: 6px;
   margin-bottom: 6px;
@@ -51,9 +54,13 @@ window#waybar.hidden {
 /* -- Specific styles -- */
 
 #custom-nixicon {
-  font-size: 20px;
+  background-image: url("nix-snowflake.svg");
-  color: @sapphire;
+  background-size: contain;
-  background: @overlay1;
+  background-repeat: no-repeat;
+  background-position: center;
+  min-height: 24px;
+  min-width: 24px;
+
   padding: 0px;
   padding-right: 15px;
   padding-left: 10px;
@@ -125,8 +132,8 @@ window#waybar.hidden {
 #media {
   background: @overlay2;
   border-radius: 10px;
-  margin: 5px;
   color: @crust;
+  margin-left: 20px;
 }
 
 #custom-cava {
@@ -145,11 +152,10 @@ window#waybar.hidden {
 
 /* Weather */ 
 #custom-weather {
-   background: @overlay2;
+   background: @sky;
    color: @crust;
    border-radius: 10px;
-   margin: 5px 20px;
+   margin-right: 20px;
-   padding: 0px 10px;
 }
 
 /* SwayNC */ 
@@ -160,3 +166,11 @@ window#waybar.hidden {
   padding-left: 10px;
   padding-right: 5px;
 }
+
+/* Wallpaper */ 
+#custom-wallpaper {
+  background: @red;
+  color: @mantle;
+  border-radius: 10px;
+  margin-left: 5px;
+}

programs/wm/common/waybar/default.nix

@@ -4,24 +4,20 @@
   ...
 }:
 {
-  programs.waybar =
+  programs.waybar = {
-    {
+    enable = true;
-      enable = true;
+    package = pkgs.waybar;
-      package = pkgs.waybar;
+  }
-    }
+  // (
-    // (
+    if monitorSetup == "single" then
-      if monitorSetup == "single" then
+      import ./single.nix
-        import ./single.nix
+    else if monitorSetup == "dual" then
-      else if monitorSetup == "dual" then
+      import ./dual.nix
-        import ./dual.nix
+    else if monitorSetup == "side" then
-      else if monitorSetup == "side" then
+      import ./side.nix
-        import ./side.nix
+    else
-      else
+      { }
-        { }
+  );
-    );
-
-  home.file.".config/waybar/cava.sh".source = ./configs/cava.sh;
-  home.file.".config/waybar/mocha.css".source = ./configs/mocha.css;
 
   home.file.".config/waybar" = {
     source = ./configs;

programs/wm/common/waybar/dual.nix

@@ -5,43 +5,44 @@ in
 {
   enable = true;
   settings = {
-    mainBar =
+    mainBar = {
-      {
+      layer = "top";
-        layer = "top";
+      position = "top";
-        position = "top";
+      height = 30;
-        height = 30;
+      output = [ "DP-1" ];
-        output = [ "DP-1" ];
+      modules-left = [
-        modules-left = [
+        "custom/nixicon"
-          "custom/nixicon"
+        "clock"
-          "clock"
+      ];
-        ];
+      modules-center = [
-        modules-center = [
+        "hyprland/workspaces"
-          "hyprland/workspaces"
+        "niri/workspaces"
-          "niri/workspaces"
+        "custom/notification"
-          "custom/notification"
+      ];
-        ];
+      modules-right = [
-        modules-right = [
+        "group/hardware"
-          "group/hardware"
+      ];
-        ];
+    }
-      }
+    // common.widgets
-      // common.widgets
+    // wm.widgets;
-      // wm.widgets;
 
-    secondBar =
+    secondBar = {
-      {
+      layer = "top";
-        layer = "top";
+      position = "top";
-        position = "top";
+      height = 30;
-        height = 30;
+      output = [ "HDMI-A-2" ];
-        output = [ "HDMI-A-2" ];
+      modules-left = [
-        modules-left = [ "group/media" ];
+        "group/media"
-        modules-center = [
+        "custom/wallpaper"
-          "hyprland/workspaces"
+      ];
-          "niri/workspaces"
+      modules-center = [
-        ];
+        "hyprland/workspaces"
-        modules-right = [ "custom/weather" ];
+        "niri/workspaces"
-      }
+      ];
-      // common.widgets
+      modules-right = [ "custom/weather" ];
-      // wm.widgets;
+    }
+    // common.widgets
+    // wm.widgets;
   };
 
 }

programs/wm/hyprland/hyprland.nix

@@ -138,10 +138,10 @@ in
       preserve_split = "yes"; # you probably want this
     };
 
-    gestures = {
+    #    gestures = {
-      # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    #      # See https://wiki.hyprland.org/Configuring/Variables/ for more
-      workspace_swipe = "off";
+    #      workspace_swipe = "off";
-    };
+    #    };
 
     misc = {
       # See https://wiki.hyprland.org/Configuring/Variables/ for more
@@ -183,6 +183,7 @@ in
       "${super}, O, exec, obsidian"
       "${super}, I, exec, floorp"
       "${super}, G, exec, thunderbird"
+      "${super}, N, exec, networkmanager_dmenu"
 
       # Lock Screen
       "${super}, M, exit, "

users/core.nix

@@ -19,6 +19,8 @@
     stateVersion = "24.05";
   };
 
+  #  users.group.username = { };
+
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }

users/phil/home.nix

@@ -21,6 +21,7 @@
 
     ../../programs/wm/common/notifier/mako.nix
     ../../programs/wm/common/wallpaper/swww.nix
+    ../../programs/wm/common/wallpaper/waypaper.nix
   ];
 
   home.packages = with pkgs; [

users/phil/nixos.nix

@@ -13,7 +13,6 @@
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCaLHfxVylghDMYR8t4QMUpeRRqXasNABQKBEy9MmhbUXCcWiPbPMSZH8FMHON34rm2OrXP1kY/8jQxqBJDA+SqpFR2AZ4Khk9iVMaq5GHxxpn2amZUjoBa+fB29WaiE1npV5JVJV3O0ylw6GtiCnpneE6fGx2MO1vOY/7zKrUX/OK7WfwkDpeEzZgV/j/md917HrzUVeZwdeTq3WCRO8Gew6R8Xs6FRjSiGuH0dq14D4Ow5Zf1cI1jx+JfD/5vGasw8HXPu1NdxsOE+6D7/22IKqGr+S74/lAoyyD5qqk0s05lw8UY/PXBLJaNLZu9Fwx0BqTHpJEvftpmvd9wUxgR3msx9VXtKNSrqivIbDgeU+3oGzzkrGZODl7FCp4XKGmbrX85Z6lKwEGgv5jez4MLZcmT86bxB7m1wIbqSbVtfhS+GI7yPTA/kLzzFa14Im/+LTj95pb8qs2ALMwTMP1j2f9A6D3RriOFihL+68qn+YbK58KuV1R0f+CQRmlfVbk= phil@web.cyperpunk.de"
     ];
     shell = pkgs.fish;
-    group = "phil";
     extraGroups = [
       "video"
       "kvm"