diff --git a/flake.lock b/flake.lock index 924d7a6..00c399c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,32 +1,10 @@ { "nodes": { - "agenix": { - "inputs": { - "nixpkgs": [ - "fufexan", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1652712410, - "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=", - "owner": "ryantm", - "repo": "agenix", - "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, "alejandra": { "inputs": { "fenix": "fenix", "flakeCompat": "flakeCompat", "nixpkgs": [ - "fufexan", "webcord", "dream2nix", "nixpkgs" @@ -46,46 +24,6 @@ "type": "github" } }, - "alejandra_2": { - "inputs": { - "fenix": "fenix_2", - "flakeCompat": "flakeCompat_2", - "nixpkgs": [ - "webcord", - "dream2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658427149, - "narHash": "sha256-ToD/1z/q5VHsLMrS2h96vjJoLho59eNRtknOUd19ey8=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "f5a22afd2adfb249b4e68e0b33aa1f0fb73fb1be", - "type": "github" - }, - "original": { - "owner": "kamadorueda", - "repo": "alejandra", - "type": "github" - } - }, - "base16-schemes": { - "flake": false, - "locked": { - "lastModified": 1654895891, - "narHash": "sha256-xYYmZkHnyLCUBAkqkZ7v1Lc5m39857MukQLMRtGuvdk=", - "owner": "base16-project", - "repo": "base16-schemes", - "rev": "7c247f734eac7f04518c6e28d098635ee8dcabf5", - "type": "github" - }, - "original": { - "owner": "base16-project", - "repo": "base16-schemes", - "type": "github" - } - }, "bernbot": { "inputs": { "nci": "nci", @@ -181,64 +119,6 @@ "type": "github" } }, - "crane_4": { - "flake": false, - "locked": { - "lastModified": 1654444508, - "narHash": "sha256-4OBvQ4V7jyt7afs6iKUvRzJ1u/9eYnKzVQbeQdiamuY=", - "owner": "ipetkov", - "repo": "crane", - "rev": "db5482bf225acc3160899124a1df5a617cfa27b5", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_5": { - "flake": false, - "locked": { - "lastModified": 1654444508, - "narHash": "sha256-4OBvQ4V7jyt7afs6iKUvRzJ1u/9eYnKzVQbeQdiamuY=", - "owner": "ipetkov", - "repo": "crane", - "rev": "db5482bf225acc3160899124a1df5a617cfa27b5", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "fufexan", - "nixpkgs" - ], - "utils": [ - "fufexan", - "fu" - ] - }, - "locked": { - "lastModified": 1659725433, - "narHash": "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "41f15759dd8b638e7b4f299730d94d5aa46ab7eb", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, "devshell": { "flake": false, "locked": { @@ -256,16 +136,13 @@ } }, "devshell_2": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_2" - }, + "flake": false, "locked": { - "lastModified": 1660811669, - "narHash": "sha256-V6lmsaLNFz41myppL0yxglta92ijkSvpZ+XVygAh+bU=", + "lastModified": 1655976588, + "narHash": "sha256-VreHyH6ITkf/1EX/8h15UqhddJnUleb0HgbC3gMkAEQ=", "owner": "numtide", "repo": "devshell", - "rev": "c2feacb46ee69949124c835419861143c4016fb5", + "rev": "899ca4629020592a13a46783587f6e674179d1db", "type": "github" }, "original": { @@ -275,22 +152,6 @@ } }, "devshell_3": { - "flake": false, - "locked": { - "lastModified": 1655976588, - "narHash": "sha256-VreHyH6ITkf/1EX/8h15UqhddJnUleb0HgbC3gMkAEQ=", - "owner": "numtide", - "repo": "devshell", - "rev": "899ca4629020592a13a46783587f6e674179d1db", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_4": { "flake": false, "locked": { "lastModified": 1653917170, @@ -306,86 +167,6 @@ "type": "github" } }, - "devshell_5": { - "flake": false, - "locked": { - "lastModified": 1655976588, - "narHash": "sha256-VreHyH6ITkf/1EX/8h15UqhddJnUleb0HgbC3gMkAEQ=", - "owner": "numtide", - "repo": "devshell", - "rev": "899ca4629020592a13a46783587f6e674179d1db", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_6": { - "flake": false, - "locked": { - "lastModified": 1653917170, - "narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=", - "owner": "numtide", - "repo": "devshell", - "rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "discocss": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1657375072, - "narHash": "sha256-kaRGVoiJJOAAvqlO++1yNexJHCBtCK3ROkAtAAZKt2s=", - "owner": "fufexan", - "repo": "discocss", - "rev": "ca08c085637061366ed41c6f282d086e24dbf2ec", - "type": "github" - }, - "original": { - "owner": "fufexan", - "ref": "flake", - "repo": "discocss", - "type": "github" - } - }, - "discocss_2": { - "inputs": { - "flake-utils": [ - "fufexan", - "fu" - ], - "nixpkgs": [ - "fufexan", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1657375072, - "narHash": "sha256-kaRGVoiJJOAAvqlO++1yNexJHCBtCK3ROkAtAAZKt2s=", - "owner": "fufexan", - "repo": "discocss", - "rev": "ca08c085637061366ed41c6f282d086e24dbf2ec", - "type": "github" - }, - "original": { - "owner": "fufexan", - "ref": "flake", - "repo": "discocss", - "type": "github" - } - }, "dream2nix": { "inputs": { "alejandra": [ @@ -452,56 +233,47 @@ "dream2nix_2": { "inputs": { "alejandra": [ - "fufexan", "helix", "nixCargoIntegration", "nixpkgs" ], "crane": "crane_2", "devshell": [ - "fufexan", "helix", "nixCargoIntegration", "devshell" ], "flake-utils-pre-commit": [ - "fufexan", "helix", "nixCargoIntegration", "nixpkgs" ], "gomod2nix": [ - "fufexan", "helix", "nixCargoIntegration", "nixpkgs" ], "mach-nix": [ - "fufexan", "helix", "nixCargoIntegration", "nixpkgs" ], "nixpkgs": [ - "fufexan", "helix", "nixCargoIntegration", "nixpkgs" ], "node2nix": [ - "fufexan", "helix", "nixCargoIntegration", "nixpkgs" ], "poetry2nix": [ - "fufexan", "helix", "nixCargoIntegration", "nixpkgs" ], "pre-commit-hooks": [ - "fufexan", "helix", "nixCargoIntegration", "nixpkgs" @@ -525,12 +297,11 @@ "inputs": { "alejandra": "alejandra", "crane": "crane_3", - "devshell": "devshell_4", + "devshell": "devshell_3", "flake-utils-pre-commit": "flake-utils-pre-commit", "gomod2nix": "gomod2nix", "mach-nix": "mach-nix", "nixpkgs": [ - "fufexan", "webcord", "nixpkgs" ], @@ -538,11 +309,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1660051305, - "narHash": "sha256-74Io9RB1VEZyVqSnNfG0VfxxdOyiY/CkSDE1nY4gBRc=", + "lastModified": 1662507674, + "narHash": "sha256-vnXfje4pfTqDEqI837GCT+hNKqzfVwPen++gnLVO9F0=", "owner": "nix-community", "repo": "dream2nix", - "rev": "2fe7790152d4b18fc60a8194459959fc7e4a2e60", + "rev": "5ba9061857e3e265538c9785bb56bda2bb8f9bca", "type": "github" }, "original": { @@ -551,99 +322,6 @@ "type": "github" } }, - "dream2nix_4": { - "inputs": { - "alejandra": [ - "helix", - "nixCargoIntegration", - "nixpkgs" - ], - "crane": "crane_4", - "devshell": [ - "helix", - "nixCargoIntegration", - "devshell" - ], - "flake-utils-pre-commit": [ - "helix", - "nixCargoIntegration", - "nixpkgs" - ], - "gomod2nix": [ - "helix", - "nixCargoIntegration", - "nixpkgs" - ], - "mach-nix": [ - "helix", - "nixCargoIntegration", - "nixpkgs" - ], - "nixpkgs": [ - "helix", - "nixCargoIntegration", - "nixpkgs" - ], - "node2nix": [ - "helix", - "nixCargoIntegration", - "nixpkgs" - ], - "poetry2nix": [ - "helix", - "nixCargoIntegration", - "nixpkgs" - ], - "pre-commit-hooks": [ - "helix", - "nixCargoIntegration", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1655975833, - "narHash": "sha256-g8sdfuglIZ24oWVbntVzniNTJW+Z3n9DNL9w9Tt+UCE=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "4e75e665ec3a1cddae5266bed0dd72fce0b74a23", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, - "dream2nix_5": { - "inputs": { - "alejandra": "alejandra_2", - "crane": "crane_5", - "devshell": "devshell_6", - "flake-utils-pre-commit": "flake-utils-pre-commit_2", - "gomod2nix": "gomod2nix_2", - "mach-nix": "mach-nix_2", - "nixpkgs": [ - "webcord", - "nixpkgs" - ], - "poetry2nix": "poetry2nix_2", - "pre-commit-hooks": "pre-commit-hooks_2" - }, - "locked": { - "lastModified": 1661765532, - "narHash": "sha256-TW2/CeSuoYaBCTsSixGbF0+NncAtDZbmSXx5RPBSDT8=", - "owner": "fufexan", - "repo": "dream2nix", - "rev": "a0e57d33511c53a9195c4764c5cb7736b4d4893e", - "type": "github" - }, - "original": { - "owner": "fufexan", - "ref": "electron", - "repo": "dream2nix", - "type": "github" - } - }, "ema": { "flake": false, "locked": { @@ -683,36 +361,9 @@ "type": "github" } }, - "eww": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "fufexan", - "nixpkgs" - ], - "rust-overlay": [ - "fufexan", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1661603008, - "narHash": "sha256-bTN8kS+OCrVCAc8BOppy4lbIEehB3I+QCsbSKLgAE6k=", - "owner": "elkowar", - "repo": "eww", - "rev": "17d91f8a44293721d0d84bd4070002fe3b29edaf", - "type": "github" - }, - "original": { - "owner": "elkowar", - "repo": "eww", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ - "fufexan", "webcord", "dream2nix", "alejandra", @@ -734,62 +385,6 @@ "type": "github" } }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "webcord", - "dream2nix", - "alejandra", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1657607339, - "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", - "owner": "nix-community", - "repo": "fenix", - "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs": [ @@ -843,28 +438,13 @@ "type": "github" } }, - "flake-utils-pre-commit_2": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_2": { "locked": { - "lastModified": 1619345332, - "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "owner": "numtide", "repo": "flake-utils", - "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "type": "github" }, "original": { @@ -874,51 +454,6 @@ } }, "flake-utils_3": { - "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "locked": { - "lastModified": 1637014545, - "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_6": { "locked": { "lastModified": 1656928814, "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", @@ -949,75 +484,6 @@ "type": "github" } }, - "flakeCompat_2": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "fu": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "fufexan": { - "inputs": { - "agenix": "agenix", - "deploy-rs": "deploy-rs", - "devshell": "devshell_2", - "discocss": "discocss_2", - "eww": "eww", - "fu": "fu", - "helix": "helix", - "hm": "hm", - "hyprland": [ - "hyprland" - ], - "hyprland-contrib": "hyprland-contrib", - "kmonad": "kmonad", - "nil": "nil", - "nix-colors": "nix-colors", - "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_4", - "rnix-lsp": "rnix-lsp", - "rust-overlay": "rust-overlay_4", - "spicetify-nix": "spicetify-nix", - "webcord": "webcord" - }, - "locked": { - "lastModified": 1661703165, - "narHash": "sha256-mF5dX7t3HHVEWu+53SU9dvFogC3g4yhvU56p1cTLMxY=", - "owner": "fufexan", - "repo": "dotfiles", - "rev": "5456981b3296ecffb7721905d3b24ca9b55cd512", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "dotfiles", - "type": "github" - } - }, "gomod2nix": { "flake": false, "locked": { @@ -1034,22 +500,6 @@ "type": "github" } }, - "gomod2nix_2": { - "flake": false, - "locked": { - "lastModified": 1627572165, - "narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, "haskell-flake": { "locked": { "lastModified": 1660319056, @@ -1068,32 +518,9 @@ "helix": { "inputs": { "nixCargoIntegration": "nixCargoIntegration", - "nixpkgs": [ - "fufexan", - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay_2" }, - "locked": { - "lastModified": 1661610287, - "narHash": "sha256-q79CLRHvgh2yq0MKD/cTtWdSx+PY9YKT22EFZz5QhnA=", - "owner": "helix-editor", - "repo": "helix", - "rev": "e06678278267a76a1d9e29b36d4734bcb39eabec", - "type": "github" - }, - "original": { - "owner": "helix-editor", - "repo": "helix", - "type": "github" - } - }, - "helix_2": { - "inputs": { - "nixCargoIntegration": "nixCargoIntegration_2", - "nixpkgs": "nixpkgs_6", - "rust-overlay": "rust-overlay_5" - }, "locked": { "lastModified": 1661734840, "narHash": "sha256-gbxNWrPz/SeYcOdDcLYD/v4yPSbdR21iVyv6Djicmq8=", @@ -1108,34 +535,12 @@ "type": "github" } }, - "hm": { - "inputs": { - "nixpkgs": [ - "fufexan", - "nixpkgs" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1661573386, - "narHash": "sha256-pBEg8iY00Af/SAtU2dlmOAv+2x7kScaGlFRDjNoVJO8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "d89bdff445eadff03fe414e9c30486bc8166b72b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "home": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "utils": "utils" }, "locked": { "lastModified": 1661573386, @@ -1154,15 +559,17 @@ }, "hyprland": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "nixpkgs" + ], "wlroots": "wlroots" }, "locked": { - "lastModified": 1661764662, - "narHash": "sha256-iY7p3aL+6cht4WUQ8UgMYHTfMXPQiTXNG+WnAX3WewQ=", + "lastModified": 1662665116, + "narHash": "sha256-AexWK3ALyvvxcqEa8qcfOp9yhwaKd13bG/WSQhwgac0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "6c8ce734fb8e487add1c28efc2f86ff075f8d679", + "rev": "bacfae3084cc66b2b0574d21c43ed5811e34ef86", "type": "github" }, "original": { @@ -1174,16 +581,15 @@ "hyprland-contrib": { "inputs": { "nixpkgs": [ - "fufexan", "nixpkgs" ] }, "locked": { - "lastModified": 1661203638, - "narHash": "sha256-7Ax6zZRmy9SkBtTxlaqdDB9PMzN6C28a4IQ9rrb1nY4=", + "lastModified": 1662152524, + "narHash": "sha256-C/uwnyqn/yd32Cmqhe/efS4dQt3q3jyt3ucoOm6wAwU=", "owner": "hyprwm", "repo": "contrib", - "rev": "f4bef84b28dde65f0ede0b436119d49a697cad05", + "rev": "a1b59c724384b972f3fb7d9483492d723e2da075", "type": "github" }, "original": { @@ -1192,29 +598,6 @@ "type": "github" } }, - "kmonad": { - "inputs": { - "nixpkgs": [ - "fufexan", - "nixpkgs" - ] - }, - "locked": { - "dir": "nix", - "lastModified": 1661059282, - "narHash": "sha256-EDC2Dcn30UsPNfKGFY4c7vCZLtbmS8q7TBqrQmfbsWs=", - "owner": "kmonad", - "repo": "kmonad", - "rev": "296e463fe7761a919a2a3e39599293526ce55454", - "type": "github" - }, - "original": { - "dir": "nix", - "owner": "kmonad", - "repo": "kmonad", - "type": "github" - } - }, "mach-nix": { "flake": false, "locked": { @@ -1230,43 +613,6 @@ "type": "indirect" } }, - "mach-nix_2": { - "flake": false, - "locked": { - "lastModified": 1634711045, - "narHash": "sha256-m5A2Ty88NChLyFhXucECj6+AuiMZPHXNbw+9Kcs7F6Y=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "4433f74a97b94b596fa6cd9b9c0402104aceef5d", - "type": "github" - }, - "original": { - "id": "mach-nix", - "type": "indirect" - } - }, - "naersk": { - "inputs": { - "nixpkgs": [ - "fufexan", - "rnix-lsp", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1659610603, - "narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=", - "owner": "nix-community", - "repo": "naersk", - "rev": "c6a45e4277fa58abd524681466d3450f896dc094", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "nci": { "inputs": { "devshell": "devshell", @@ -1293,12 +639,8 @@ }, "nil": { "inputs": { - "flake-utils": [ - "fufexan", - "fu" - ], + "flake-utils": "flake-utils_3", "nixpkgs": [ - "fufexan", "nixpkgs" ], "rust-overlay": "rust-overlay_3" @@ -1317,98 +659,10 @@ "type": "github" } }, - "nil_2": { - "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_6" - }, - "locked": { - "lastModified": 1660934895, - "narHash": "sha256-BeI/nM6zXKK6YJF36E4OjaBZQ+NFIbEZ+p7WcX21hLA=", - "owner": "oxalica", - "repo": "nil", - "rev": "92c5603498e82bcd61ad5adbacb53d6ae40c3a27", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, - "nix-colors": { - "inputs": { - "base16-schemes": "base16-schemes", - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1661006226, - "narHash": "sha256-OytVjY/W1ASw+N+xrCRaKhcs76ZIcrVRf9xXhOnWzno=", - "owner": "Misterio77", - "repo": "nix-colors", - "rev": "861546e123ef13c480338edbad8c6f2e7baf0777", - "type": "github" - }, - "original": { - "owner": "Misterio77", - "repo": "nix-colors", - "type": "github" - } - }, - "nix-gaming": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1661529565, - "narHash": "sha256-X+SIKjD+2x9eOFYIw7lg+lc22VKCgGYPxuUG7T+sXJc=", - "owner": "fufexan", - "repo": "nix-gaming", - "rev": "7fcf2ff6d369665e5de57791c9b0edfc40ebcb99", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "nix-gaming", - "type": "github" - } - }, "nixCargoIntegration": { "inputs": { - "devshell": "devshell_3", + "devshell": "devshell_2", "dream2nix": "dream2nix_2", - "nixpkgs": [ - "fufexan", - "helix", - "nixpkgs" - ], - "rust-overlay": [ - "fufexan", - "helix", - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1656453541, - "narHash": "sha256-ZCPVnS6zJOZJvIlwU3rKR8MBVm6A3F4/0mA7G1lQ3D0=", - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "rev": "9eb74345b30cd2e536d9dac9d4435d3c475605c7", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "type": "github" - } - }, - "nixCargoIntegration_2": { - "inputs": { - "devshell": "devshell_5", - "dream2nix": "dream2nix_4", "nixpkgs": [ "helix", "nixpkgs" @@ -1495,86 +749,23 @@ "type": "indirect" } }, - "nixpkgs-lib": { + "nixpkgs-wayland": { + "flake": false, "locked": { - "lastModified": 1655599917, - "narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=", + "lastModified": 1662934717, + "narHash": "sha256-rFBRzYt+XxItjqxFtXHG4PzQAG0GGGyq+y8w3Dzn9lk=", "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "5fb55578aa2f1a502d636a8ac71aece57cb730bb", + "repo": "nixpkgs-wayland", + "rev": "9c4eb0b4babfda07d151782fcdc23b6626b376b7", "type": "github" }, "original": { "owner": "nix-community", - "repo": "nixpkgs.lib", + "repo": "nixpkgs-wayland", "type": "github" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1643381941, - "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1656401090, - "narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "16de63fcc54e88b9a106a603038dd5dd2feb21eb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1661353537, - "narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0e304ff0d9db453a4b230e9386418fd974d5804a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1660167503, - "narHash": "sha256-RAjzibSoilQ7+okrwvez59Ho6Nvf0FJm/F6ZJGjTksg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ebcea6302e4b221e79656f7a718f5cb55affde2f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1655624069, "narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=", @@ -1590,23 +781,7 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1660908602, - "narHash": "sha256-SwZ85IPWvC4NxxFhWhRMTJpApSHbY1u4YK2UFWEBWvY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "495b19d5b3e62b4ec7e846bdfb6ef3d9c3b83492", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { + "nixpkgs_3": { "locked": { "lastModified": 1661628722, "narHash": "sha256-oR/7NhG7pPkACToUtaaT6hH+rONE2z5/4NzjoUwEZt8=", @@ -1654,53 +829,7 @@ "type": "github" } }, - "poetry2nix_2": { - "flake": false, - "locked": { - "lastModified": 1632969109, - "narHash": "sha256-jPDclkkiAy5m2gGLBlKgH+lQtbF7tL4XxBrbSzw+Ioc=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "aee8f04296c39d88155e05d25cfc59dfdd41cc77", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "1.21.0", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks": { - "inputs": { - "flake-utils": [ - "fufexan", - "webcord", - "dream2nix", - "flake-utils-pre-commit" - ], - "nixpkgs": [ - "fufexan", - "webcord", - "dream2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646153636, - "narHash": "sha256-AlWHMzK+xJ1mG267FdT8dCq/HvLCA6jwmx2ZUy5O8tY=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "b6bc0b21e1617e2b07d8205e7fae7224036dfa4b", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { "inputs": { "flake-utils": [ "webcord", @@ -1727,48 +856,22 @@ "type": "github" } }, - "rnix-lsp": { - "inputs": { - "naersk": "naersk", - "nixpkgs": [ - "fufexan", - "nixpkgs" - ], - "utils": [ - "fufexan", - "fu" - ] - }, - "locked": { - "lastModified": 1658963292, - "narHash": "sha256-4OIpATLdPQvryyhRQPELeqNYC0n6PCyjD6LCPdwOztc=", - "owner": "nix-community", - "repo": "rnix-lsp", - "rev": "ff18e04551a39ccdab0ff9c83926db3807b23478", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "rnix-lsp", - "type": "github" - } - }, "root": { "inputs": { "bernbot": "bernbot", "blog": "blog", - "discocss": "discocss", - "fufexan": "fufexan", - "helix": "helix_2", + "helix": "helix", "home": "home", "hyprland": "hyprland", - "nil": "nil_2", + "hyprland-contrib": "hyprland-contrib", + "nil": "nil", "nixinate": "nixinate", "nixos-hardware": "nixos-hardware", "nixos-persistence": "nixos-persistence", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_3", + "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", - "webcord": "webcord_3" + "webcord": "webcord" } }, "rust-analyzer-src": { @@ -1788,23 +891,6 @@ "type": "github" } }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1657557289, - "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "caf23f29144b371035b864a1017dbc32573ad56d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "flake": false, "locked": { @@ -1823,9 +909,8 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_2", "nixpkgs": [ - "fufexan", "helix", "nixpkgs" ] @@ -1845,80 +930,6 @@ } }, "rust-overlay_3": { - "inputs": { - "flake-utils": [ - "fufexan", - "nil", - "flake-utils" - ], - "nixpkgs": [ - "fufexan", - "nil", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1659599305, - "narHash": "sha256-htzFq5RffyoKSZxiLfpUq5CyhkQwycsXB5ptale5e78=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "28cedcb8dfea9f1b96b0635cf99fe6bdca163f4e", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_4": { - "inputs": { - "flake-utils": [ - "fufexan", - "fu" - ], - "nixpkgs": [ - "fufexan", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1661655464, - "narHash": "sha256-by9Hb0mNVdiCR7TBvUHIgDb0QIv3znp8VMGh7Bl35VQ=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "0c4c1432353e12b325d1472bea99e364871d2cb3", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_5": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": [ - "helix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1655779671, - "narHash": "sha256-6feeiGa6fb7ZPVHR71uswkmN1701TAJpwYQA8QffmRk=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "8159585609a772b041cce6019d5c21d240709244", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_6": { "inputs": { "flake-utils": [ "nil", @@ -1943,27 +954,6 @@ "type": "github" } }, - "spicetify-nix": { - "inputs": { - "nixpkgs": [ - "fufexan", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1660540848, - "narHash": "sha256-BBJxzxixvJ2NdR2N5we7LBzO7iS4DO+S2vYoNSV6GjM=", - "owner": "the-argus", - "repo": "spicetify-nix", - "rev": "c325a18deb4a65366c92194083e2629b2a473961", - "type": "github" - }, - "original": { - "owner": "the-argus", - "repo": "spicetify-nix", - "type": "github" - } - }, "tailwind-haskell": { "inputs": { "flake-utils": "flake-utils", @@ -2003,33 +993,20 @@ "type": "github" } }, - "utils_2": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "webcord": { "inputs": { "dream2nix": "dream2nix_3", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "nixpkgs" + ], "webcord": "webcord_2" }, "locked": { - "lastModified": 1660242753, - "narHash": "sha256-M9ibcsDzWHp/678lTyxwwgXgdFx2d1YCevoGEIBVnxc=", + "lastModified": 1662387088, + "narHash": "sha256-eB9O9UIkeKHKyCF5oNw3a+wukeaLQMNl4OvJIeR5hRo=", "owner": "fufexan", "repo": "webcord-flake", - "rev": "0892178832a090f0b9ab1a61e20f5d1389cfb23e", + "rev": "6a2a625df8a607c4a42aa921877ad65be73a2eb0", "type": "github" }, "original": { @@ -2039,45 +1016,6 @@ } }, "webcord_2": { - "flake": false, - "locked": { - "lastModified": 1659951368, - "narHash": "sha256-PiEuZVRjufVvQuub7/Vl9gHqlkBkl5jcoxHhLkntqsw=", - "owner": "SpacingBat3", - "repo": "WebCord", - "rev": "a8e64a78d1e3a8c3d5e11893ebb8ba1ed92d7d12", - "type": "github" - }, - "original": { - "owner": "SpacingBat3", - "repo": "WebCord", - "type": "github" - } - }, - "webcord_3": { - "inputs": { - "dream2nix": "dream2nix_5", - "nixpkgs": [ - "nixpkgs" - ], - "webcord": "webcord_4" - }, - "locked": { - "lastModified": 1661882675, - "narHash": "sha256-PRs4UDYrAY6QJGgKohVEN5cgFbfA082RI7UofxmPdC4=", - "owner": "fufexan", - "repo": "webcord-flake", - "rev": "1ae0a05a64799c256575ef57e5311d226ed10e96", - "type": "github" - }, - "original": { - "owner": "fufexan", - "ref": "system-electron", - "repo": "webcord-flake", - "type": "github" - } - }, - "webcord_4": { "flake": false, "locked": { "lastModified": 1661854465, @@ -2097,11 +1035,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1660930713, - "narHash": "sha256-bY7q1NqG/sjCUAWPn/Ne9NCigLlPlH5Lk1WCMqv3rTU=", + "lastModified": 1661882030, + "narHash": "sha256-Kw0MG4rXdTnbndVLLCNwkXDmNszwdQZmm7pwI1R3Kds=", "owner": "wlroots", "repo": "wlroots", - "rev": "7c575922c05e4d5fd9a403c2aa631a54c7531d44", + "rev": "fd0b0276c9ecc159549acff48b932b83ec3b4f12", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index 0cc4aae..260f449 100644 --- a/flake.nix +++ b/flake.nix @@ -14,19 +14,26 @@ nixinate.url = "github:matthewcroughan/nixinate"; nixinate.inputs.nixpkgs.follows = "nixpkgs"; + nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; + nixpkgs-wayland.flake = false; + helix.url = "github:helix-editor/helix"; + hyprland.url = "github:hyprwm/Hyprland"; - fufexan.url = "github:fufexan/dotfiles"; - fufexan.inputs.hyprland.follows = "hyprland"; + hyprland.inputs.nixpkgs.follows = "nixpkgs"; + hyprland-contrib.url = "github:hyprwm/contrib"; + hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs"; + blog.url = "git+https://git.gaze.systems/dusk/website.git"; blog.inputs.nixpkgs.follows = "nixpkgs"; + bernbot.url = "github:yusdacra/bernbot"; bernbot.inputs.nixpkgs.follows = "nixpkgs"; - discocss.url = "github:fufexan/discocss/flake"; - discocss.inputs.nixpkgs.follows = "nixpkgs"; + nil.url = "github:oxalica/nil"; nil.inputs.nixpkgs.follows = "nixpkgs"; - webcord.url = "github:fufexan/webcord-flake/system-electron"; + + webcord.url = "github:fufexan/webcord-flake"; webcord.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/locale/geo.nix b/locale/geo.nix new file mode 100644 index 0000000..95e2e27 --- /dev/null +++ b/locale/geo.nix @@ -0,0 +1,4 @@ +{ + lat = "39.1"; + long = "35.6"; +} diff --git a/pkgs-set/overlays/discord.nix b/pkgs-set/overlays/discord.nix deleted file mode 100644 index e0d271c..0000000 --- a/pkgs-set/overlays/discord.nix +++ /dev/null @@ -1,20 +0,0 @@ -{inputs}: final: prev: { - discord-open-asar = final.callPackage "${inputs.fufexan}/pkgs/discord" { - inherit (prev.discord) pname version src; - - openasar = prev.callPackage "${inputs.nixpkgs}/pkgs/applications/networking/instant-messengers/discord/openasar.nix" {}; - binaryName = "Discord"; - desktopName = "Discord"; - - enableVulkan = false; - extraOptions = [ - "--disable-gpu-memory-buffer-video-frames" - "--enable-accelerated-mjpeg-decode" - "--enable-accelerated-video" - "--enable-gpu-rasterization" - "--enable-native-gpu-memory-buffers" - "--enable-zero-copy" - "--ignore-gpu-blocklist" - ]; - }; -} diff --git a/pkgs-set/overlays/nixpkgs-wayland.nix b/pkgs-set/overlays/nixpkgs-wayland.nix new file mode 100644 index 0000000..3ddd782 --- /dev/null +++ b/pkgs-set/overlays/nixpkgs-wayland.nix @@ -0,0 +1 @@ +{inputs}: (import "${inputs.nixpkgs-wayland}/overlay.nix") diff --git a/pkgs-set/pkgs-to-export.nix b/pkgs-set/pkgs-to-export.nix index 48d7f91..63144d8 100644 --- a/pkgs-set/pkgs-to-export.nix +++ b/pkgs-set/pkgs-to-export.nix @@ -4,6 +4,7 @@ pkgs: ( "fractal-next" "obsidian" "comic-mono" + "chromium" ] pkgs ) diff --git a/pkgs-set/pkgs/fractal-next.nix b/pkgs-set/pkgs/fractal-next.nix index 9338e96..dbac073 100644 --- a/pkgs-set/pkgs/fractal-next.nix +++ b/pkgs-set/pkgs/fractal-next.nix @@ -35,20 +35,20 @@ }: stdenv.mkDerivation rec { pname = "fractal-next"; - version = "1206d4ed12059a298b5d918fd0a77dca034f7084"; + version = "5c70961c"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "fractal"; - rev = "1206d4ed12059a298b5d918fd0a77dca034f7084"; - sha256 = "sha256-ioMgVj85BKvsIjBbTAHFN6k5B/H86GLMTgAXK/5ji/k="; + rev = "5c70961cea34ac92658b59254bc3ef428ca7fa91"; + sha256 = "sha256-Ai26Nwm9ujqxW0NCpxd97NiJWImitl87coS724nv27g="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-gbTljLIYAanXm1D/tNBGNMlaDatXgZDeSY5pA8s5gog="; + sha256 = "sha256-8fgQvlZGbntz2buQ/nCo90Kbel9aeC4kD3uqTdefylg="; }; nativeBuildInputs = [ diff --git a/users/modules/discord/default.nix b/users/modules/discord/default.nix index 98ad4b7..b5216c5 100644 --- a/users/modules/discord/default.nix +++ b/users/modules/discord/default.nix @@ -5,15 +5,6 @@ lib, ... }: { - # imports = [inputs.discocss.hmModule]; - - # programs.discocss = { - # enable = true; - # discord = inputs.fufexan.packages.${pkgs.system}.discord-electron-openasar; - # discordAlias = true; - # css = builtins.readFile ./theme.css; - # }; - home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [ ".config/WebCord" ]; diff --git a/users/modules/hyprland/default.nix b/users/modules/hyprland/default.nix index 4fba735..ed6c7a6 100644 --- a/users/modules/hyprland/default.nix +++ b/users/modules/hyprland/default.nix @@ -5,45 +5,41 @@ }: { imports = [ ../wayland + ../swaylock + ../wlsunset + ./swayidle.nix inputs.hyprland.homeManagerModules.default ]; - home.packages = - [ - (import "${inputs.fufexan}/home/wayland/screenshot.nix" {inherit pkgs;}) - ] - ++ ( - with pkgs; [ - wf-recorder - xorg.xprop - ] - ); + home.packages = with pkgs; [ + wf-recorder + xorg.xprop + inputs.hyprland-contrib.packages.${pkgs.system}.grimblast + light + playerctl + wlogout + ]; wayland.windowManager.hyprland = { enable = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland; extraConfig = let - rofi = "${pkgs.rofi-wayland}/bin/rofi"; - launcher = "${rofi} -show drun"; - term = "${pkgs.wezterm}/bin/wezterm"; + launcher = "rofi -show drun"; + term = "wezterm"; - swaybg = "${pkgs.swaybg}/bin/swaybg"; - light = "${pkgs.light}/bin/light"; - playerctl = "${pkgs.playerctl}/bin/playerctl"; - pulsemixer = "${pkgs.pulsemixer}/bin/pulsemixer"; - wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy"; notify-date = with pkgs; writers.writeBash "notify-date" '' ${libnotify}/bin/notify-send -t 1000 " $(${coreutils}/bin/date +'%H:%M %d/%m/%Y')" ''; in '' # should be configured per-profile - monitor=,preferred,auto,1.6 - workspace=,1 + monitor=eDP-1,preferred,auto,1.6 + monitor=HDMI-A-1,1920x1080@75,auto,1 + workspace=eDP-1,1 + workspace=HDMI-A-1,2 - exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY HYPRLAND_INSTANCE_SIGNATURE - exec-once=systemctl --user start hyprland-session.target - exec-once=${swaybg} -i ~/.config/wallpaper + exec-once=xprop -root -f _XWAYLAND_GLOBAL_OUTPUT_SCALE 32c -set _XWAYLAND_GLOBAL_OUTPUT_SCALE 2 + exec-once=swaybg -i ~/.config/wallpaper input { kb_layout=tr @@ -54,12 +50,10 @@ } } general { - sensitivity=1 main_mod=SUPER gaps_in=5 gaps_out=5 border_size=0 - damage_tracking=full } decoration { rounding=16 @@ -67,12 +61,8 @@ blur_size=3 blur_passes=3 blur_new_optimizations=1 - drop_shadow=1 + drop_shadow=0 shadow_ignore_window=1 - shadow_offset=2 2 - shadow_range=2 - shadow_render_power=1 - col.shadow=0x55000000 } animations { enabled=1 @@ -84,7 +74,18 @@ dwindle { pseudotile=0 # enable pseudotiling on dwindle } + misc { + no_vfr=0 + } + windowrule=float,title:^(Media viewer)$ + windowrule=float,title:^(Picture-in-Picture)$ + windowrule=float,title:^(Firefox — Sharing Indicator)$ + windowrule=move 0 0,title:^(Firefox — Sharing Indicator)$ + + + bind=SUPER,Escape,exec,wlogout -p layer-shell + bind=SUPER,L,exec,swaylock bind=SUPER,RETURN,exec,${term} bind=SUPER,D,exec,${launcher} bind=SUPER,Q,killactive, @@ -93,14 +94,18 @@ bind=SUPER,P,pseudo, bind=SUPER,T,exec,${notify-date} bind=SUPERSHIFT,T,togglefloating, - bind=,XF86AudioPlay,exec,${playerctl} play-pause - bind=,XF86AudioPrev,exec,${playerctl} previous - bind=,XF86AudioNext,exec,${playerctl} next - bind=,XF86AudioRaiseVolume,exec,${pulsemixer} --change-volume +6 - bind=,XF86AudioLowerVolume,exec,${pulsemixer} --change-volume -6 - bind=,XF86AudioMute,exec,${pulsemixer} --toggle-mute - bind=,XF86MonBrightnessUp,exec,${light} -A 5 - bind=,XF86MonBrightnessDown,exec,${light} -U 5 + + bind=,XF86AudioPlay,exec,playerctl play-pause + bind=,XF86AudioPrev,exec,playerctl previous + bind=,XF86AudioNext,exec,playerctl next + + bindle=,XF86AudioRaiseVolume,exec,wpctl set-volume @DEFAULT_AUDIO_SINK@ 6%+ + bindle=,XF86AudioLowerVolume,exec,wpctl set-volume @DEFAULT_AUDIO_SINK@ 6%- + bind=,XF86AudioMute,exec,wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle + bind=,XF86AudioMicMute,exec,wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle + + bind=,XF86MonBrightnessUp,exec,light -A 5 + bind=,XF86MonBrightnessDown,exec,light -U 5 # move focus bind=SUPER,left,movefocus,l @@ -139,21 +144,13 @@ bind=SUPERSHIFT,8,movetoworkspace,8 bind=SUPERSHIFT,9,movetoworkspace,9 - ## screenshot ## - bind=,Print,exec,screenshot area - bind=SUPERSHIFT,R,exec,screenshot area - - # monitor - bind=CTRL,Print,exec,screenshot monitor - bind=SUPERSHIFTCTRL,R,exec,screenshot monitor - - # all-monitors - bind=ALT,Print,exec,screenshot all - bind=SUPERSHIFTALT,R,exec,screenshot all - - # screenrec - bind=ALT,Print,exec,screenshot rec area - bind=SUPERSHIFTALT,R,exec,screenshot rec area + # screenshot + bind=,Print,exec,grimblast --notify copysave area + bind=SUPERSHIFT,R,exec,grimblast --notify copysave area + bind=CTRL,Print,exec,grimblast --notify --cursor copysave output + bind=SUPERSHIFTCTRL,R,exec,grimblast --notify --cursor copysave output + bind=ALT,Print,exec,grimblast --notify --cursor copysave screen + bind=SUPERSHIFTALT,R,exec,grimblast --notify --cursor copysave screen ''; }; } diff --git a/users/modules/hyprland/swayidle.nix b/users/modules/hyprland/swayidle.nix new file mode 100644 index 0000000..b12029e --- /dev/null +++ b/users/modules/hyprland/swayidle.nix @@ -0,0 +1,32 @@ +{ + pkgs, + lib, + ... +}: { + home.packages = with pkgs; [wlopm swayidle]; + services.swayidle = { + enable = true; + events = [ + { + event = "before-sleep"; + command = "swaylock"; + } + { + event = "lock"; + command = "swaylock"; + } + ]; + timeouts = [ + { + timeout = 120; + command = "wlopm --off \*"; + resumeCommand = "wlopm --on \*"; + } + { + timeout = 300; + command = "loginctl lock-session"; + } + ]; + }; + systemd.user.services.swayidle.Install.WantedBy = lib.mkForce ["hyprland-session.target"]; +} diff --git a/users/modules/swaylock/default.nix b/users/modules/swaylock/default.nix new file mode 100644 index 0000000..3a1bab1 --- /dev/null +++ b/users/modules/swaylock/default.nix @@ -0,0 +1,17 @@ +{ + config, + pkgs, + ... +}: { + home.packages = [pkgs.swaylock-effects]; + + programs.swaylock.settings = { + screenshot = true; + ignore-empty-password = true; + clock = true; + effect-scale = "0.5"; + effect-greyscale = true; + effect-blur = "20x3"; + font = config.fonts.settings.name; + }; +} diff --git a/users/modules/wayland/default.nix b/users/modules/wayland/default.nix index 8525016..c14c955 100644 --- a/users/modules/wayland/default.nix +++ b/users/modules/wayland/default.nix @@ -6,12 +6,7 @@ home.sessionVariables = { NIXOS_OZONE_WL = "1"; MOZ_ENABLE_WAYLAND = "1"; - }; - - services = { - gammastep = { - enable = true; - provider = "geoclue2"; - }; + XDG_SESSION_TYPE = "wayland"; + GDK_SCALE = "2"; }; } diff --git a/users/modules/wlsunset/default.nix b/users/modules/wlsunset/default.nix new file mode 100644 index 0000000..6f33702 --- /dev/null +++ b/users/modules/wlsunset/default.nix @@ -0,0 +1,11 @@ +{inputs, ...}: +let + geo = import "${inputs.self}/locale/geo.nix"; +in +{ + services.wlsunset = { + enable = true; + latitude = geo.lat; + longitude = geo.long; + }; +} \ No newline at end of file diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 2a1a393..f6242a5 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -56,14 +56,6 @@ in { seahorse.enable = true; }; services = { - # provide location - geoclue2 = { - enable = true; - appConfig.gammastep = { - isAllowed = true; - isSystem = false; - }; - }; syncthing.folders = { notes = { enable = true; @@ -72,12 +64,18 @@ in { ignorePerms = true; }; }; + gnome.gnome-keyring.enable = true; }; # gnome keyring better fr fr security.pam.services.patriot = { enableGnomeKeyring = true; enableKwallet = false; }; + security.pam.services.swaylock = { + text = '' + auth include login + ''; + }; systemd = { targets.network-online.enable = false; services = { @@ -135,7 +133,6 @@ in { "zsh" "keyrings" "lutris" - "PolyMC" "Terraria" ] ++ mkPaths ".config" [ @@ -178,10 +175,10 @@ in { mupdf xdg_utils rust-analyzer - # polymc cloudflared lutris protontricks + fractal-next ]; }; programs = {