From 6202d69aa0a5ed267aaf5c3f425e5e629246ec45 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sun, 31 Jul 2022 09:44:18 +0300 Subject: [PATCH] a --- flake.lock | 854 ++++++++++++++++++++++++++++- flake.nix | 3 +- pkgs-set/overlays/discord.nix | 1 - pkgs-set/overlays/helix.nix | 2 +- pkgs-set/overlays/hyprland.nix | 2 +- users/modules/hyprland/default.nix | 1 + 6 files changed, 829 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 2195841..61f3d2c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "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", @@ -30,17 +46,13 @@ ] }, "locked": { - "lastModified": 1659159653, - "narHash": "sha256-zWjN3LqgMMaVBM8g0KcDwdpiwbShWHRKWR0XcSVfBBA=", - "owner": "yusdacra", - "repo": "yusdacra.gitlab.io", - "rev": "3f0caa133aa557acc008fc3819203db813092cf2", - "type": "gitlab" + "narHash": "sha256-9vMKixtpbkIB0agk6RMPHOBI+dTYPdxMuL9gpuRyKwU=", + "type": "tarball", + "url": "https://git.gaze.systems/dusk/website/archive/master.zip" }, "original": { - "owner": "yusdacra", - "repo": "yusdacra.gitlab.io", - "type": "gitlab" + "type": "tarball", + "url": "https://git.gaze.systems/dusk/website/archive/master.zip" } }, "crane": { @@ -75,6 +87,48 @@ "type": "github" } }, + "crane_3": { + "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": 1653594315, + "narHash": "sha256-kJ0ENmnQJ4qL2FeYKZba9kvv1KmIuB3NVpBwMeI7AJQ=", + "owner": "serokell", + "repo": "deploy-rs", + "rev": "184349d8149436748986d1bdba087e4149e9c160", + "type": "github" + }, + "original": { + "owner": "serokell", + "repo": "deploy-rs", + "type": "github" + } + }, "devshell": { "flake": false, "locked": { @@ -92,6 +146,25 @@ } }, "devshell_2": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1658746384, + "narHash": "sha256-CCJcoMOcXyZFrV1ag4XMTpAPjLWb4Anbv+ktXFI1ry0=", + "owner": "numtide", + "repo": "devshell", + "rev": "0ffc7937bb5e8141af03d462b468bd071eb18e1b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_3": { "flake": false, "locked": { "lastModified": 1655976588, @@ -107,6 +180,48 @@ "type": "github" } }, + "devshell_4": { + "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" + } + }, + "discocss": { + "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": [ @@ -173,11 +288,83 @@ "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" + ] + }, + "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_3": { + "inputs": { + "alejandra": [ + "helix", + "nixCargoIntegration", + "nixpkgs" + ], + "crane": "crane_3", "devshell": [ "helix", "nixCargoIntegration", @@ -233,7 +420,169 @@ "type": "github" } }, + "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1658833746, + "narHash": "sha256-bm/FXx7lH8xaM1excP4SLexVBdaTKE5tZS8PyuibnsA=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "4d03024af95e8338ccd4d238a46c4bbe01ecdb89", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, + "eww": { + "inputs": { + "fenix": "fenix", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "naersk": [ + "fufexan", + "naersk" + ], + "nixpkgs": [ + "fufexan", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658741308, + "narHash": "sha256-35ao8Xc1mEt8pPs6a0iI2NfKO7Dawq7+ZQ1jS64b1mU=", + "owner": "elkowar", + "repo": "eww", + "rev": "962c06c0ee33e968c60ef7b1682e9d365a72e74f", + "type": "github" + }, + "original": { + "owner": "elkowar", + "repo": "eww", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "fufexan", + "eww", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1635402244, + "narHash": "sha256-4bUSYJDRxAo66UpNkFmEMRIWMdDXBEnq8GB/rG++Y3A=", + "owner": "nix-community", + "repo": "fenix", + "rev": "840f96d1f3257d64c04fe949dfc9c0b4795c04c1", + "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": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { + "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_2": { + "locked": { + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "locked": { + "lastModified": 1634851050, + "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", + "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=", @@ -263,14 +612,46 @@ "type": "github" } }, - "fufexan": { - "flake": false, + "fu": { "locked": { - "lastModified": 1657711492, - "narHash": "sha256-t7WLSMPXWs+TR8/ZWvyoUR5h0nrSWQryNmpS/+00DtM=", + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "fufexan": { + "inputs": { + "deploy-rs": "deploy-rs", + "devshell": "devshell_2", + "discocss": "discocss", + "emacs-overlay": "emacs-overlay", + "eww": "eww", + "fu": "fu", + "helix": "helix", + "hm": "hm", + "hyprland": "hyprland", + "hyprland-contrib": "hyprland-contrib", + "kmonad": "kmonad", + "naersk": "naersk", + "nix-colors": "nix-colors", + "nix-gaming": "nix-gaming", + "nixpkgs": "nixpkgs_4", + "rnix-lsp": "rnix-lsp" + }, + "locked": { + "lastModified": 1659195254, + "narHash": "sha256-+broiZolVYTgduj+r3tN+zo9K0aWkI32eMlHfgnjg6k=", "owner": "fufexan", "repo": "dotfiles", - "rev": "90b4e7452b41aaf18026b5ad46601597e8ec8dcd", + "rev": "c6296680001434b1d1f840b53324d31c5d5a7adc", "type": "github" }, "original": { @@ -283,10 +664,33 @@ "inputs": { "nixCargoIntegration": "nixCargoIntegration", "nixpkgs": [ + "fufexan", "nixpkgs" ], "rust-overlay": "rust-overlay_2" }, + "locked": { + "lastModified": 1658815512, + "narHash": "sha256-q65cN1JuhJOfFve2A8Jyfe+wzgcbHpiNbUPOgwJRpZ8=", + "owner": "helix-editor", + "repo": "helix", + "rev": "3dd2196e4f42b23fd30b4e028b96d5b1862603d6", + "type": "github" + }, + "original": { + "owner": "helix-editor", + "repo": "helix", + "type": "github" + } + }, + "helix_2": { + "inputs": { + "nixCargoIntegration": "nixCargoIntegration_2", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, "locked": { "lastModified": 1659072681, "narHash": "sha256-vvdQHhnJIxrIh8phbJRM/h8GgZBXj7Lc9yK05t52yCg=", @@ -301,12 +705,34 @@ "type": "github" } }, + "hm": { + "inputs": { + "nixpkgs": [ + "fufexan", + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1658751516, + "narHash": "sha256-Y/3dHoTjbvYBtWd+TTBQJUIgDPO9d+Gqt05C5dyR7E4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "dbed4c794d20d51027fc1107f063ec5be027dafc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "home": { "inputs": { "nixpkgs": [ "nixpkgs" ], - "utils": "utils" + "utils": "utils_3" }, "locked": { "lastModified": 1657396086, @@ -335,26 +761,65 @@ ] }, "locked": { - "lastModified": 1659159625, - "narHash": "sha256-TElL1iaIY/xrIX+JYsppKWa510R8aJDXWQJxjpyCVxo=", - "owner": "yusdacra", - "repo": "html.nix", - "rev": "5bca7064e4de141f85b14a2c5262f204ac5f56bd", - "type": "github" + "narHash": "sha256-lQtjjkKu6EOqkT6jJRvzCBBWmOdtLACL//ETRAAxRQI=", + "type": "tarball", + "url": "https://git.gaze.systems/dusk/html.nix/archive/master.zip" }, "original": { - "owner": "yusdacra", - "repo": "html.nix", - "type": "github" + "type": "tarball", + "url": "https://git.gaze.systems/dusk/html.nix/archive/master.zip" } }, "hyprland": { "inputs": { "nixpkgs": [ + "fufexan", "nixpkgs" ], "wlroots": "wlroots" }, + "locked": { + "lastModified": 1659194367, + "narHash": "sha256-pxPBHj2B6EuljO0PekkHlKtWZLdDkjX4zF5sY7Q/lFk=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "59879e0bd1f30771b0dce57c324e1648a3ad1603", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-contrib": { + "inputs": { + "nixpkgs": [ + "fufexan", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1658948680, + "narHash": "sha256-0A2ZKxCXmnkMzlaveS+nKVCntIXrHKHMGZDEqVqlwOk=", + "owner": "hyprwm", + "repo": "contrib", + "rev": "1b3af7422e971507538e692b28877bf58349475a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "contrib", + "type": "github" + } + }, + "hyprland_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "wlroots": "wlroots_2" + }, "locked": { "lastModified": 1657572680, "narHash": "sha256-NOy0iHEnOcL5yAA7fWXni++axbNSFaYDxLeAkmPtZaY=", @@ -369,6 +834,72 @@ "type": "github" } }, + "kmonad": { + "inputs": { + "nixpkgs": [ + "fufexan", + "nixpkgs" + ] + }, + "locked": { + "dir": "nix", + "lastModified": 1657871515, + "narHash": "sha256-+mxd8hpxt7aWtJlhHn6HUNj9CWlvRQrHdFvrZMWU+WY=", + "owner": "kmonad", + "repo": "kmonad", + "rev": "95bb58b7347ebacb4654fb21c798e1cd10331b0d", + "type": "github" + }, + "original": { + "dir": "nix", + "owner": "kmonad", + "repo": "kmonad", + "type": "github" + } + }, + "naersk": { + "inputs": { + "nixpkgs": [ + "fufexan", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1655042882, + "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", + "owner": "nmattia", + "repo": "naersk", + "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", + "type": "github" + }, + "original": { + "owner": "nmattia", + "repo": "naersk", + "type": "github" + } + }, + "naersk_2": { + "inputs": { + "nixpkgs": [ + "fufexan", + "rnix-lsp", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1655042882, + "narHash": "sha256-9BX8Fuez5YJlN7cdPO63InoyBy7dm3VlJkkmTt6fS1A=", + "owner": "nix-community", + "repo": "naersk", + "rev": "cddffb5aa211f50c4b8750adbec0bbbdfb26bb9f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, "nci": { "inputs": { "devshell": "devshell", @@ -393,10 +924,76 @@ "type": "github" } }, + "nix-colors": { + "inputs": { + "base16-schemes": "base16-schemes", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1658761805, + "narHash": "sha256-yPY54xna3ufsrpgk1clhsvI5Q3nNE4WAPUzIr+uEHjQ=", + "owner": "Misterio77", + "repo": "nix-colors", + "rev": "17d4c968ae3b202a71326b59ae89727d1c21f018", + "type": "github" + }, + "original": { + "owner": "Misterio77", + "repo": "nix-colors", + "type": "github" + } + }, + "nix-gaming": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1658662574, + "narHash": "sha256-NX3uQqN8kktKujIiQStqGZx9K+jJ5+M2a+GVrAe227w=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "065a6a44a301ba027d42b52d94db5bc39dd7ce6d", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, "nixCargoIntegration": { "inputs": { - "devshell": "devshell_2", + "devshell": "devshell_3", "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_4", + "dream2nix": "dream2nix_3", "nixpkgs": [ "helix", "nixpkgs" @@ -471,6 +1068,97 @@ } }, "nixpkgs": { + "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-lib": { + "locked": { + "lastModified": 1655599917, + "narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "5fb55578aa2f1a502d636a8ac71aece57cb730bb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 0, + "narHash": "sha256-MWyfCH9K3eVTXJUxBi67OQSAh9jJAnvWklM6qm4j8w8=", + "path": "/nix/store/qdsi66bin3h3yimbn35fxbj7fwdpi739-source", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "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": 1658644204, + "narHash": "sha256-MWyfCH9K3eVTXJUxBi67OQSAh9jJAnvWklM6qm4j8w8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2f0c3be57c348f4cfd8820f2d189e29a685d9c41", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1656753965, + "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1657447684, "narHash": "sha256-FCP9AuU1q6PE3vOeM5SFf58f/UKPBAsoSGDUGamNBbo=", @@ -501,21 +1189,58 @@ "type": "github" } }, + "rnix-lsp": { + "inputs": { + "naersk": "naersk_2", + "nixpkgs": "nixpkgs_5", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1658492037, + "narHash": "sha256-i4TL1Tb/q7Y+Jk5JWk6FRWWei6yH0WtYVTnmmAr9B0c=", + "owner": "nix-community", + "repo": "rnix-lsp", + "rev": "e6a41cbd317a21763ba61a19e594a3e1bf1023ca", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "rnix-lsp", + "type": "github" + } + }, "root": { "inputs": { "bernbot": "bernbot", "blog": "blog", "fufexan": "fufexan", - "helix": "helix", + "helix": "helix_2", "home": "home", - "hyprland": "hyprland", + "hyprland": "hyprland_2", "nixinate": "nixinate", "nixos-hardware": "nixos-hardware", "nixos-persistence": "nixos-persistence", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_6", "nur": "nur" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1635274542, + "narHash": "sha256-Cew1/WUozM3jalItPuj4cNN8GIFMvCaJ1KXoj6wrHwE=", + "owner": "rust-analyzer", + "repo": "rust-analyzer", + "rev": "dd43f3f2d13a32199828e758ddf13176df1f17f9", + "type": "github" + }, + "original": { + "owner": "rust-analyzer", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "flake": false, "locked": { @@ -534,7 +1259,30 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_4", + "nixpkgs": [ + "fufexan", + "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_3": { + "inputs": { + "flake-utils": "flake-utils_5", "nixpkgs": [ "helix", "nixpkgs" @@ -569,7 +1317,55 @@ "type": "github" } }, + "utils_2": { + "locked": { + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_3": { + "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" + } + }, "wlroots": { + "flake": false, + "locked": { + "host": "gitlab.freedesktop.org", + "lastModified": 1656865312, + "narHash": "sha256-xtQ0zwJZwN8sciruveM10CzKz6TWxBY8SyXa8E4jly4=", + "owner": "wlroots", + "repo": "wlroots", + "rev": "5dc1d4671dd2ca3c1f0f09587c463fdbb542f0a4", + "type": "gitlab" + }, + "original": { + "host": "gitlab.freedesktop.org", + "owner": "wlroots", + "repo": "wlroots", + "type": "gitlab" + } + }, + "wlroots_2": { "flake": false, "locked": { "host": "gitlab.freedesktop.org", diff --git a/flake.nix b/flake.nix index 1cd57ff..7ae6c1d 100644 --- a/flake.nix +++ b/flake.nix @@ -19,8 +19,7 @@ hyprland.url = "github:hyprwm/Hyprland"; hyprland.inputs.nixpkgs.follows = "nixpkgs"; fufexan.url = "github:fufexan/dotfiles"; - fufexan.flake = false; - blog.url = "gitlab:yusdacra/yusdacra.gitlab.io"; + blog.url = "https://git.gaze.systems/dusk/website/archive/master.zip"; blog.inputs.nixpkgs.follows = "nixpkgs"; bernbot.url = "github:yusdacra/bernbot"; bernbot.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/pkgs-set/overlays/discord.nix b/pkgs-set/overlays/discord.nix index 6e2fb91..e0d271c 100644 --- a/pkgs-set/overlays/discord.nix +++ b/pkgs-set/overlays/discord.nix @@ -6,7 +6,6 @@ binaryName = "Discord"; desktopName = "Discord"; - isWayland = false; enableVulkan = false; extraOptions = [ "--disable-gpu-memory-buffer-video-frames" diff --git a/pkgs-set/overlays/helix.nix b/pkgs-set/overlays/helix.nix index 41649e6..b5cf33c 100644 --- a/pkgs-set/overlays/helix.nix +++ b/pkgs-set/overlays/helix.nix @@ -3,6 +3,6 @@ includeGrammarIf = grammar: prev.lib.any (name: grammar.name == name) - ["toml" "rust" "nix" "protobuf" "yaml" "json" "markdown"]; + ["toml" "rust" "nix" "protobuf" "yaml" "json" "markdown" "html" "css"]; }; } diff --git a/pkgs-set/overlays/hyprland.nix b/pkgs-set/overlays/hyprland.nix index 867165a..56fafe7 100644 --- a/pkgs-set/overlays/hyprland.nix +++ b/pkgs-set/overlays/hyprland.nix @@ -1,3 +1,3 @@ {inputs}: final: prev: { - hyprland = inputs.hyprland.packages.${prev.system}.default; + hyprland = inputs.fufexan.packages.${prev.system}.hyprland; } diff --git a/users/modules/hyprland/default.nix b/users/modules/hyprland/default.nix index f3f649b..e90a566 100644 --- a/users/modules/hyprland/default.nix +++ b/users/modules/hyprland/default.nix @@ -34,6 +34,7 @@ exec-once=systemctl --user start graphical-session-pre.target exec-once=systemctl --user start graphical-session.target exec-once=${swaybg} -i ~/.config/wallpaper + exec-once=xprop -root -f _XWAYLAND_GLOBAL_OUTPUT_SCALE 32c -set _XWAYLAND_GLOBAL_OUTPUT_SCALE 1.6 input { kb_layout=tr kb_variant=