diff --git a/system/Vanguard.nix b/system/Vanguard.nix index a7a01d7f..40218d95 100644 --- a/system/Vanguard.nix +++ b/system/Vanguard.nix @@ -65,9 +65,7 @@ "6, monitor:desc:${primary}" "7, monitor:desc:${primary}" ]; - exec-once = [ - "sleep 2 && systemctl --user start swww-daemon.service && sleep 2 && swww img ${./wallpapers/animated/citadel.gif} && systemctl --user stop hyprpaper.service" - ]; + exec-once = [ "sleep 2 && animate-wallpaper" ]; }; }; boot = { diff --git a/system/default.nix b/system/default.nix index f96e8f17..c4a993d9 100644 --- a/system/default.nix +++ b/system/default.nix @@ -210,7 +210,7 @@ console.useXkbConfig = true; stylix = { enable = true; - image = ./wallpapers/default.jpg; + image = ./wallpapers/default.png; base16Scheme = lib.mkDefault "${pkgs.base16-schemes}/share/themes/one-light.yaml"; polarity = config.lib.stylix.scheme.variant; opacity = { diff --git a/system/desktop.nix b/system/desktop.nix index e829bcf5..00401889 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -27,7 +27,6 @@ hunspell hunspellDicts.en_GB-large wl-clipboard - overskride hyprpicker grim slurp @@ -45,7 +44,6 @@ signal-desktop whatsapp-for-linux teams-for-linux - twinkle nomachine-client ]; }; diff --git a/system/home/hyprland.nix b/system/home/hyprland.nix index d25f467f..370706ac 100644 --- a/system/home/hyprland.nix +++ b/system/home/hyprland.nix @@ -248,10 +248,10 @@ "pin, org.kde.polkit-kde-authentication-agent-1|Pinentry|pinentry-qt|gcr-prompter" "dimaround, org.kde.polkit-kde-authentication-agent-1|Pinentry|pinentry-qt|gcr-prompter" "stayfocused, org.kde.polkit-kde-authentication-agent-1|Pinentry|pinentry-qt|gcr-prompter" - # Network and Bluetooth control panels - "float, pavucontrol|nm-connection-editor|overskride|io.github.kaii_lb.Overskride" - "size 800 600, pavucontrol|nm-connection-editor|overskride|io.github.kaii_lb.Overskride" - "move onscreen 100%-820 50,pavucontrol|nm-connection-editor|overskride|io.github.kaii_lb.Overskride" + # Audio control panel + "float, pavucontrol" + "size 800 600, pavucontrol" + "move onscreen 100%-820 50,pavucontrol" # File browser and picker dialog "float, org.gnome.Nautilus|xdg-desktop-portal-gtk" "size 800 600, org.gnome.Nautilus|xdg-desktop-portal-gtk" diff --git a/system/home/scripts/default.nix b/system/home/scripts/default.nix index 46cfbf5f..160b3192 100644 --- a/system/home/scripts/default.nix +++ b/system/home/scripts/default.nix @@ -6,6 +6,7 @@ (pkgs.writeShellScriptBin "clean-config" (builtins.readFile ./shell/clean-config.sh)) (pkgs.writeShellScriptBin "rsync-local-config" (builtins.readFile ./shell/rsync-local-config.sh)) (pkgs.writeShellScriptBin "xdg-query-program" (builtins.readFile ./shell/xdg-query-program.sh)) + (pkgs.writeShellScriptBin "animate-wallpaper" (builtins.readFile ./shell/animate-wallpaper.sh)) (pkgs.writeShellScriptBin "mount-onedrive" (builtins.readFile ./shell/mount-onedrive.sh)) ]; } diff --git a/system/home/scripts/shell/animate-wallpaper.sh b/system/home/scripts/shell/animate-wallpaper.sh new file mode 100644 index 00000000..9c22a75b --- /dev/null +++ b/system/home/scripts/shell/animate-wallpaper.sh @@ -0,0 +1,9 @@ +WALLPAPER_FILE="$HOME/.wallpaper.gif" + +if [ ! -f "$WALLPAPER_FILE" ]; then + exit 1 +fi + +systemctl --user start swww-daemon.service && + swww img "$WALLPAPER_FILE" && + systemctl --user stop hyprpaper.service diff --git a/system/home/waybar.nix b/system/home/waybar.nix index bcab2779..5a14af56 100644 --- a/system/home/waybar.nix +++ b/system/home/waybar.nix @@ -10,265 +10,270 @@ programs.waybar = { enable = true; systemd.enable = true; - settings.main = { - name = "main"; - layer = "top"; - position = "left"; - # Layout - "modules-left" = [ - "hyprland/workspaces" - "mpris" - ]; - "modules-center" = [ ]; - "modules-right" = [ - "custom/notification" - "pulseaudio" - "network" - "bluetooth" - "clock#calendar" - "clock" - "backlight" - "battery" - "custom/weather" - "systemd-failed-units" - "tray" - ]; - # Module config - "hyprland/workspaces" = { - format = "{icon}"; - format-icons = { - "1" = "󰆍"; - "2" = "󰖟"; - "3" = "󰭹"; - "4" = "󱧶"; - "5" = "󰢹"; - "6" = "󰐫"; - "7" = "󰊴"; - default = "󰀻"; - }; - all-outputs = false; - persistent-workspaces = { - "1" = [ ]; - "2" = [ ]; - "3" = [ ]; - "4" = [ ]; - "5" = [ ]; - "6" = [ ]; - "7" = [ ]; - }; - }; - "hyprland/window" = { - "format" = "{title}"; - "max-length" = 50; - "rewrite" = { - "(.*) - GNU Emacs at (.*)" = " $1 [$2]"; - "(alacritty.*)" = " $1"; - "(.*) - mpv" = "󰦟 $1"; - "swayimg: (.*)" = "󰋩 $1"; - "swappy" = "󰹑 swappy"; - "(?:/nix/.*)(btm)" = " Resource Usage [$1]"; - "(?:/nix/.*)(cava)" = "󰝚 Music Visualiser [$1]"; - "Mozilla Firefox" = "󰈹 $1"; - "(.*) — Mozilla Firefox" = "󰈹 $1"; - "Nyxt - (.*)" = "󰀹 $1"; - "(.*) - Chromium" = "󰊯 $1"; - "(Signal.*)" = "󰭹 $1"; - "(WhatsApp for Linux.*)" = "󰖣 $1"; - "((?:.*)WebCord.*)" = "󰙯 $1"; - "(Cartridges.*)" = "󰊗 $1"; - "([Ss]team.*)" = "󰓓 $1"; - "(Prism Launcher.*)" = "󰍳 Minecraft ($1)"; - "(.*)(?: *)PrusaSlicer-(.*)" = "󰐫 $1 PrusaSlicer ($2)"; - "(.*)(?: *)PrusaSlicer G-code Viewer-(.*)" = "󰹛 $1 G-code Viewer ($2)"; - "FreeCAD (.*)" = "󰻬 FreeCAD $1"; - "(.*) - Blender.* " = "󰂫 $1"; - "(Remmina Remote Desktop Client)" = "󰢹 $1"; - "(NoMachine|Nxplayer.bin)(?: *)(.*)" = "󰢹 $1 $2"; - }; - }; - mpris = { - "format" = "{player_icon}\n{status_icon}"; - "tooltip-format" = "{player_icon} ({player}) {status_icon}\n{title}\n{album}\n{artist}"; - "interval" = 1; - "dynamic-order" = [ - "album" - "artist" - "title" - "position" - "length" + settings.main = + let + terminal = "${config.programs.alacritty.package}/bin/alacritty -e"; + in + { + name = "main"; + layer = "top"; + position = "left"; + # Layout + "modules-left" = [ + "hyprland/workspaces" + "mpris" ]; - "player-icons" = { - "default" = "󰲸"; - }; - "status-icons" = { - "playing" = "󰐊"; - "paused" = "󰏤"; - "stopped" = "󰓛"; - }; - "ignored-players" = [ - "com" - "firefox" + "modules-center" = [ ]; + "modules-right" = [ + "custom/notification" + "pulseaudio" + "network" + "bluetooth" + "clock#calendar" + "clock" + "backlight" + "battery" + "custom/weather" + "systemd-failed-units" + "tray" ]; - }; - pulseaudio = { - scroll-step = 5; - format = "{format_source}\n{icon}"; - # format-muted = "{format_source} {icon}"; - format-source = "󰍬"; - format-source-muted = "󰍭"; - format-icons = { - car = "󰄍"; - default = [ - "󰕿" - "󰖀" - "󰕾" + # Module config + "hyprland/workspaces" = { + format = "{icon}"; + format-icons = { + "1" = "󰆍"; + "2" = "󰖟"; + "3" = "󰭹"; + "4" = "󱧶"; + "5" = "󰢹"; + "6" = "󰐫"; + "7" = "󰊴"; + default = "󰀻"; + }; + all-outputs = false; + persistent-workspaces = { + "1" = [ ]; + "2" = [ ]; + "3" = [ ]; + "4" = [ ]; + "5" = [ ]; + "6" = [ ]; + "7" = [ ]; + }; + }; + "hyprland/window" = { + "format" = "{title}"; + "max-length" = 50; + "rewrite" = { + "(.*) - GNU Emacs at (.*)" = " $1 [$2]"; + "(alacritty.*)" = " $1"; + "(.*) - mpv" = "󰦟 $1"; + "swayimg: (.*)" = "󰋩 $1"; + "swappy" = "󰹑 swappy"; + "(?:/nix/.*)(btm)" = " Resource Usage [$1]"; + "(?:/nix/.*)(cava)" = "󰝚 Music Visualiser [$1]"; + "Mozilla Firefox" = "󰈹 $1"; + "(.*) — Mozilla Firefox" = "󰈹 $1"; + "Nyxt - (.*)" = "󰀹 $1"; + "(.*) - Chromium" = "󰊯 $1"; + "(Signal.*)" = "󰭹 $1"; + "(WhatsApp for Linux.*)" = "󰖣 $1"; + "((?:.*)WebCord.*)" = "󰙯 $1"; + "(Cartridges.*)" = "󰊗 $1"; + "([Ss]team.*)" = "󰓓 $1"; + "(Prism Launcher.*)" = "󰍳 Minecraft ($1)"; + "(.*)(?: *)PrusaSlicer-(.*)" = "󰐫 $1 PrusaSlicer ($2)"; + "(.*)(?: *)PrusaSlicer G-code Viewer-(.*)" = "󰹛 $1 G-code Viewer ($2)"; + "FreeCAD (.*)" = "󰻬 FreeCAD $1"; + "(.*) - Blender.* " = "󰂫 $1"; + "(Remmina Remote Desktop Client)" = "󰢹 $1"; + "(NoMachine|Nxplayer.bin)(?: *)(.*)" = "󰢹 $1 $2"; + }; + }; + mpris = { + "format" = "{player_icon}\n{status_icon}"; + "tooltip-format" = "{player_icon} ({player}) {status_icon}\n{title}\n{album}\n{artist}"; + "interval" = 1; + "dynamic-order" = [ + "album" + "artist" + "title" + "position" + "length" ]; - default-muted = "󰝟"; - hands-free = "󰥰"; - headset = "󰋎"; - phone = "󰏲"; - portable = "󰏳"; - headphone = "󰋋"; - }; - tooltip = true; - tooltip-format = "{desc} ({volume}%)"; - on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; - on-click-right = "${config.services.avizo.package}/bin/volumectl %"; - on-scroll-up = "${config.services.avizo.package}/bin/volumectl -u + 5"; - on-scroll-down = "${config.services.avizo.package}/bin/volumectl -u - 5"; - }; - network = { - format-icons = [ - "󰤟" - "󰤢" - "󰤥" - "󰤨" - ]; - format-wifi = "{icon}"; - format-ethernet = "󰈁"; - format-linked = "󰈂"; - format-disconnected = "󰈂"; - tooltip-format = "{essid} ({signalStrength}%)"; - on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; - }; - bluetooth = { - format = "󰂯"; - format-disabled = "󰂲"; - format-off = "󰂲"; - format-on = "󰂯"; - format-connected = "󰂱"; - tooltip-format = "{status} | {device_alias}"; - on-click = "${pkgs.overskride}/bin/overskride"; - }; - "clock#calendar" = - let - size = "${toString config.stylix.fonts.sizes.popups}pt"; - in - { - format = "󰃭"; - tooltip-format = "{calendar}"; - calendar = { - mode = "month"; - weeks-pos = "left"; - on-scroll = 1; - format = - let - scheme = config.lib.stylix.scheme.withHashtag; - in - { - months = "{}"; - weeks = "W{}"; - weekdays = "{}"; - days = "{}"; - today = "{}"; - }; + "player-icons" = { + "default" = "󰲸"; }; - actions = { - on-scroll-up = "shift_up"; - on-scroll-down = "shift_down"; + "status-icons" = { + "playing" = "󰐊"; + "paused" = "󰏤"; + "stopped" = "󰓛"; }; + "ignored-players" = [ + "com" + "org" + "firefox" + ]; }; - clock = { - format = "{:%H\n%M}"; - tooltip = false; - }; - backlight = { - format = "{icon}"; - tooltip-format = "{percent}%"; - format-icons = [ - "" - "" - "" - "" - "" - "" - "" - "" - "" - ]; - }; - battery = { - states = { - warning = 20; - critical = 10; - }; - format = "{icon}"; - format-time = "{H}:{m}"; - format-charging = "󰂄"; - format-plugged = "󰚥"; - # format-warning = "{icon}{capacity}%"; - # format-critical = "{icon}{capacity}% ({time})"; - tooltip-format = "{capacity}% | {power}W | {time}"; - format-icons = [ - "󱃍" - "󰁺" - "󰁻" - "󰁼" - "󰁽" - "󰁾" - "󰁿" - "󰂀" - "󰂁" - "󰂂" - "󰁹" - ]; - }; - "systemd-failed-units" = { - hide-on-ok = true; - format = "󰀦"; - system = true; - user = false; - }; - "custom/notification" = - let - makoctl = "${config.services.mako.package}/bin/makoctl"; - jq = "${pkgs.jq}/bin/jq"; - in - { - exec = "( ${makoctl} list | ${jq} -e '.data[] | length > 0' >/dev/null && echo '󱅫' ) || echo '󰂚' "; - format = "{}"; - tooltip = false; - on-click = "${makoctl} dismiss -a"; - interval = 3; - }; - "custom/weather" = - let - date-format = "%Y-%m-%d"; - custom-indicator = "{ICON}"; # "{temp_C}°C({FeelsLikeC}°C)"; - in - { - format = "{}"; + pulseaudio = { + scroll-step = 5; + format = "{format_source}\n{icon}"; + # format-muted = "{format_source} {icon}"; + format-source = "󰍬"; + format-source-muted = "󰍭"; + format-icons = { + car = "󰄍"; + default = [ + "󰕿" + "󰖀" + "󰕾" + ]; + default-muted = "󰝟"; + hands-free = "󰥰"; + headset = "󰋎"; + phone = "󰏲"; + portable = "󰏳"; + headphone = "󰋋"; + }; tooltip = true; - interval = 900; # Every 15 minutes - exec = ''${pkgs.wttrbar}/bin/wttrbar --location Didcot --date-format "${date-format}" --custom-indicator "${custom-indicator}"''; - return-type = "json"; + tooltip-format = "{desc} ({volume}%)"; + on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; + on-click-right = "${config.services.avizo.package}/bin/volumectl %"; + on-scroll-up = "${config.services.avizo.package}/bin/volumectl -u + 5"; + on-scroll-down = "${config.services.avizo.package}/bin/volumectl -u - 5"; + }; + network = { + format-icons = [ + "󰤟" + "󰤢" + "󰤥" + "󰤨" + ]; + format-wifi = "{icon}"; + format-ethernet = "󰈁"; + format-linked = "󰈂"; + format-disconnected = "󰈂"; + tooltip-format = "{essid} ({signalStrength}%)"; + on-click = "${terminal} ${pkgs.networkmanager}/bin/nmtui"; + }; + bluetooth = { + format = "󰂯"; + format-disabled = "󰂲"; + format-off = "󰂲"; + format-on = "󰂯"; + format-connected = "󰂱"; + tooltip-format = "{status} | {device_alias}"; + on-click = "${terminal} ${pkgs.bluez}/bin/bluetoothctl"; + }; + "clock#calendar" = + let + size = "${toString config.stylix.fonts.sizes.popups}pt"; + in + { + format = "󰃭"; + tooltip-format = "{calendar}"; + calendar = { + mode = "month"; + weeks-pos = "left"; + on-scroll = 1; + format = + let + scheme = config.lib.stylix.scheme.withHashtag; + in + { + months = "{}"; + weeks = "W{}"; + weekdays = "{}"; + days = "{}"; + today = "{}"; + }; + }; + actions = { + on-scroll-up = "shift_up"; + on-scroll-down = "shift_down"; + }; + }; + clock = { + format = "{:%H\n%M}"; + tooltip = false; + }; + backlight = { + format = "{icon}"; + tooltip-format = "{percent}%"; + format-icons = [ + "" + "" + "" + "" + "" + "" + "" + "" + "" + ]; + }; + battery = { + states = { + warning = 20; + critical = 10; + }; + format = "{icon}"; + format-time = "{H}:{m}"; + format-charging = "󰂄"; + format-plugged = "󰚥"; + # format-warning = "{icon}{capacity}%"; + # format-critical = "{icon}{capacity}% ({time})"; + tooltip-format = "{capacity}% | {power}W | {time}"; + format-icons = [ + "󱃍" + "󰁺" + "󰁻" + "󰁼" + "󰁽" + "󰁾" + "󰁿" + "󰂀" + "󰂁" + "󰂂" + "󰁹" + ]; + }; + "systemd-failed-units" = { + hide-on-ok = true; + format = "󰀦"; + system = true; + user = false; + }; + "custom/notification" = + let + makoctl = "${config.services.mako.package}/bin/makoctl"; + jq = "${pkgs.jq}/bin/jq"; + in + { + exec = "( ${makoctl} list | ${jq} -e '.data[] | length > 0' >/dev/null && echo '󱅫' ) || echo '󰂚' "; + format = "{}"; + tooltip = false; + on-click = "${makoctl} dismiss -a"; + interval = 3; + }; + "custom/weather" = + let + date-format = "%Y-%m-%d"; + custom-indicator = "{ICON}"; # "{temp_C}°C({FeelsLikeC}°C)"; + in + { + format = "{}"; + tooltip = true; + interval = 900; # Every 15 minutes + exec = ''${pkgs.wttrbar}/bin/wttrbar --location Didcot --date-format "${date-format}" --custom-indicator "${custom-indicator}"''; + return-type = "json"; + }; + tray = { + icon-size = 20; + show-passive-items = true; + spacing = 5; }; - tray = { - icon-size = 20; - show-passive-items = true; - spacing = 5; }; - }; style = let scheme = config.lib.stylix.scheme.withHashtag; diff --git a/system/wallpapers/Clearday.jpg b/system/wallpapers/Clearday.jpg deleted file mode 100644 index f51a1e3f..00000000 Binary files a/system/wallpapers/Clearday.jpg and /dev/null differ diff --git a/system/wallpapers/Clearnight.jpg b/system/wallpapers/Clearnight.jpg deleted file mode 100644 index 4120596c..00000000 Binary files a/system/wallpapers/Clearnight.jpg and /dev/null differ diff --git a/system/wallpapers/Cloudsday.jpg b/system/wallpapers/Cloudsday.jpg deleted file mode 100644 index 118154e5..00000000 Binary files a/system/wallpapers/Cloudsday.jpg and /dev/null differ diff --git a/system/wallpapers/Cloudsnight.jpg b/system/wallpapers/Cloudsnight.jpg deleted file mode 100644 index 3e53ba7d..00000000 Binary files a/system/wallpapers/Cloudsnight.jpg and /dev/null differ diff --git a/system/wallpapers/Rainnight.jpg b/system/wallpapers/Rainnight.jpg deleted file mode 100644 index ffa2dc9a..00000000 Binary files a/system/wallpapers/Rainnight.jpg and /dev/null differ diff --git a/system/wallpapers/animated/citadel.gif b/system/wallpapers/animated/citadel.gif deleted file mode 100644 index c0f66de1..00000000 Binary files a/system/wallpapers/animated/citadel.gif and /dev/null differ diff --git a/system/wallpapers/animated/pixel_cyberpunk_skyline.gif b/system/wallpapers/animated/pixel_cyberpunk_skyline.gif deleted file mode 100644 index d4782b7b..00000000 Binary files a/system/wallpapers/animated/pixel_cyberpunk_skyline.gif and /dev/null differ diff --git a/system/wallpapers/blake.png b/system/wallpapers/blake.png deleted file mode 100644 index 3147cd04..00000000 Binary files a/system/wallpapers/blake.png and /dev/null differ diff --git a/system/wallpapers/default.jpg b/system/wallpapers/default.jpg deleted file mode 100644 index 8f552d2d..00000000 Binary files a/system/wallpapers/default.jpg and /dev/null differ diff --git a/system/wallpapers/default.png b/system/wallpapers/default.png new file mode 100644 index 00000000..324d2f9e Binary files /dev/null and b/system/wallpapers/default.png differ diff --git a/system/wallpapers/evening-sky.png b/system/wallpapers/evening-sky.png deleted file mode 100644 index 07bb5e84..00000000 Binary files a/system/wallpapers/evening-sky.png and /dev/null differ diff --git a/system/wallpapers/forrest.png b/system/wallpapers/forrest.png deleted file mode 100644 index f8c6dcaa..00000000 Binary files a/system/wallpapers/forrest.png and /dev/null differ diff --git a/system/wallpapers/salty_mountains.png b/system/wallpapers/salty_mountains.png deleted file mode 100644 index d4c357cd..00000000 Binary files a/system/wallpapers/salty_mountains.png and /dev/null differ diff --git a/system/wallpapers/science/2422830.jpg b/system/wallpapers/science/2422830.jpg deleted file mode 100644 index 291003fa..00000000 Binary files a/system/wallpapers/science/2422830.jpg and /dev/null differ diff --git a/system/wallpapers/science/5636374.png b/system/wallpapers/science/5636374.png deleted file mode 100644 index 4f737ad1..00000000 Binary files a/system/wallpapers/science/5636374.png and /dev/null differ diff --git a/system/wallpapers/science/JET interior with superimposed plasma 2560px.jpg b/system/wallpapers/science/JET interior with superimposed plasma 2560px.jpg deleted file mode 100644 index 5b4a51a5..00000000 Binary files a/system/wallpapers/science/JET interior with superimposed plasma 2560px.jpg and /dev/null differ diff --git a/system/wallpapers/science/JET plasmas.png b/system/wallpapers/science/JET plasmas.png deleted file mode 100644 index 2efbb011..00000000 Binary files a/system/wallpapers/science/JET plasmas.png and /dev/null differ diff --git a/system/wallpapers/science/JET wallpaper.jpg b/system/wallpapers/science/JET wallpaper.jpg deleted file mode 100644 index 3e521d77..00000000 Binary files a/system/wallpapers/science/JET wallpaper.jpg and /dev/null differ diff --git a/system/wallpapers/science/LHC Science.jpg b/system/wallpapers/science/LHC Science.jpg deleted file mode 100644 index 72b9e48e..00000000 Binary files a/system/wallpapers/science/LHC Science.jpg and /dev/null differ diff --git a/system/wallpapers/science/MAST wallpaper.png b/system/wallpapers/science/MAST wallpaper.png deleted file mode 100644 index 1b5c5347..00000000 Binary files a/system/wallpapers/science/MAST wallpaper.png and /dev/null differ diff --git a/system/wallpapers/science/MAST-U 16x9.jpg b/system/wallpapers/science/MAST-U 16x9.jpg deleted file mode 100644 index 32486f01..00000000 Binary files a/system/wallpapers/science/MAST-U 16x9.jpg and /dev/null differ diff --git a/system/wallpapers/science/chang_hyun_vvts6_1a.jpg b/system/wallpapers/science/chang_hyun_vvts6_1a.jpg deleted file mode 100644 index 16d47002..00000000 Binary files a/system/wallpapers/science/chang_hyun_vvts6_1a.jpg and /dev/null differ diff --git a/system/wallpapers/science/jet_glass_side_auto_pass_latest.png b/system/wallpapers/science/jet_glass_side_auto_pass_latest.png deleted file mode 100644 index b7e01b3a..00000000 Binary files a/system/wallpapers/science/jet_glass_side_auto_pass_latest.png and /dev/null differ diff --git a/system/wallpapers/science/jet_glass_side_s100_pass_latest.png b/system/wallpapers/science/jet_glass_side_s100_pass_latest.png deleted file mode 100644 index 52e52a33..00000000 Binary files a/system/wallpapers/science/jet_glass_side_s100_pass_latest.png and /dev/null differ diff --git a/system/wallpapers/science/jet_glass_side_s250_pass_latest.png b/system/wallpapers/science/jet_glass_side_s250_pass_latest.png deleted file mode 100644 index a9648d70..00000000 Binary files a/system/wallpapers/science/jet_glass_side_s250_pass_latest.png and /dev/null differ diff --git a/system/wallpapers/science/jet_glass_side_s50_pass_latest.png b/system/wallpapers/science/jet_glass_side_s50_pass_latest.png deleted file mode 100644 index 65bcd6c0..00000000 Binary files a/system/wallpapers/science/jet_glass_side_s50_pass_latest.png and /dev/null differ diff --git a/system/wallpapers/science/jet_glass_top_auto_pass_latest.png b/system/wallpapers/science/jet_glass_top_auto_pass_latest.png deleted file mode 100644 index 9e4a3b99..00000000 Binary files a/system/wallpapers/science/jet_glass_top_auto_pass_latest.png and /dev/null differ diff --git a/system/wallpapers/science/jet_glass_top_s100_pass_latest.png b/system/wallpapers/science/jet_glass_top_s100_pass_latest.png deleted file mode 100644 index cf813e0f..00000000 Binary files a/system/wallpapers/science/jet_glass_top_s100_pass_latest.png and /dev/null differ diff --git a/system/wallpapers/science/jet_glass_top_s250_pass_latest.png b/system/wallpapers/science/jet_glass_top_s250_pass_latest.png deleted file mode 100644 index 3482ce30..00000000 Binary files a/system/wallpapers/science/jet_glass_top_s250_pass_latest.png and /dev/null differ diff --git a/system/wallpapers/science/jet_glass_top_s50_pass_latest.png b/system/wallpapers/science/jet_glass_top_s50_pass_latest.png deleted file mode 100644 index 6597a716..00000000 Binary files a/system/wallpapers/science/jet_glass_top_s50_pass_latest.png and /dev/null differ diff --git a/system/wallpapers/science/luca_z_56_iter_i_small.jpg b/system/wallpapers/science/luca_z_56_iter_i_small.jpg deleted file mode 100644 index 6a2d6605..00000000 Binary files a/system/wallpapers/science/luca_z_56_iter_i_small.jpg and /dev/null differ diff --git a/system/wallpapers/science/mastu_glass_side_s3.png b/system/wallpapers/science/mastu_glass_side_s3.png deleted file mode 100644 index 189d32b3..00000000 Binary files a/system/wallpapers/science/mastu_glass_side_s3.png and /dev/null differ diff --git a/system/wallpapers/science/oct5-selfie.jpg b/system/wallpapers/science/oct5-selfie.jpg deleted file mode 100644 index 716cacf1..00000000 Binary files a/system/wallpapers/science/oct5-selfie.jpg and /dev/null differ diff --git a/system/wallpapers/science/pit_02-07-2021_small.jpg b/system/wallpapers/science/pit_02-07-2021_small.jpg deleted file mode 100644 index bedb3735..00000000 Binary files a/system/wallpapers/science/pit_02-07-2021_small.jpg and /dev/null differ diff --git a/system/wallpapers/science/vsm6_almost_there_1_small.jpg b/system/wallpapers/science/vsm6_almost_there_1_small.jpg deleted file mode 100644 index 3a69bb88..00000000 Binary files a/system/wallpapers/science/vsm6_almost_there_1_small.jpg and /dev/null differ diff --git a/system/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg b/system/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg deleted file mode 100644 index 82aab9ec..00000000 Binary files a/system/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg and /dev/null differ diff --git a/system/wallpapers/shaded_landscape.png b/system/wallpapers/shaded_landscape.png deleted file mode 100644 index 181c23bb..00000000 Binary files a/system/wallpapers/shaded_landscape.png and /dev/null differ diff --git a/system/wallpapers/windows-error.jpg b/system/wallpapers/windows-error.jpg deleted file mode 100644 index 04b05882..00000000 Binary files a/system/wallpapers/windows-error.jpg and /dev/null differ diff --git a/system/wallpapers/yosemite.png b/system/wallpapers/yosemite.png deleted file mode 100644 index 62998eb3..00000000 Binary files a/system/wallpapers/yosemite.png and /dev/null differ diff --git a/system/work.nix b/system/work.nix index ec5e7330..a3773065 100644 --- a/system/work.nix +++ b/system/work.nix @@ -1,5 +1,11 @@ -{ lib, username, ... }: { + lib, + pkgs, + username, + ... +}: +{ + environment.systemPackages = with pkgs; [ twinkle ]; home-manager.users.${username} = { config, ... }: {