diff --git a/flake.lock b/flake.lock index 4ab98d0..8a5346b 100644 --- a/flake.lock +++ b/flake.lock @@ -76,16 +76,15 @@ }, "ayugram-desktop": { "inputs": { - "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "tg_owt": "tg_owt" }, "locked": { - "lastModified": 1774752206, - "narHash": "sha256-w6s3GVZ/nwzxo2SxOOY8g/puwvWUM7FTUv083nwTUMI=", + "lastModified": 1778989361, + "narHash": "sha256-MZU3a4Z7BNcr5WOYeuPDcymTNe1h/w3Ibj50bI8S0P4=", "owner": "ayugram-port", "repo": "ayugram-desktop", - "rev": "3fe5de26254af8db7bee47ea25d4ce53a1864f7d", + "rev": "d3d691473767f184b5489066926bc8a3819b352e", "type": "github" }, "original": { @@ -133,11 +132,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1776754714, + "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", "type": "github" }, "original": { @@ -166,11 +165,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1776136500, + "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", "type": "github" }, "original": { @@ -195,41 +194,7 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -237,11 +202,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -302,52 +267,7 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "ayugram-desktop", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1774104215, - "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "f799ae951fde0627157f40aec28dec27b22076d0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { - "inputs": { - "nixpkgs": [ - "ayugram-desktop", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -372,20 +292,18 @@ "gnome-shell": { "flake": false, "locked": { - "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", "repo": "gnome-shell", - "type": "gitlab" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" } }, "home-manager": { @@ -395,11 +313,11 @@ ] }, "locked": { - "lastModified": 1775223910, - "narHash": "sha256-QRdehpSKTttlZe0oY2n5OCfZeCMrHkKNlWF1LJzO9tY=", + "lastModified": 1779336838, + "narHash": "sha256-n1+l78hJRABp4cQHKeD0BVByT0vZLPqd09Tvoq8Q+d8=", "owner": "nix-community", "repo": "home-manager", - "rev": "f68887a4c11e662b0eb0323d34b3fb9506226719", + "rev": "928d72376949e222ea4f07b44828a55b0136422e", "type": "github" }, "original": { @@ -560,11 +478,11 @@ ] }, "locked": { - "lastModified": 1771865848, - "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", + "lastModified": 1779209205, + "narHash": "sha256-asc7NpeB8vD66gvZeYcQkaWOs2X6Jgd29vBtP17vjxo=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", + "rev": "1cb37fad68dff5f5840010c314fed5809b4ee66f", "type": "github" }, "original": { @@ -774,21 +692,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-pinned": { "locked": { "lastModified": 1764517877, @@ -807,11 +710,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1775002709, - "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", + "lastModified": 1779102034, + "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", + "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433", "type": "github" }, "original": { @@ -823,11 +726,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -855,11 +758,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1779357205, + "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", "type": "github" }, "original": { @@ -871,11 +774,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1774610258, - "narHash": "sha256-HaThtroVD9wRdx7KQk0B75JmFcXlMUoEdDFNOMOlsOs=", + "lastModified": 1775888245, + "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "832efc09b4caf6b4569fbf9dc01bec3082a00611", + "rev": "13043924aaa7375ce482ebe2494338e058282925", "type": "github" }, "original": { @@ -887,11 +790,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -903,11 +806,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1772419343, - "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=", + "lastModified": 1776329215, + "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9", + "rev": "b86751bc4085f48661017fa226dee99fab6c651b", "type": "github" }, "original": { @@ -919,11 +822,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "lastModified": 1779357205, + "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", "type": "github" }, "original": { @@ -945,11 +848,11 @@ ] }, "locked": { - "lastModified": 1767810917, - "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", + "lastModified": 1777598946, + "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=", "owner": "nix-community", "repo": "NUR", - "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", + "rev": "5d55af01c0f86be583931fe99207fc56c14134b3", "type": "github" }, "original": { @@ -960,8 +863,8 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore_2", + "flake-compat": "flake-compat", + "gitignore": "gitignore", "nixpkgs": [ "hyprland", "nixpkgs" @@ -995,17 +898,18 @@ "sops-nix": "sops-nix", "stylix": "stylix", "yazi": "yazi", + "yazi-plugins": "yazi-plugins", "zapret-discord-youtube": "zapret-discord-youtube" } }, "russia-blocked-geoip": { "flake": false, "locked": { - "lastModified": 1775231077, - "narHash": "sha256-yNnyYAntGSexytpx6OMIzFSi2kiHGNVSKXcTKmenS1M=", + "lastModified": 1779469939, + "narHash": "sha256-YdWNJ40jDJjvhcHithHnR3h2X7fU40D1gNhs8nPJIfI=", "owner": "runetfreedom", "repo": "russia-blocked-geoip", - "rev": "cff6b3c1d46a80005aa773fdf27f60237a0b872d", + "rev": "22f8e93849ced99049b9c14700184d2c1c768ca7", "type": "github" }, "original": { @@ -1023,11 +927,11 @@ ] }, "locked": { - "lastModified": 1772420823, - "narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=", + "lastModified": 1776741231, + "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c", + "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b", "type": "github" }, "original": { @@ -1041,11 +945,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1775188331, - "narHash": "sha256-/0BoSi0Dg0ON7IW0oscM12WSPBaMSCn36XTt0lHZoy8=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8f093d0d2f08f37317778bd94db5951d6cce6c46", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -1061,23 +965,22 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "gnome-shell": "gnome-shell", "nixpkgs": "nixpkgs_6", "nur": "nur", "systems": "systems_2", - "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1774897726, - "narHash": "sha256-k/H2/oyex6GEC6uYXYetrboFQeTmX1Ouwv/zaW7b/Z0=", + "lastModified": 1779378391, + "narHash": "sha256-IsDb9erotvx9npI94UDosvMeYQK17p7/vmU2v9batrY=", "owner": "danth", "repo": "stylix", - "rev": "9b4a5eb409ceac2dd6ad495c7988e189a418cd30", + "rev": "c1456cc4ba3c9485e7b4158c909eeca5a752cd59", "type": "github" }, "original": { @@ -1146,20 +1049,24 @@ "type": "github" } }, - "tinted-foot": { - "flake": false, + "tg_owt": { + "inputs": { + "nixpkgs": [ + "ayugram-desktop", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "lastModified": 1778847431, + "narHash": "sha256-D7N+DQLcUFYANMo+N/odsVEwc263fFMlnMek+LaLBdg=", + "owner": "ndfined-crp", + "repo": "tg_owt", + "rev": "1cc099e066c910e9cb3180777ce03f3d72cbfa27", "type": "github" }, "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "owner": "ndfined-crp", + "repo": "tg_owt", "type": "github" } }, @@ -1182,11 +1089,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767710407, - "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", + "lastModified": 1777041405, + "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", + "rev": "5f868b3a338b6904c47f3833b9c411be641983a8", "type": "github" }, "original": { @@ -1198,11 +1105,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1777169200, + "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac", "type": "github" }, "original": { @@ -1214,11 +1121,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1777463218, + "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae", "type": "github" }, "original": { @@ -1275,11 +1182,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1775220334, - "narHash": "sha256-IOF5iEoYyx9rMGh5lGH53yaHkaqEFX7P0VPSXzsXDmM=", + "lastModified": 1779447379, + "narHash": "sha256-BkXaN//OJG40jVTRCQrp+hgu+qbl4jqT1HSEU+px86s=", "owner": "sxyazi", "repo": "yazi", - "rev": "0cedbd9c7bbc44b23d54306b3effa3fa68eacdd8", + "rev": "5d643ee01af13743d4643e83903afee56b777124", "type": "github" }, "original": { @@ -1288,6 +1195,22 @@ "type": "github" } }, + "yazi-plugins": { + "flake": false, + "locked": { + "lastModified": 1778691457, + "narHash": "sha256-cZlnrlgv8+SFeNgIW69q//i/apcpvAv41q5W8bJwVaI=", + "owner": "yazi-rs", + "repo": "plugins", + "rev": "5d5c4803dd12bab4e4f19d606f8db0c871e6bec5", + "type": "github" + }, + "original": { + "owner": "yazi-rs", + "repo": "plugins", + "type": "github" + } + }, "zapret-discord-youtube": { "inputs": { "flake-utils": "flake-utils_2", @@ -1295,11 +1218,11 @@ "zapret-flowseal": "zapret-flowseal" }, "locked": { - "lastModified": 1777795990, - "narHash": "sha256-ln0P3BrWm8ScrwEhSxjLYPTiWWgsUyLospEj0yqRT6Y=", + "lastModified": 1779467420, + "narHash": "sha256-lVYz1nHWfRhfs9KW0YGkfdEtOFxZluUaBQaZLdbEidw=", "owner": "kartavkun", "repo": "zapret-discord-youtube", - "rev": "0d8c5524ed50f1ff2e4d805ee8a976c4b907bd37", + "rev": "7f1a8bec4fbec384c740846f28922987259f3bff", "type": "github" }, "original": { @@ -1311,11 +1234,11 @@ "zapret-flowseal": { "flake": false, "locked": { - "lastModified": 1778422964, - "narHash": "sha256-1rjA0QV2X7XVS+SFAKCZXOQKNYdDjjXwgGEiAKgRN6U=", + "lastModified": 1778835707, + "narHash": "sha256-VLs4i0d1uJ9gVs7NhfZBPz2cs4LUcifJvIZDi4dM7ss=", "owner": "Flowseal", "repo": "zapret-discord-youtube", - "rev": "459c4c2a2ef01dcab98811de448d19bda0678617", + "rev": "197dafcaa3a05ab799df8b17865380d14c78ecb9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4546df5..4cf1dc1 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,12 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; sops-nix.url = "github:Mic92/sops-nix"; stylix.url = "github:danth/stylix"; + yazi.url = "github:sxyazi/yazi"; + yazi-plugins = { + url = "github:yazi-rs/plugins"; + flake = false; + }; hyprland.url = "github:hyprwm/Hyprland/v0.54.2-b"; hyprland-plugins = { diff --git a/modules/user/hyprland.nix b/modules/user/hyprland.nix index 9e96320..0084c66 100644 --- a/modules/user/hyprland.nix +++ b/modules/user/hyprland.nix @@ -26,10 +26,11 @@ ''; in { enable = true; + configType = "hyprlang"; xwayland.enable = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; - plugins = with inputs.hyprland-plugins.packages.${pkgs.system}; [ + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + plugins = with inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}; [ # hyprbars # Version mismatch ]; @@ -123,7 +124,6 @@ "$mainMod, E, exec, ghostty -e sh -c yazi" "$mainMod, F, togglefloating," "$mainMod, D, exec, fuzzel" - "$mainMod, P, pseudo, # dwindle" "$mainMod, J, layoutmsg, togglesplit, # dwindle" # Move focus with mainMod + arrow keys diff --git a/modules/user/yazi.nix b/modules/user/yazi.nix index 4c15157..543a35e 100644 --- a/modules/user/yazi.nix +++ b/modules/user/yazi.nix @@ -25,7 +25,7 @@ }; plugin = { preloaders = [ - { name = "*.crdownload"; run = "noop"; } + { url = "*.crdownload"; run = "noop"; } ]; prepend_previewers = [ @@ -37,28 +37,51 @@ ]; prepend_fetchers = [ - { id = "git"; mime = "*"; run = "git"; } + { group = "git"; url = "*"; run = "git"; } ]; }; }; - plugins = with pkgs.yaziPlugins; { + plugins = let + yaziPlugin = name: pkgs.stdenvNoCC.mkDerivation { + pname = "${name}.yazi"; + version = "unstable"; + src = inputs.yazi-plugins; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r ${name}.yazi/* $out/ + rm -f $out/LICENSE + cp LICENSE $out/LICENSE + runHook postInstall + ''; + }; + in with pkgs.yaziPlugins; { inherit chmod ouch - full-border - starship mount - git toggle-pane - ; + ; + + full-border = { + package = yaziPlugin "full-border"; + setup = true; + }; + + starship = { + package = starship; + setup = true; + }; + + git = { + package = git; + setup = true; + }; }; initLua = '' - require("git"):setup() - require("full-border"):setup() - require("starship"):setup() - Status:children_add(function() local h = cx.active.current.hovered if not h or ya.target_family() ~= "unix" then @@ -83,7 +106,7 @@ } { on = "Y"; - run = ''shell -- for path in "$@"; do echo "file://$path"; done | wl-copy -t text/uri-list''; + run = ''shell -- for path in %s; do echo "file://$path"; done | wl-copy -t text/uri-list''; desc = "Copy files into system clipboard"; } { @@ -98,7 +121,7 @@ } { on = [ "" ]; - run = "shell '${lib.getExe pkgs.dragon-drop} -x -i -T %h'"; + run = "shell '${lib.getExe pkgs.dragon-drop} -x -A -i -T %s'"; } { on = [ "g" "" ]; diff --git a/user/common.nix b/user/common.nix index d42c0ae..dc5c60f 100644 --- a/user/common.nix +++ b/user/common.nix @@ -52,7 +52,7 @@ services.greetd = let tuigreet = lib.getExe pkgs.tuigreet; - session = lib.getExe' inputs.hyprland.packages.${pkgs.system}.default "start-hyprland"; + session = lib.getExe' inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default "start-hyprland"; in { enable = true; settings = { diff --git a/user/kirill/modules/hyprland.nix b/user/kirill/modules/hyprland.nix index 954805c..f2da0ed 100644 --- a/user/kirill/modules/hyprland.nix +++ b/user/kirill/modules/hyprland.nix @@ -60,7 +60,6 @@ }; dwindle = { - pseudotile = true; smart_split = true; };