diff --git a/README.md b/README.md index ea40e13e..0a0861ab 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@
-![rice showcase](./assets/showcase1.png) -![rice showcase2](./assets/showcase2.png) +![rice showcase](./assets/showcase.png) +![rice showcase2](./assets/showcaseoxocarbon.png)
diff --git a/assets/showcase.png b/assets/showcase.png new file mode 100644 index 00000000..e63b01a2 Binary files /dev/null and b/assets/showcase.png differ diff --git a/assets/showcase1.png b/assets/showcase1.png deleted file mode 100644 index ed2d2ef7..00000000 Binary files a/assets/showcase1.png and /dev/null differ diff --git a/assets/showcase2.png b/assets/showcase2.png deleted file mode 100644 index 91f4989b..00000000 Binary files a/assets/showcase2.png and /dev/null differ diff --git a/assets/showcaseoxocarbon.png b/assets/showcaseoxocarbon.png new file mode 100644 index 00000000..20b2d21b Binary files /dev/null and b/assets/showcaseoxocarbon.png differ diff --git a/flake.lock b/flake.lock index 51575ff2..019f0440 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1715722315, - "narHash": "sha256-A9DqQw1dd04QeO8wV+Lx5TJQ0ur5BfQkbpOcL2LBzqc=", + "lastModified": 1718287254, + "narHash": "sha256-YLq+gEzQ1YBS8zkw6vAdQCStNhBMXXOLnGZiZzWLtPY=", "owner": "redyf", "repo": "Neve", - "rev": "e106a6783c8e0dd94914c06fcef576521e2618ef", + "rev": "e7954f9b15555f6c961383ff0647560c17f2aec7", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", "owner": "numtide", "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1716394172, - "narHash": "sha256-B+pNhV8GFeCj9/MoH+qtGqKbgv6fU4hGaw2+NoYYtB0=", + "lastModified": 1718242063, + "narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=", "owner": "nix-community", "repo": "disko", - "rev": "23c63fb09334c3e8958b57e2ddc3870b75b9111d", + "rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2", "type": "github" }, "original": { @@ -248,11 +248,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -297,24 +297,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -331,12 +313,41 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "Neve", + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "Neve", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ "Neve", "nixvim", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -380,11 +391,11 @@ ] }, "locked": { - "lastModified": 1712989663, - "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=", + "lastModified": 1718141734, + "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", "owner": "nix-community", "repo": "home-manager", - "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0", + "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", "type": "github" }, "original": { @@ -400,11 +411,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1718243258, + "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", "type": "github" }, "original": { @@ -451,11 +462,11 @@ ] }, "locked": { - "lastModified": 1716327911, - "narHash": "sha256-PI+wygItS/TKzi4gEAROvKTUzTx9GT+PGBttS/IOA/Q=", + "lastModified": 1717181720, + "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "27ca640abeef2d425b5dbecf804f5eb622cef56d", + "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", "type": "github" }, "original": { @@ -480,11 +491,11 @@ ] }, "locked": { - "lastModified": 1716327911, - "narHash": "sha256-PI+wygItS/TKzi4gEAROvKTUzTx9GT+PGBttS/IOA/Q=", + "lastModified": 1717181720, + "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "27ca640abeef2d425b5dbecf804f5eb622cef56d", + "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", "type": "github" }, "original": { @@ -497,17 +508,18 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_5", - "systems": "systems_4", + "systems": "systems_3", "xdph": "xdph" }, "locked": { - "lastModified": 1716417827, - "narHash": "sha256-TYHpA/i9+Ns01+RzknJ5eYskQXL9GTTA7JX9Lo4JKVg=", + "lastModified": 1718292752, + "narHash": "sha256-NFioPAqyQIOuQMPcDezGCpngCP5ShrudUHfFCfN0d7o=", "ref": "refs/heads/main", - "rev": "7ad9116de8d0b7dac27eaf080bd92998a8fb40e5", - "revCount": 4728, + "rev": "5de273a14427cb4a4cad9ac57a22b418bcd4248d", + "revCount": 4821, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -532,11 +544,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -572,8 +584,37 @@ "type": "github" } }, + "hyprland-protocols_3": { + "inputs": { + "nixpkgs": [ + "xdg-portal-hyprland", + "nixpkgs" + ], + "systems": [ + "xdg-portal-hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "hyprlang": { "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -584,11 +625,11 @@ ] }, "locked": { - "lastModified": 1715791527, - "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=", + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", "type": "github" }, "original": { @@ -599,6 +640,10 @@ }, "hyprlang_2": { "inputs": { + "hyprutils": [ + "waybar-hyprland", + "hyprutils" + ], "nixpkgs": [ "waybar-hyprland", "nixpkgs" @@ -609,11 +654,11 @@ ] }, "locked": { - "lastModified": 1715791527, - "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=", + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", "type": "github" }, "original": { @@ -622,6 +667,78 @@ "type": "github" } }, + "hyprlang_3": { + "inputs": { + "nixpkgs": [ + "xdg-portal-hyprland", + "nixpkgs" + ], + "systems": "systems_5" + }, + "locked": { + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1718271409, + "narHash": "sha256-8KvVqtApNt4FWTdn1TqVvw00rpqyG9UuUPA2ilPVD1U=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "8e10e0626fb26a14b859b3811b6ed7932400c86e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "waybar-hyprland", + "nixpkgs" + ], + "systems": [ + "waybar-hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717881334, + "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -634,11 +751,11 @@ ] }, "locked": { - "lastModified": 1716058375, - "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", + "lastModified": 1717784906, + "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "3afed4364790aebe0426077631af1e164a9650cc", + "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", "type": "github" }, "original": { @@ -659,11 +776,11 @@ ] }, "locked": { - "lastModified": 1716058375, - "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", + "lastModified": 1717784906, + "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "3afed4364790aebe0426077631af1e164a9650cc", + "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", "type": "github" }, "original": { @@ -700,11 +817,11 @@ ] }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1717976995, + "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "315aa649ba307704db0b16c92f097a08a65ec955", "type": "github" }, "original": { @@ -715,11 +832,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713254108, - "narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=", + "lastModified": 1718149104, + "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00", + "rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", "type": "github" }, "original": { @@ -727,13 +844,29 @@ "type": "indirect" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -761,11 +894,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1716128955, - "narHash": "sha256-3DNg/PV+X2V7yn8b/fUR2ppakw7D9N4sjVBGk6nDwII=", + "lastModified": 1718149104, + "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9256de8281f2ccd04985ac5c30d8f69aefadbe8", + "rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", "type": "github" }, "original": { @@ -777,11 +910,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -809,11 +942,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -841,11 +974,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", "type": "github" }, "original": { @@ -860,17 +993,18 @@ "devshell": "devshell", "flake-compat": "flake-compat", "flake-parts": "flake-parts", + "git-hooks": "git-hooks", "home-manager": "home-manager", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_2", - "pre-commit-hooks": "pre-commit-hooks" + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1713294906, - "narHash": "sha256-xJJZdCBzVFpVppaYyUK4lTTNOnbAxrjhodoJL3Oi91E=", + "lastModified": 1718282813, + "narHash": "sha256-Rlf+UmAZ8nr5dBEqIiubLcxT8x/LSmS3ID+HNwyq+D4=", "owner": "nix-community", "repo": "nixvim", - "rev": "514a51877df9fe41ffc38c5237e3c4e5327e7607", + "rev": "01aa3d469e0cb0430e16fde6c5c3176f453bfba8", "type": "github" }, "original": { @@ -881,11 +1015,11 @@ }, "nur": { "locked": { - "lastModified": 1716421554, - "narHash": "sha256-a01RsgodkJnBAg6xrNRBeT2tcrOc9JdEJ6q4MGXyuV0=", + "lastModified": 1718310343, + "narHash": "sha256-jD2XqvofA5hdROv8OSTss/vjJi164Mjavgh2yJf2ej4=", "owner": "nix-community", "repo": "NUR", - "rev": "cd2265a92c4cb32b3ae23602dfdbe0a9c5833c6a", + "rev": "ca312c14ad9abbb8736b9f9fd6fa8b8f60b2f1b2", "type": "github" }, "original": { @@ -894,36 +1028,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "gitignore": "gitignore", - "nixpkgs": [ - "Neve", - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "Neve", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "Neve": "Neve", @@ -934,25 +1038,9 @@ "matugen": "matugen", "nixpkgs": "nixpkgs_7", "nur": "nur", - "sf-mono-liga-src": "sf-mono-liga-src", "stylix": "stylix", - "waybar-hyprland": "waybar-hyprland" - } - }, - "sf-mono-liga-src": { - "flake": false, - "locked": { - "lastModified": 1688258025, - "narHash": "sha256-AYjKrVLISsJWXN6Cj74wXmbJtREkFDYOCRw1t2nVH2w=", - "owner": "shaunsingh", - "repo": "SFMono-Nerd-Font-Ligaturized", - "rev": "dc5a3e6fcc2e16ad476b7be3c3c17c2273b260ea", - "type": "github" - }, - "original": { - "owner": "shaunsingh", - "repo": "SFMono-Nerd-Font-Ligaturized", - "type": "github" + "waybar-hyprland": "waybar-hyprland", + "xdg-portal-hyprland": "xdg-portal-hyprland" } }, "stylix": { @@ -970,11 +1058,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1716395969, - "narHash": "sha256-Qse5s/R8QKdI6yYnDv9pcDSrR8qVWzJ2m1QMjkuVxuU=", + "lastModified": 1718292734, + "narHash": "sha256-XAwxzCDfExqIj0PIjEpjt3eOzsosxOCLx6sQWHPSrSg=", "owner": "danth", "repo": "stylix", - "rev": "e7543c51eff9e73c85450c473e1f24513a5e0a0f", + "rev": "73c6955b4572346cc10f43a459949fe646efbde0", "type": "github" }, "original": { @@ -1015,16 +1103,16 @@ }, "systems_3": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1058,21 +1146,59 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "Neve", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718139168, + "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "waybar-hyprland": { "inputs": { "hyprcursor": "hyprcursor_2", "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": "nixpkgs_9", - "systems": "systems_5", + "systems": "systems_4", "xdph": "xdph_2" }, "locked": { - "lastModified": 1716417827, - "narHash": "sha256-2br1N9Nx5adieXKZPKWf8jKovWbLFNDw9/4NJdAhF2w=", + "lastModified": 1718292752, + "narHash": "sha256-O0czYVRia6RtorunzVPxK1et9rweJbTOmNYfA/jafg4=", "owner": "hyprwm", "repo": "hyprland", - "rev": "7ad9116de8d0b7dac27eaf080bd92998a8fb40e5", + "rev": "5de273a14427cb4a4cad9ac57a22b418bcd4248d", "type": "github" }, "original": { @@ -1081,6 +1207,27 @@ "type": "github" } }, + "xdg-portal-hyprland": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_3", + "hyprlang": "hyprlang_3", + "nixpkgs": "nixpkgs_10", + "systems": "systems_6" + }, + "locked": { + "lastModified": 1718272114, + "narHash": "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "24be4a26f0706e456fca1b61b8c79f7486a9e86d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -1098,11 +1245,11 @@ ] }, "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "lastModified": 1717918856, + "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "rev": "72907822c19afc0983c69d59d299204381623725", "type": "github" }, "original": { @@ -1128,11 +1275,11 @@ ] }, "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "lastModified": 1717918856, + "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "rev": "72907822c19afc0983c69d59d299204381623725", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index da248539..2194411d 100644 --- a/flake.nix +++ b/flake.nix @@ -17,14 +17,22 @@ stylix.url = "github:danth/stylix"; ags.url = "github:Aylur/ags"; matugen.url = "github:InioX/matugen?ref=v2.2.0"; + xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; + + # git+ssh://git@git.example.com/User/repo.git + # fontflake.url = "git+ssh://git@github.com/redyf/font-flake.git"; + + # liga-martian-mono = { + # url = "github:redyf/LigaMartianMono"; + # flake = false; + # }; # SFMono w/ patches - sf-mono-liga-src = { - url = "github:shaunsingh/SFMono-Nerd-Font-Ligaturized"; - flake = false; - }; + # sf-mono-liga-src = { + # url = "github:shaunsingh/SFMono-Nerd-Font-Ligaturized"; + # flake = false; + # }; - # git+ssh://git@git.example.com/User/repo.git # berkeley = { # url = "git+ssh://git@github.com/redyf/berkeley.git"; # flake = false; diff --git a/home/redyf/apps/misc/default.nix b/home/redyf/apps/misc/default.nix index fd0b044f..92a33eaf 100644 --- a/home/redyf/apps/misc/default.nix +++ b/home/redyf/apps/misc/default.nix @@ -5,9 +5,6 @@ # ani-cli # A cli tool to browse and play anime # mangal # A fancy CLI app written in Go which scrapes, downloads and packs manga into different formats - # Cloud - awscli2 - # Gaming # gnutls # minecraft @@ -22,9 +19,9 @@ ollama playerctl # spotify + # brave # Rice - # mako bemenu # cmatrix nitrogen # Wallpaper utility for X11 diff --git a/home/redyf/apps/obs/default.nix b/home/redyf/apps/obs/default.nix index cb40a0bc..6df5fca1 100644 --- a/home/redyf/apps/obs/default.nix +++ b/home/redyf/apps/obs/default.nix @@ -1,8 +1,4 @@ -{ - pkgs, - inputs, - ... -}: { +{pkgs, ...}: { programs.obs-studio = { enable = true; plugins = with pkgs.obs-studio-plugins; [ diff --git a/home/redyf/cli-apps/starship/default.nix b/home/redyf/cli-apps/starship/default.nix index af42d3d7..7d07078b 100644 --- a/home/redyf/cli-apps/starship/default.nix +++ b/home/redyf/cli-apps/starship/default.nix @@ -198,7 +198,7 @@ owner = "catppuccin"; repo = "starship"; rev = "HEAD"; - sha256 = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0="; + sha256 = "sha256-KzXO4dqpufxTew064ZLp3zKIXBwbF8Bi+I0Xa63j/lI="; } + /palettes/${flavour}.toml)); }; diff --git a/home/redyf/cli-apps/tmux/default.nix b/home/redyf/cli-apps/tmux/default.nix index f797c557..c093160b 100644 --- a/home/redyf/cli-apps/tmux/default.nix +++ b/home/redyf/cli-apps/tmux/default.nix @@ -47,15 +47,15 @@ in { sensible tmux-fzf vim-tmux-navigator - net-speed + # net-speed # { # plugin = tokyo-night; # extraConfig = builtins.readFile ./tokyo-night-tmux.conf; # } - # { - # plugin = power-theme; - # extraConfig = builtins.readFile ./power-theme.conf; - # } + { + plugin = power-theme; + extraConfig = builtins.readFile ./power-theme.conf; + } # { # plugin = catppuccin; # extraConfig = builtins.readFile ./catppuccin.conf; @@ -64,10 +64,10 @@ in { # plugin = catppuccin-tmux; # extraConfig = builtins.readFile ./catppuccin-custom.conf; # } - { - plugin = rose-pine; - extraConfig = builtins.readFile ./rose-pine.conf; - } + # { + # plugin = rose-pine; + # extraConfig = builtins.readFile ./rose-pine.conf; + # } ]; extraConfig = '' #-------------------------------------------------------------------------- diff --git a/home/redyf/cli-apps/tmux/power-theme.conf b/home/redyf/cli-apps/tmux/power-theme.conf index ea004d95..4de09013 100644 --- a/home/redyf/cli-apps/tmux/power-theme.conf +++ b/home/redyf/cli-apps/tmux/power-theme.conf @@ -9,7 +9,7 @@ #set -g @tmux_power_theme "default" #You can define your favourite main color if you don"t like any of above. -set -g @tmux_power_theme "#7aa2f2" +set -g @tmux_power_theme "#FF7EB6" #You can change the date and time formats using strftime: set -g @tmux_power_date_format "%F" diff --git a/home/redyf/desktop/addons/ags/config/lib/init.ts b/home/redyf/desktop/addons/ags/config/lib/init.ts index e19385f6..cce6c17e 100644 --- a/home/redyf/desktop/addons/ags/config/lib/init.ts +++ b/home/redyf/desktop/addons/ags/config/lib/init.ts @@ -12,7 +12,7 @@ export default function init() { matugen(); lowBattery(); notifications(); - // hyprland(); + hyprland(); } catch (error) { logError(error); } diff --git a/home/redyf/home.nix b/home/redyf/home.nix index 648aaf1c..4ebc9f55 100644 --- a/home/redyf/home.nix +++ b/home/redyf/home.nix @@ -1,4 +1,8 @@ -{inputs, ...}: { +{ + inputs, + pkgs, + ... +}: { home = { username = "redyf"; homeDirectory = "/home/redyf"; @@ -50,6 +54,17 @@ cp -R $src/*.ttf $out/share/fonts/opentype/ ''; }; + + berkeley = prev.stdenvNoCC.mkDerivation { + pname = "berkeley-mono"; + version = "dev"; + src = berkeley; + dontConfigure = true; + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp -R $src/*.otf $out/share/fonts/opentype/ + ''; + }; } ) ]; diff --git a/home/redyf/system/boot/bios/default.nix b/home/redyf/system/boot/bios/default.nix index ce024590..1bbbdde1 100644 --- a/home/redyf/system/boot/bios/default.nix +++ b/home/redyf/system/boot/bios/default.nix @@ -6,6 +6,7 @@ boot = { kernelModules = ["v4l2loopback"]; # Autostart kernel modules on boot extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; # loopback module to make OBS virtual camera work + kernelParams = ["nvidia.NVreg_PreserveVideoMemoryAllocations=1"]; supportedFilesystems = ["ntfs"]; loader = { timeout = 10; @@ -18,7 +19,7 @@ device = "nodev"; efiSupport = true; useOSProber = true; - configurationLimit = 8; + configurationLimit = 5; theme = pkgs.fetchFromGitHub { diff --git a/hosts/redyf/9ovcXG0Wo4P7FQPe.jpg b/hosts/redyf/9ovcXG0Wo4P7FQPe.jpg new file mode 100644 index 00000000..0bb7ea3c Binary files /dev/null and b/hosts/redyf/9ovcXG0Wo4P7FQPe.jpg differ diff --git a/hosts/redyf/configuration.nix b/hosts/redyf/configuration.nix index 09b8524b..35ff55d2 100644 --- a/hosts/redyf/configuration.nix +++ b/hosts/redyf/configuration.nix @@ -4,7 +4,7 @@ config, ... }: let - theme = "rose-pine-moon"; + theme = "oxocarbon-dark"; in { imports = [ # Include the results of the hardware scan. @@ -77,7 +77,7 @@ in { sessionVariables = { NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland WLR_NO_HARDWARE_CURSORS = "1"; # Fix cursor rendering issue on wlr nvidia. - DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox"; # Set default browser + DEFAULT_BROWSER = "${pkgs.brave}/bin/brave"; # Set default browser }; shellAliases = {nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings";}; }; @@ -144,13 +144,14 @@ in { }; stylix = { + enable = true; autoEnable = true; - image = ./lain05.jpg; + image = ./9ovcXG0Wo4P7FQPe.jpg; base16Scheme = "${pkgs.base16-schemes}/share/themes/${theme}.yaml"; fonts = { monospace = { - package = with pkgs; nerdfonts.override {fonts = ["FiraCode"];}; - name = "FiraCode Nerd Font"; + package = with pkgs; nerdfonts.override {fonts = ["MartianMono"];}; + name = "MartianMono Nerd Font"; }; sansSerif = { package = pkgs.dejavu_fonts; @@ -162,7 +163,7 @@ in { }; sizes = { applications = 10; - terminal = 14; + terminal = 12; desktop = 10; popups = 11; }; @@ -239,7 +240,6 @@ in { nixpkgs = { config = { allowUnfree = true; - allowBroken = true; }; }; @@ -247,8 +247,10 @@ in { services = { pipewire = { enable = true; - alsa.enable = true; - alsa.support32Bit = true; + alsa = { + enable = true; + support32Bit = true; + }; wireplumber.enable = true; jack.enable = false; pulse.enable = true; @@ -320,7 +322,7 @@ in { environment.systemPackages = with pkgs; [ git docker-compose - xdg-desktop-portal-hyprland + inputs.xdg-portal-hyprland.packages.${system}.xdg-desktop-portal-hyprland ]; system.stateVersion = "22.11"; # Did you read the comment? diff --git a/hosts/redyf/lain05.jpg b/hosts/redyf/lain05.jpg deleted file mode 100644 index c5f73dfc..00000000 Binary files a/hosts/redyf/lain05.jpg and /dev/null differ diff --git a/pkgs/artixlauncher.nix b/pkgs/artixlauncher.nix index d8c96d30..b02a4324 100644 --- a/pkgs/artixlauncher.nix +++ b/pkgs/artixlauncher.nix @@ -24,7 +24,7 @@ in source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --use-gl=desktop}}" install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop