Compare

bde398cb8c3dd49ec9d726ef9bef8e6c99766c46new-bootloader-next · 4 commits

merge base bde398cb8c3d…

Changed files

FileChanges
channels.scm +1 −1 raw
home-config/home-configuration.scm +2 −2 raw
home-config/hypr/Wallpapers/static/1685362396481634.jpg binary raw
home-config/hypr/Wallpapers/static/1693169418078790.jpg binary raw
home-config/hypr/Wallpapers/static/1694792956043641.jpg binary raw
home-config/hypr/Wallpapers/static/1708470532817406.jpg binary raw
home-config/hypr/Wallpapers/static/1720751011150282.png binary raw
home-config/hypr/Wallpapers/static/1723625710776950.jpg binary raw
home-config/hypr/Wallpapers/static/1723626275390685.jpg binary raw
home-config/hypr/Wallpapers/static/1728661127589872.jpg binary raw
home-config/hypr/Wallpapers/static/4yglzy4rkh4d1.jpeg binary raw
home-config/hypr/Wallpapers/static/7xosa7um3ohd1.jpg binary raw
home-config/hypr/Wallpapers/static/83juiltm3ohd1.jpg binary raw
home-config/hypr/Wallpapers/static/CN62QXJ.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-bluehour-1k.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-budapest.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-close-to-the-sun-1920.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-cold-1k.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-dreamy-1k.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-lights-1k.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-lines1k.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-mountains1k.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-new-year1k.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-reflect1k.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-serenity-1k.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-sky1k.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-wait.jpg binary raw
home-config/hypr/Wallpapers/static/alena-aenami-wings-hd.jpg binary raw
home-config/hypr/Wallpapers/static/sah1k8tm3ohd1.jpg binary raw
home-config/hypr/Wallpapers/static/vfcfyfyehhi31.png binary raw
home-config/hypr/Wallpapers/static/w7ufw5eb3cuz.jpg binary raw
home-config/hypr/autostart.sh +2 −1 raw
home-config/nix-home-manager/flake.lock +13 −10 raw
home-config/nix-home-manager/flake.nix +4 −4 raw
home-config/nix-home-manager/home.nix +6 −1 raw

Commits

