From ed9918f2cd8e9a8030c188af31d3de033a6da036 Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Mon, 1 Dec 2025 18:10:17 -0500 Subject: Finalized update --- home-config/home-configuration.scm | 10 +- home-config/nix-home-manager/flake.lock | 311 +++++++++++++++++++------------- home-config/nix-home-manager/flake.nix | 2 +- 3 files changed, 194 insertions(+), 129 deletions(-) diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index b32894c..33f5a8e 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm @@ -48,10 +48,10 @@ "fd" ;"fish" "xdg-utils" - "abook" + ;"abook" "libnotify" "fzf" - "waypipe" + ;"waypipe" "foot" "pulseaudio" ;only for pactl "qpwgraph" @@ -76,12 +76,12 @@ "libreoffice" "flatpak" "gnupg" - "spotifyd" + ;"spotifyd" "lsof" "pavucontrol" "netcat" "bind:utils" - "font-cns11643" + "font-cns11643-swjz" "font-google-noto-emoji" "syncthing" ;"taskwarrior" @@ -195,7 +195,7 @@ (".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t)) (".nix-channels" ,(local-file "nix-channels")))) (service home-pipewire-service-type) - (service home-spotifyd-service-type) + ;(service home-spotifyd-service-type) ; font things for nix to play nice (simple-service 'additional-fonts-service home-fontconfig-service-type diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock index 44cbcad..88a0f49 100644 --- a/home-config/nix-home-manager/flake.lock +++ b/home-config/nix-home-manager/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1745357003, - "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", + "lastModified": 1762356719, + "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", + "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", "type": "github" }, "original": { @@ -73,11 +73,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -163,17 +163,17 @@ ] }, "locked": { - "lastModified": 1749526227, - "narHash": "sha256-djUEgLQNnOA2SEClYFvBr9tJfMcQajuaU186tpPIYU4=", + "lastModified": 1764361670, + "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "e9763eb195c1e3d508892993cf112bd75d6fd712", + "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "type": "github" }, "original": { "owner": "nix-community", "repo": "home-manager", - "rev": "e9763eb195c1e3d508892993cf112bd75d6fd712", + "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "type": "github" } }, @@ -188,17 +188,17 @@ ] }, "locked": { - "lastModified": 1748038505, - "narHash": "sha256-7L2MRMB2ONEh7wlgQzraEoA+0o88EOV87KNqZg7vpHA=", + "lastModified": 1763589171, + "narHash": "sha256-3+k074XQ4quCWQ/WLEeYTTD+AlDlxtzKvH9gkWqn+8Y=", "owner": "VirtCode", "repo": "hypr-dynamic-cursors", - "rev": "761acf0e602e0f6549e5e6c0289a0402e6073489", + "rev": "85e6a93f311132d775538c4a016b637b366d2a44", "type": "github" }, "original": { "owner": "VirtCode", "repo": "hypr-dynamic-cursors", - "rev": "761acf0e602e0f6549e5e6c0289a0402e6073489", + "rev": "85e6a93f311132d775538c4a016b637b366d2a44", "type": "github" } }, @@ -218,11 +218,11 @@ ] }, "locked": { - "lastModified": 1745948457, - "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", + "lastModified": 1753964049, + "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "ac903e80b33ba6a88df83d02232483d99f327573", + "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", "type": "github" }, "original": { @@ -247,11 +247,11 @@ ] }, "locked": { - "lastModified": 1745015490, - "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", + "lastModified": 1762462052, + "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "60754910946b4e2dc1377b967b7156cb989c5873", + "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", "type": "github" }, "original": { @@ -276,11 +276,11 @@ ] }, "locked": { - "lastModified": 1743953322, - "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=", + "lastModified": 1750621377, + "narHash": "sha256-8u6b5oAdX0rCuoR8wFenajBRmI+mzbpNig6hSCuWUzE=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d", + "rev": "b3d628d01693fb9bb0a6690cd4e7b80abda04310", "type": "github" }, "original": { @@ -294,11 +294,11 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" ], @@ -307,90 +307,64 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1746735318, - "narHash": "sha256-iN0Ge4LaVT7rATqzIrAZFSdfYuIXbe4/HGcXle7qK1g=", + "lastModified": 1762731096, + "narHash": "sha256-Kma5MxOipSBamO6DnwBeqJNjJ+VwEO73zh9h1hs/2Aw=", "owner": "hyprwm", "repo": "hyprland", - "rev": "9958d297641b5c84dcff93f9039d80a5ad37ab00", + "rev": "967c3c7404d4fa00234e29c70df3e263386d2597", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.49.0", + "ref": "v0.52.1", "repo": "hyprland", "type": "github" } }, - "hyprland-protocols": { + "hyprland-guiutils": { "inputs": { - "nixpkgs": [ + "aquamarine": [ "hyprland", - "nixpkgs" + "aquamarine" ], - "systems": [ + "hyprgraphics": [ "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1743714874, - "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-qt-support": { - "inputs": { + "hyprgraphics" + ], "hyprlang": [ "hyprland", - "hyprland-qtutils", "hyprlang" ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", - "hyprland-qtutils", "nixpkgs" ], "systems": [ "hyprland", - "hyprland-qtutils", "systems" ] }, "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "lastModified": 1762465111, + "narHash": "sha256-dS13YZdWjgGGLBjpT4FHB6xf8I/WiAU+mgNWXsZgDUs=", "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", + "repo": "hyprland-guiutils", + "rev": "a415eba866a953f3096d661318f771aa0082eb98", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprland-qt-support", + "repo": "hyprland-guiutils", "type": "github" } }, - "hyprland-qtutils": { + "hyprland-protocols": { "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -401,16 +375,16 @@ ] }, "locked": { - "lastModified": 1745951494, - "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", + "lastModified": 1759610243, + "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", + "repo": "hyprland-protocols", + "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprland-qtutils", + "repo": "hyprland-protocols", "type": "github" } }, @@ -430,11 +404,11 @@ ] }, "locked": { - "lastModified": 1746655412, - "narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=", + "lastModified": 1758927902, + "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "557241780c179cf7ef224df392f8e67dab6cef83", + "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", "type": "github" }, "original": { @@ -459,11 +433,11 @@ ] }, "locked": { - "lastModified": 1744468525, - "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", + "lastModified": 1750371198, + "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", + "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b", "type": "github" }, "original": { @@ -477,23 +451,23 @@ "hyprgraphics": "hyprgraphics_2", "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprwayland-scanner": "hyprwayland-scanner_3", "nixpkgs": [ "nixpkgs" ], "systems": "systems_2" }, "locked": { - "lastModified": 1746281087, - "narHash": "sha256-9amK5DEpueAD+aobmBmjbV+C16RO7lcDOdf5ucJtNvM=", + "lastModified": 1759399385, + "narHash": "sha256-ucJ5C83hJy8XFO8Y+PL9hVcwdrQnj63BjXcO5A4qyNU=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "6c64630df81b52208b210f02476f55e4db56e6cf", + "rev": "c48279d1e0f0a4399b5a2d56c16f2ec677ba18f8", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.8.2", + "ref": "v0.9.2", "repo": "hyprlock", "type": "github" } @@ -501,7 +475,7 @@ "hyprpicker-git": { "inputs": { "hyprutils": "hyprutils_3", - "hyprwayland-scanner": "hyprwayland-scanner_3", + "hyprwayland-scanner": "hyprwayland-scanner_4", "nixpkgs": [ "nixpkgs" ], @@ -522,6 +496,54 @@ "type": "github" } }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1762463729, + "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -534,11 +556,11 @@ ] }, "locked": { - "lastModified": 1746635225, - "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", + "lastModified": 1762387740, + "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "674ea57373f08b7609ce93baff131117a0dfe70d", + "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7", "type": "github" }, "original": { @@ -559,11 +581,11 @@ ] }, "locked": { - "lastModified": 1743950287, - "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", + "lastModified": 1751061882, + "narHash": "sha256-g9n8Vrbx+2JYM170P9BbvGHN39Wlkr4U+V2WLHQsXL8=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", + "rev": "4737241eaf8a1e51671a2a088518071f9a265cf4", "type": "github" }, "original": { @@ -601,19 +623,23 @@ "inputs": { "nixpkgs": [ "hyprland", + "hyprland-guiutils", + "hyprtoolkit", "nixpkgs" ], "systems": [ "hyprland", + "hyprland-guiutils", + "hyprtoolkit", "systems" ] }, "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -623,6 +649,31 @@ } }, "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_3": { "inputs": { "nixpkgs": [ "hyprlock", @@ -634,11 +685,11 @@ ] }, "locked": { - "lastModified": 1739870480, - "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", + "lastModified": 1750371869, + "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", + "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd", "type": "github" }, "original": { @@ -647,7 +698,7 @@ "type": "github" } }, - "hyprwayland-scanner_3": { + "hyprwayland-scanner_4": { "inputs": { "nixpkgs": [ "hyprpicker-git", @@ -756,17 +807,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" } }, @@ -785,6 +836,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -795,11 +862,11 @@ ] }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1762441963, + "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "type": "github" }, "original": { @@ -921,24 +988,22 @@ }, "wpaperd": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay", "systems": "systems_5" }, "locked": { - "lastModified": 1748586603, - "narHash": "sha256-83MCM6u7mE92HKIRJXDpNoEFoLoJO3H9Mj9mJjhj6D4=", + "lastModified": 1761730811, + "narHash": "sha256-tGeBjGdhzwCRVJ+/bEghEzmF4dZn9GbG6wBhVVFfp4c=", "owner": "danyspin97", "repo": "wpaperd", - "rev": "37e4504b80d36395b7847ef2e3468e6a75d2a9ad", + "rev": "087a1edb5afd78434806f2f185755d0ced7f26ab", "type": "github" }, "original": { "owner": "danyspin97", "repo": "wpaperd", - "rev": "37e4504b80d36395b7847ef2e3468e6a75d2a9ad", + "rev": "087a1edb5afd78434806f2f185755d0ced7f26ab", "type": "github" } }, @@ -970,11 +1035,11 @@ ] }, "locked": { - "lastModified": 1745871725, - "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", + "lastModified": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", "type": "github" }, "original": { @@ -993,17 +1058,17 @@ ] }, "locked": { - "lastModified": 1756743777, - "narHash": "sha256-Cn2q2OpSu9aX0j5uRolbPU5Ms6RalVVc6QWibgZb3ak=", + "lastModified": 1764350280, + "narHash": "sha256-H8VpXvqEHll38N3YIaZUtqn7BSrq3SRfCL8idWvVRLw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "45c9893188e92bc0be717fb28c6d9e983c4b1734", + "rev": "504383097cbd6793aa62d1ec2d90d67ce7e4542e", "type": "github" }, "original": { "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "45c9893188e92bc0be717fb28c6d9e983c4b1734", + "rev": "504383097cbd6793aa62d1ec2d90d67ce7e4542e", "type": "github" } } diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix index 3b6c669..cae89be 100644 --- a/home-config/nix-home-manager/flake.nix +++ b/home-config/nix-home-manager/flake.nix @@ -27,7 +27,7 @@ }; wpaperd = { url = "github:danyspin97/wpaperd/087a1edb5afd78434806f2f185755d0ced7f26ab"; - inputs.nixpkgs.follows = "nixpkgs"; + #inputs.nixpkgs.follows = "nixpkgs"; }; mozff = { url = "github:nix-community/flake-firefox-nightly/3391372604cd3def19e6df88a51f1882aabcd59f"; -- cgit v1.2.3