Compare
9a7ddba442ef504daadb742d0648c21819bf0608
…
new-bootloader-next
· 7 commits
Commits
| Hash | Subject | Author | Date |
|---|---|---|---|
| 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 | |
| bde398cb | got portals working again for screensharing | Ryan Schanzenbacher | |
| 260a2e3d | Added hyprlock | Ryan Schanzenbacher | |
| cc6e0d95 | added fix for pinentry | Ryan Schanzenbacher |
@@ -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")
@@ -21,6 +21,9 @@ if status is-login
end
if status is-interactive
set -gax --path XDG_DATA_DIRS ~/.local/share/flatpak/exports/share
+
+ set GPG_TTY $(tty)
+ export GPG_TTY
# Commands to run in interactive sessions can go here
alias quit exit
alias cat "bat --paging=never"
@@ -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"
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1685362396481634.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1693169418078790.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1694792956043641.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1708470532817406.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1720751011150282.png differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1723625710776950.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1723626275390685.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/1728661127589872.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/4yglzy4rkh4d1.jpeg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/7xosa7um3ohd1.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/83juiltm3ohd1.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/CN62QXJ.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-bluehour-1k.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-budapest.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-close-to-the-sun-1920.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-cold-1k.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-dreamy-1k.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-lights-1k.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-lines1k.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-mountains1k.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-new-year1k.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-reflect1k.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-serenity-1k.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-sky1k.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-wait.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/alena-aenami-wings-hd.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/sah1k8tm3ohd1.jpg differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/vfcfyfyehhi31.png differ
Binary files /dev/null and b/home-config/hypr/Wallpapers/static/w7ufw5eb3cuz.jpg differ
@@ -8,12 +8,27 @@ 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' &
syncthing serve --no-browser &
-wl-clip-persist -c regular &
+# Kill any orphans of this
+killall wl-clip-persist
+wl-clip-persist -c regular --reconnect-tries 5 &
-kanshi -c ~/.config/hypr/kanshi.conf
+kanshi -c ~/.config/hypr/kanshi.conf &
+
+# Start the portals
+
+sleep 0.5
+killall -e xdg-desktop-portal-hyprland
+killall xdg-desktop-portal-gtk
+killall xdk-desktop-portal
+
+~/.nix-profile/libexec/xdg-desktop-portal-hyprland &
+~/.nix-profile/libexec/xdg-desktop-portal-gtk &
+sleep 2
+XDG_DESKTOP_PORTAL_DIR="/home/ryan/.nix-profile/share/xdg-desktop-portal/portals" ~/.nix-profile/libexec/xdg-desktop-portal &
@@ -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"
}
},
@@ -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";
};
};
@@ -45,15 +45,25 @@
gdu
spotify-player
hyprpicker
+ hyprlock
+ 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
+ hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
nixgl.packages.${pkgs.system}.nixGLIntel
# 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