HashSubjectAuthorDate
7f27d13d Merge branch 'main' into new-bootloader-next Ryan Schanzenbacher
f8a56388 Have you tried the wallpaper drug? Ryan Schanzenbacher
3aaeb60f change guix remote to follow my mirror Ryan Schanzenbacher
9f740aa8 Re-arranged some packages to allow mpv and imv to work again Ryan Schanzenbacher
diff --git a/channels.scm b/channels.scm
index 0beaf44..38ab180 100644
--- a/channels.scm
+++ b/channels.scm
@@ -1,6 +1,6 @@
(list (channel
(name 'guix)
- (url "https://git.savannah.gnu.org/git/guix.git")
+ (url "https://git.rschanz.org/ryan77627/guix.git")
(branch "master")
(commit
"308877be17b2c2c92d972e105e8cc6a782ab4c82")
diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index a665e70..dd14824 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -85,7 +85,7 @@
"syncthing"
"taskwarrior"
"tasksh"
- "imv"
+ ;"imv" ; Nix pkg now for MESA stuff
"perl"
"tor"
"unzip"
@@ -119,7 +119,7 @@
"python-lsp-server"
"kdenlive"
"sqlite"
- "mpv"
+ ;"mpv" ; Now a nix pkg for MESA stuff
"qbittorrent"
"playerctl"
;"aerc"
diff --git a/home-config/hypr/Wallpapers/static/1685362396481634.jpg b/home-config/hypr/Wallpapers/static/1685362396481634.jpg
new file mode 100644
index 0000000..fd49cae
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1685362396481634.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/1693169418078790.jpg b/home-config/hypr/Wallpapers/static/1693169418078790.jpg
new file mode 100644
index 0000000..8156108
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1693169418078790.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/1694792956043641.jpg b/home-config/hypr/Wallpapers/static/1694792956043641.jpg
new file mode 100644
index 0000000..431e96b
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1694792956043641.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/1708470532817406.jpg b/home-config/hypr/Wallpapers/static/1708470532817406.jpg
new file mode 100644
index 0000000..4a4f2f0
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1708470532817406.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/1720751011150282.png b/home-config/hypr/Wallpapers/static/1720751011150282.png
new file mode 100644
index 0000000..dbd3e38
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1720751011150282.png differ
diff --git a/home-config/hypr/Wallpapers/static/1723625710776950.jpg b/home-config/hypr/Wallpapers/static/1723625710776950.jpg
new file mode 100644
index 0000000..71608ff
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1723625710776950.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/1723626275390685.jpg b/home-config/hypr/Wallpapers/static/1723626275390685.jpg
new file mode 100644
index 0000000..aa8c8c2
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1723626275390685.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/1728661127589872.jpg b/home-config/hypr/Wallpapers/static/1728661127589872.jpg
new file mode 100644
index 0000000..b5dcbeb
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1728661127589872.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/4yglzy4rkh4d1.jpeg b/home-config/hypr/Wallpapers/static/4yglzy4rkh4d1.jpeg
new file mode 100644
index 0000000..0ef50ad
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/4yglzy4rkh4d1.jpeg differ
diff --git a/home-config/hypr/Wallpapers/static/7xosa7um3ohd1.jpg b/home-config/hypr/Wallpapers/static/7xosa7um3ohd1.jpg
new file mode 100644
index 0000000..3bb615e
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/7xosa7um3ohd1.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/83juiltm3ohd1.jpg b/home-config/hypr/Wallpapers/static/83juiltm3ohd1.jpg
new file mode 100644
index 0000000..15aff05
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/83juiltm3ohd1.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/CN62QXJ.jpg b/home-config/hypr/Wallpapers/static/CN62QXJ.jpg
new file mode 100644
index 0000000..c49c449
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/CN62QXJ.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-bluehour-1k.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-bluehour-1k.jpg
new file mode 100644
index 0000000..ade3472
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-bluehour-1k.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-budapest.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-budapest.jpg
new file mode 100644
index 0000000..a01b60b
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-budapest.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-close-to-the-sun-1920.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-close-to-the-sun-1920.jpg
new file mode 100644
index 0000000..853ff56
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-close-to-the-sun-1920.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-cold-1k.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-cold-1k.jpg
new file mode 100644
index 0000000..5152b02
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-cold-1k.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-dreamy-1k.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-dreamy-1k.jpg
new file mode 100644
index 0000000..3931833
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-dreamy-1k.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-lights-1k.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-lights-1k.jpg
new file mode 100644
index 0000000..31b7120
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-lights-1k.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-lines1k.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-lines1k.jpg
new file mode 100644
index 0000000..73688eb
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-lines1k.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-mountains1k.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-mountains1k.jpg
new file mode 100644
index 0000000..7448ab1
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-mountains1k.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-new-year1k.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-new-year1k.jpg
new file mode 100644
index 0000000..816a884
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-new-year1k.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-reflect1k.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-reflect1k.jpg
new file mode 100644
index 0000000..49ab145
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-reflect1k.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-serenity-1k.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-serenity-1k.jpg
new file mode 100644
index 0000000..7164548
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-serenity-1k.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-sky1k.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-sky1k.jpg
new file mode 100644
index 0000000..84b9739
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-sky1k.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-wait.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-wait.jpg
new file mode 100644
index 0000000..2dc72ac
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-wait.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/alena-aenami-wings-hd.jpg b/home-config/hypr/Wallpapers/static/alena-aenami-wings-hd.jpg
new file mode 100644
index 0000000..89b1378
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-wings-hd.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/sah1k8tm3ohd1.jpg b/home-config/hypr/Wallpapers/static/sah1k8tm3ohd1.jpg
new file mode 100644
index 0000000..a21261b
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/sah1k8tm3ohd1.jpg differ
diff --git a/home-config/hypr/Wallpapers/static/vfcfyfyehhi31.png b/home-config/hypr/Wallpapers/static/vfcfyfyehhi31.png
new file mode 100644
index 0000000..adb7f37
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/vfcfyfyehhi31.png differ
diff --git a/home-config/hypr/Wallpapers/static/w7ufw5eb3cuz.jpg b/home-config/hypr/Wallpapers/static/w7ufw5eb3cuz.jpg
new file mode 100644
index 0000000..e59d184
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/w7ufw5eb3cuz.jpg differ
diff --git a/home-config/hypr/autostart.sh b/home-config/hypr/autostart.sh
index 77ebae8..8c7c502 100755
--- a/home-config/hypr/autostart.sh
+++ b/home-config/hypr/autostart.sh
@@ -8,7 +8,8 @@ mako &
nice -n13 swww init &
-~/.config/hypr/wallpaper-daemon.sh &
+#~/.config/hypr/wallpaper-daemon.sh &
+wpaperd -d &
swayidle -w timeout 300 'swaylock --screenshots --clock --indicator --grace 3 --fade-in 1 --effect-blur 7x5 --effect-greyscale' timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f -c 000000' &
diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock
index 8885a8c..f899e74 100644
--- a/home-config/nix-home-manager/flake.lock
+++ b/home-config/nix-home-manager/flake.lock
@@ -55,16 +55,17 @@
]
},
"locked": {
- "lastModified": 1729260213,
- "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=",
+ "lastModified": 1729321331,
+ "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75",
+ "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
+ "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68",
"type": "github"
}
},
@@ -217,15 +218,16 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1727732210,
- "narHash": "sha256-VNKakkdx1mjfO5MyGZbx8m87YKZ4B8cylU50R0J662g=",
+ "lastModified": 1727705155,
+ "narHash": "sha256-gu26MSYbTlRLMUpZ9PeYXtqqhzPDQXxEDkjiJgwzIIc=",
"owner": "hyprwm",
"repo": "hyprpicker",
- "rev": "4411a6dc0dccdabad64213463fb94de520b52725",
+ "rev": "116cec14a552191a9ad69ca96252ca12ecfa9826",
"type": "github"
},
"original": {
"owner": "hyprwm",
+ "ref": "v0.4.1",
"repo": "hyprpicker",
"type": "github"
}
@@ -348,22 +350,23 @@
"original": {
"owner": "nix-community",
"repo": "nixGL",
+ "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
"type": "github"
}
},
"nixpkgs": {
"locked": {
- "lastModified": 1729070438,
- "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=",
+ "lastModified": 1729168305,
+ "narHash": "sha256-jmhxZnrlOyLEMUL2+JkVfkN0XWXI5uE6EB5kVZFR0fo=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5785b6bb5eaae44e627d541023034e1601455827",
+ "rev": "2a55bdc8cfcf41551323a4a6cef24d3f566c824d",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-unstable",
"repo": "nixpkgs",
+ "rev": "2a55bdc8cfcf41551323a4a6cef24d3f566c824d",
"type": "github"
}
},
diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix
index 6429214..7ba72b4 100644
--- a/home-config/nix-home-manager/flake.nix
+++ b/home-config/nix-home-manager/flake.nix
@@ -3,13 +3,13 @@
inputs = {
# Specify the source of Home Manager and Nixpkgs.
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ nixpkgs.url = "github:nixos/nixpkgs/2a55bdc8cfcf41551323a4a6cef24d3f566c824d";
home-manager = {
- url = "github:nix-community/home-manager";
+ url = "github:nix-community/home-manager/122f70545b29ccb922e655b08acfe05bfb44ec68";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprpicker-git = {
- url = "github:hyprwm/hyprpicker";
+ url = "github:hyprwm/hyprpicker/v0.4.1";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
@@ -17,7 +17,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixgl = {
- url = "github:nix-community/nixGL";
+ url = "github:nix-community/nixGL/310f8e49a149e4c9ea52f1adf70cdc768ec53f8a";
inputs.nixpkgs.follows = "nixpkgs";
};
};
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index a886c6a..72ddf3a 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -49,6 +49,11 @@
xwayland
xdg-desktop-portal
xdg-desktop-portal-gtk
+ mpv
+ imv
+ libva
+ libvdpau
+ wpaperd
# Flakes specific things defined in flake.nix
hyprland.packages.${pkgs.system}.default
@@ -58,7 +63,7 @@
# Fonts!
noto-fonts
liberation_ttf
- noto-fonts-cjk
+ noto-fonts-cjk-sans
noto-fonts-emoji
# # It is sometimes useful to fine-tune packages, for example, by applying