diff --git a/packages/wallpapers/img/os_factory.png b/assets/wallpaper.png similarity index 100% rename from packages/wallpapers/img/os_factory.png rename to assets/wallpaper.png diff --git a/hosts/goopnet-interface/default.nix b/hosts/goopnet-interface/default.nix index 0d5bb78..ff32451 100755 --- a/hosts/goopnet-interface/default.nix +++ b/hosts/goopnet-interface/default.nix @@ -37,7 +37,6 @@ hardware = { bluetooth.enable = true; pipewire.enable = true; - print.enable = true; }; dev = { enable = true; diff --git a/modules/desktop/hyprlock.nix b/modules/desktop/hyprlock.nix index 7f966d6..cfdbb13 100644 --- a/modules/desktop/hyprlock.nix +++ b/modules/desktop/hyprlock.nix @@ -26,10 +26,6 @@ in { no_fade_in = true; no_fade_out = true; text_trim = true; - # this will render the color we specified on the background before the image is loaded - # i like this because we will no longer see our screen for a split second before the image is ready - # extra security feature too - immediate_render = true; }; background = [ { @@ -78,7 +74,7 @@ in { halign = "center"; valign = "center"; } { - position = "-15, -11"; + position = "-15, -13"; halign = "right"; valign = "top"; color = "rgb(${base05})"; font_size = 14; diff --git a/modules/desktop/swww.nix b/modules/desktop/swww.nix index a194234..cbcaff6 100644 --- a/modules/desktop/swww.nix +++ b/modules/desktop/swww.nix @@ -4,8 +4,7 @@ with lib; let cfg = config.modules.desktop.swww; - wallpapersFolder = "${pkgs.my.wallpapers}/share/backgrounds"; - lastWallpaper = "$XDG_DATA_HOME/swww-last-wallpaper"; + img = ../../assets/wallpaper.png; in { options.modules.desktop.swww = { enable = mkEnableOption "Enable swww, a Solution to your Wayland Wallpaper Woes"; @@ -17,25 +16,8 @@ in { startScript = mkOption { type = types.package; default = pkgs.writeScript "swww-start" '' - if [ ! -f "${lastWallpaper}" ]; then - echo "$(ls ${wallpapersFolder} | shuf -n 1)" > "${lastWallpaper}" - fi - ${cfg.package}/bin/swww-daemon & - ${lib.getExe cfg.package} img "${wallpapersFolder}/$(cat ${lastWallpaper})" --transition-type none - ''; - }; - swapScript = mkOption { - type = types.package; - default = pkgs.writeScript "swww-swap" '' - file=$(ls ${wallpapersFolder} | ${lib.getExe pkgs.rofi-wayland} -dmenu -sep '\n' -i -p "select a wallpaper") - wallpaper="${wallpapersFolder}/$file" - - [ ! -f "$wallpaper" ] && exit 1 - - ${lib.getExe cfg.package} img "$wallpaper" --transition-type grow --transition-fps 60 --transition-pos 0.915,0.977 --transition-duration 1.5 - - echo "$file" > "${lastWallpaper}" + ${lib.getExe cfg.package} img "${img}" --transition-type none ''; }; }; diff --git a/modules/desktop/waybar.nix b/modules/desktop/waybar.nix index 254bb00..b4ebce0 100644 --- a/modules/desktop/waybar.nix +++ b/modules/desktop/waybar.nix @@ -66,7 +66,6 @@ in { "battery" "custom/weather" "privacy" - "custom/wallpaper" ]; }; "group/power" = { @@ -99,12 +98,6 @@ in { tooltip-format = "Power menu"; on-click = "${powerSelect}"; }; - "custom/wallpaper" = { - format = ""; - tooltip = true; - tooltip-format = "Change wallpaper"; - on-click = "${config.modules.desktop.swww.swapScript}"; - }; "hyprland/workspaces" = { format = "{icon}"; format-icons = { diff --git a/modules/hardware/print.nix b/modules/hardware/print.nix deleted file mode 100644 index 78629ed..0000000 --- a/modules/hardware/print.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, config, lib, ... }: - -with lib; -let - cfg = config.modules.hardware.print; -in { - options.modules.hardware.print = { - enable = mkEnableOption "Enable various print services"; - }; - - config = mkIf cfg.enable { - services.printing.enable = true; - services.printing.startWhenNeeded = true; # i am not the avid printer user - services.printing.browsed.enable = true; - services.printing.drivers = with pkgs; [ - # gutenprint is very generic and supports a lot of printers - gutenprint - gutenprintBin - # brother laser printers - brlaser - ]; - - # network discovery - services.avahi = { - enable = true; - openFirewall = true; - nssmdns4 = true; - }; - }; -} diff --git a/packages/apple-firmware/default.nix b/packages/apple-firmware/default.nix index 148b3f5..183855a 100644 --- a/packages/apple-firmware/default.nix +++ b/packages/apple-firmware/default.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { installPhase = '' mkdir -p "$out/lib/firmware/brcm" - cp -r "$src/lib/firmware/brcm/." "$out/lib/firmware/brcm/" + cp -r lib/firmware/brcm/. "$out/lib/firmware/brcm/" ''; meta = with lib; { diff --git a/packages/wallpapers/default.nix b/packages/wallpapers/default.nix deleted file mode 100644 index bed0644..0000000 --- a/packages/wallpapers/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenvNoCC }: - -stdenvNoCC.mkDerivation { - pname = "wallpapers"; - version = "unstable"; - - src = ./.; - - # later, add XML files to /usr(?)/share/backgrounds - # then, it is selectable from places like in gnome and also do the same for KDE - installPhase = '' - mkdir -p "$out/share/backgrounds" - cp -r "$src/img/." "$out/share/backgrounds/" - ''; - - meta = with lib; { - description = "Small collection of wallpapers"; - # idk what to put here: - # license = licenses.ofl; - platforms = platforms.all; - }; -} diff --git a/packages/wallpapers/img/fish_whisperer.jpg b/packages/wallpapers/img/fish_whisperer.jpg deleted file mode 100644 index ac33b8d..0000000 Binary files a/packages/wallpapers/img/fish_whisperer.jpg and /dev/null differ diff --git a/packages/wallpapers/img/os_catwalks.png b/packages/wallpapers/img/os_catwalks.png deleted file mode 100644 index 7f7903a..0000000 Binary files a/packages/wallpapers/img/os_catwalks.png and /dev/null differ diff --git a/packages/wallpapers/img/os_library_stroll.png b/packages/wallpapers/img/os_library_stroll.png deleted file mode 100644 index 1431614..0000000 Binary files a/packages/wallpapers/img/os_library_stroll.png and /dev/null differ diff --git a/packages/wallpapers/img/os_memory.png b/packages/wallpapers/img/os_memory.png deleted file mode 100644 index e4d14b7..0000000 Binary files a/packages/wallpapers/img/os_memory.png and /dev/null differ diff --git a/packages/wallpapers/img/os_outpost.png b/packages/wallpapers/img/os_outpost.png deleted file mode 100644 index c42735e..0000000 Binary files a/packages/wallpapers/img/os_outpost.png and /dev/null differ diff --git a/packages/wallpapers/img/os_prophets.png b/packages/wallpapers/img/os_prophets.png deleted file mode 100644 index 60de391..0000000 Binary files a/packages/wallpapers/img/os_prophets.png and /dev/null differ diff --git a/packages/wallpapers/img/rw_drainage_system.png b/packages/wallpapers/img/rw_drainage_system.png deleted file mode 100644 index 620f631..0000000 Binary files a/packages/wallpapers/img/rw_drainage_system.png and /dev/null differ diff --git a/packages/wallpapers/img/rw_shoreline.jpg b/packages/wallpapers/img/rw_shoreline.jpg deleted file mode 100644 index a95b9f5..0000000 Binary files a/packages/wallpapers/img/rw_shoreline.jpg and /dev/null differ