feat: update wallpapers

feat: update screenshots for hyprland

README.md

@@ -50,9 +50,9 @@ Nix allows for easy-to-manage, collaborative, reproducible deployments. This mea
 
 ## Hyprland + AstroNvim
 
-![](./_img/hyprland_2023-07-26.webp)
+![](./_img/hyprland_2023-07-29_1.webp)
 
-![](./_img/hyprland_2023-07-27.webp)
+![](./_img/hyprland_2023-07-29_2.webp)
 
 ## I3 + AstroNvim
 

flake.nix

@@ -20,12 +20,16 @@
     nix-darwin,
     home-manager,
     nixos-generators,
+    wallpapers,
     ...
   }: let
     username = "ryan";
     userfullname = "Ryan Yin";
     useremail = "xiaoyin_c@qq.com";
 
+    # https://github.com/ryan4yin/wallpapers
+    wallpaper = "${wallpapers}/anime-girls_seagulls_smoking_nature-occupation.jpg";
+
     x64_system = "x86_64-linux";
     x64_darwin = "x86_64-darwin";
     allSystems = [x64_system x64_darwin];
@@ -77,7 +81,7 @@
       system = x64_system;
       specialArgs =
         {
-          inherit username userfullname useremail;
+          inherit username userfullname useremail wallpaper;
           # use unstable branch for some packages to get the latest updates
           pkgs-unstable = import nixpkgs-unstable {
             system = x64_system; # refer the `system` parameter form outer scope recursively
@@ -210,6 +214,12 @@
       flake = false;
     };
 
+    # my wallpapers
+    wallpapers = {
+      url = "github:ryan4yin/wallpapers";
+      flake = false;
+    };
+
     # color scheme - catppuccin
     catppuccin-btop = {
       url = "github:catppuccin/btop";

home/linux/hyprland/default.nix

@@ -1,4 +1,4 @@
-{pkgs, catppuccin-hyprland, ...}: {
+{pkgs, catppuccin-hyprland, wallpaper, ...}: {
   imports = [
     ./wayland-apps.nix
   ];
@@ -16,7 +16,7 @@
   };
   home.file.".config/hypr-themes".source = "${catppuccin-hyprland}/themes";
 
-  home.file.".config/hypr/wallpapers/wallpaper.png".source = ../wallpapers/wallpaper.png;
+  home.file.".config/hypr/wallpapers/wallpaper".source = wallpaper;
 
   # gtk's theme settings, generate files: 
   #   1. ~/.gtkrc-2.0

home/linux/hyprland/hypr-conf/scripts/startup

@@ -11,7 +11,7 @@ for _prs in "${_ps[@]}"; do
 done
 
 # Set wallpaper
-swaybg --output '*' --mode fill --image ~/.config/hypr/wallpapers/wallpaper.png &
+swaybg --output '*' --mode fill --image ~/.config/hypr/wallpapers/wallpaper &
 
 # Lauch notification daemon (mako)
 ~/.config/hypr/scripts/notifications &

home/linux/i3/config

@@ -262,7 +262,7 @@ exec --no-startup-id ~/.screenlayout/monitor.sh
 
 # set wallpaper
 # exec --no-startup-id sleep 2 && nitrogen --restore
-exec --no-startup-id sleep 1 && feh --bg-fill ~/.config/i3/wallpaper.png
+exec --no-startup-id sleep 1 && feh --bg-fill ~/.config/i3/wallpaper
 
 # set powersavings for display:
 exec --no-startup-id xset s 480 dpms 600 600 600

home/linux/i3/default.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{ pkgs, wallpaper, ...}: {
   # i3 window manager's config, based on https://github.com/endeavouros-team/endeavouros-i3wm-setup
 
   imports = [
@@ -7,7 +7,7 @@
 
   home.file = {
     # wallpaper, binary file
-    ".config/i3/wallpaper.png".source = ../wallpapers/wallpaper.png;
+    ".config/i3/wallpaper".source = wallpaper;
     ".config/i3/config".source = ./config;
     ".config/i3/i3blocks.conf".source = ./i3blocks.conf;
     ".config/i3/scripts" = {

home/linux/wallpapers/convert_to_png.nu

@@ -1,22 +0,0 @@
-# convert all images to png
-
-def to_png [old_path: string, old_format: string] {
-  # 将后缀改为 .png 得到新图片的 path
-  let webp_path = ($old_path | split row $old_format | append ".png" | str join)
-  # 使用 ffmpeg 进行格式转换
-  ffmpeg -y -i $old_path $webp_path
-  # 删除旧图片
-  rm $old_path
-}
-
-def convert_format [old_format: string] {
-    # 递归找出所有大于 10kib 的图片
-    let old_paths = (ls $"**/*($old_format)" | where size > 10kb | each {|it| $it.name})
-    $old_paths | to md
-
-    # 1. 执行图片格式转换与压缩，同时删除原图片
-    $old_paths | each { |it| to_png $it $old_format }
-}
-
-convert_format ".webp"
-# convert_format ".jpg"

home/linux/wallpapers/wallpaper.png

@@ -1 +0,0 @@
-jiaocha_anime-girls_seagulls.jpg