dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: dusk:de6da760b6530a93249df34e1e2fce7e7bb5eb82
Branches Tags
dusk:terra
..
compare: dusk:95ed4948617f2e7cd81e5d7390da6eb412becb26
Branches Tags
dusk:terra

No commits in common. "de6da760b6530a93249df34e1e2fce7e7bb5eb82" and "95ed4948617f2e7cd81e5d7390da6eb412becb26" have entirely different histories.
de6da760b6 ... 95ed494861

11 changed files with 203 additions and 210 deletions
Show Stats Expand all files Collapse all files

340
flake.lock
View File

@ -23,7 +23,7 @@
}, },
"alejandra": { "alejandra": {
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix_2",
"flakeCompat": "flakeCompat", "flakeCompat": "flakeCompat",
"nixpkgs": [ "nixpkgs": [
"fufexan", "fufexan",
@ -48,10 +48,10 @@
}, },
"alejandra_2": { "alejandra_2": {
"inputs": { "inputs": {
"fenix": "fenix_2", "fenix": "fenix_3",
"flakeCompat": "flakeCompat_2", "flakeCompat": "flakeCompat_2",
"nixpkgs": [ "nixpkgs": [
"webcord", "webcord-flake",
"dream2nix", "dream2nix",
"nixpkgs" "nixpkgs"
] ]
@ -623,23 +623,22 @@
"gomod2nix": "gomod2nix_2", "gomod2nix": "gomod2nix_2",
"mach-nix": "mach-nix_2", "mach-nix": "mach-nix_2",
"nixpkgs": [ "nixpkgs": [
"webcord", "webcord-flake",
"nixpkgs" "nixpkgs"
], ],
"poetry2nix": "poetry2nix_2", "poetry2nix": "poetry2nix_2",
"pre-commit-hooks": "pre-commit-hooks_2" "pre-commit-hooks": "pre-commit-hooks_2"
}, },
"locked": { "locked": {
"lastModified": 1661765532, "lastModified": 1660051305,
"narHash": "sha256-TW2/CeSuoYaBCTsSixGbF0+NncAtDZbmSXx5RPBSDT8=", "narHash": "sha256-74Io9RB1VEZyVqSnNfG0VfxxdOyiY/CkSDE1nY4gBRc=",
"owner": "fufexan", "owner": "nix-community",
"repo": "dream2nix", "repo": "dream2nix",
"rev": "a0e57d33511c53a9195c4764c5cb7736b4d4893e", "rev": "2fe7790152d4b18fc60a8194459959fc7e4a2e60",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "fufexan", "owner": "nix-community",
"ref": "electron",
"repo": "dream2nix", "repo": "dream2nix",
"type": "github" "type": "github"
} }
@ -685,22 +684,24 @@
}, },
"eww": { "eww": {
"inputs": { "inputs": {
"fenix": "fenix",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_4",
"naersk": [
"fufexan",
"naersk"
],
"nixpkgs": [ "nixpkgs": [
"fufexan", "fufexan",
"nixpkgs" "nixpkgs"
],
"rust-overlay": [
"fufexan",
"rust-overlay"
] ]
}, },
"locked": { "locked": {
"lastModified": 1661603008, "lastModified": 1660910151,
"narHash": "sha256-bTN8kS+OCrVCAc8BOppy4lbIEehB3I+QCsbSKLgAE6k=", "narHash": "sha256-K8v4f0RInKTgPg6cEjDko7cZqi8mWWLRZN98w8HUG2c=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "17d91f8a44293721d0d84bd4070002fe3b29edaf", "rev": "25105c7c4f50d4f65ab0fd8a56e00941bc077efa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -710,6 +711,29 @@
} }
}, },
"fenix": { "fenix": {
"inputs": {
"nixpkgs": [
"fufexan",
"eww",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1654237591,
"narHash": "sha256-+uOzx9fuo3CBHO7aGI+SKxDXpf/7NTOXi0g4UxOdk9k=",
"owner": "nix-community",
"repo": "fenix",
"rev": "8dccfbe51a8adea643ec29a4ec516499a5a081c6",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"fenix_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"fufexan", "fufexan",
@ -718,7 +742,7 @@
"alejandra", "alejandra",
"nixpkgs" "nixpkgs"
], ],
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src_2"
}, },
"locked": { "locked": {
"lastModified": 1657607339, "lastModified": 1657607339,
@ -734,15 +758,15 @@
"type": "github" "type": "github"
} }
}, },
"fenix_2": { "fenix_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"webcord", "webcord-flake",
"dream2nix", "dream2nix",
"alejandra", "alejandra",
"nixpkgs" "nixpkgs"
], ],
"rust-analyzer-src": "rust-analyzer-src_2" "rust-analyzer-src": "rust-analyzer-src_3"
}, },
"locked": { "locked": {
"lastModified": 1657607339, "lastModified": 1657607339,
@ -890,11 +914,11 @@
}, },
"flake-utils_4": { "flake-utils_4": {
"locked": { "locked": {
"lastModified": 1637014545, "lastModified": 1653893745,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -919,6 +943,21 @@
} }
}, },
"flake-utils_6": { "flake-utils_6": {
"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_7": {
"locked": { "locked": {
"lastModified": 1656928814, "lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
@ -995,21 +1034,21 @@
], ],
"hyprland-contrib": "hyprland-contrib", "hyprland-contrib": "hyprland-contrib",
"kmonad": "kmonad", "kmonad": "kmonad",
"naersk": "naersk",
"nil": "nil", "nil": "nil",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"rnix-lsp": "rnix-lsp", "rnix-lsp": "rnix-lsp",
"rust-overlay": "rust-overlay_4",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
"webcord": "webcord" "webcord": "webcord"
}, },
"locked": { "locked": {
"lastModified": 1661703165, "lastModified": 1661080774,
"narHash": "sha256-mF5dX7t3HHVEWu+53SU9dvFogC3g4yhvU56p1cTLMxY=", "narHash": "sha256-cTqR5qVqJ+oJ2ksClOurKdXANgkcI5fZpXsFOR6W3oY=",
"owner": "fufexan", "owner": "fufexan",
"repo": "dotfiles", "repo": "dotfiles",
"rev": "5456981b3296ecffb7721905d3b24ca9b55cd512", "rev": "a092f901fb55e7512bfb0f5fbf264ce29763a62a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1075,11 +1114,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1661610287, "lastModified": 1661041582,
"narHash": "sha256-q79CLRHvgh2yq0MKD/cTtWdSx+PY9YKT22EFZz5QhnA=", "narHash": "sha256-5lg/VjkJqSYFHGpFrOUfGHHIpRdmYk6cbMy19vKu5q0=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "e06678278267a76a1d9e29b36d4734bcb39eabec", "rev": "59968d27a4ee590eb06e0f5434988b938f92596b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1091,15 +1130,17 @@
"helix_2": { "helix_2": {
"inputs": { "inputs": {
"nixCargoIntegration": "nixCargoIntegration_2", "nixCargoIntegration": "nixCargoIntegration_2",
"nixpkgs": "nixpkgs_6", "nixpkgs": [
"rust-overlay": "rust-overlay_5" "nixpkgs"
],
"rust-overlay": "rust-overlay_4"
}, },
"locked": { "locked": {
"lastModified": 1661734840, "lastModified": 1661057642,
"narHash": "sha256-gbxNWrPz/SeYcOdDcLYD/v4yPSbdR21iVyv6Djicmq8=", "narHash": "sha256-4CQG4KBBrdGq83Kho4DME1R2nYlQus2l2RlgGKgPzd8=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "411c5e48713d055be9e2031e66bf954c819bea43", "rev": "ed74e6d5d405dd37e067c5fd41e2ae908da22a3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1117,11 +1158,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1661573386, "lastModified": 1660574517,
"narHash": "sha256-pBEg8iY00Af/SAtU2dlmOAv+2x7kScaGlFRDjNoVJO8=", "narHash": "sha256-Lp5D2pAPrM3iAc1eeR0iGwz5rM+SYOWzVxI3p17nlrU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d89bdff445eadff03fe414e9c30486bc8166b72b", "rev": "688e5c85b7537f308b82167c8eb4ecfb70a49861",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1138,11 +1179,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1661573386, "lastModified": 1660574517,
"narHash": "sha256-pBEg8iY00Af/SAtU2dlmOAv+2x7kScaGlFRDjNoVJO8=", "narHash": "sha256-Lp5D2pAPrM3iAc1eeR0iGwz5rM+SYOWzVxI3p17nlrU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d89bdff445eadff03fe414e9c30486bc8166b72b", "rev": "688e5c85b7537f308b82167c8eb4ecfb70a49861",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1154,15 +1195,17 @@
}, },
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_7", "nixpkgs": [
"nixpkgs"
],
"wlroots": "wlroots" "wlroots": "wlroots"
}, },
"locked": { "locked": {
"lastModified": 1661764662, "lastModified": 1661028330,
"narHash": "sha256-iY7p3aL+6cht4WUQ8UgMYHTfMXPQiTXNG+WnAX3WewQ=", "narHash": "sha256-bG/bmkc23TTLzmP1WLmSpr3s5blwxysqV2m9x7gihYQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "6c8ce734fb8e487add1c28efc2f86ff075f8d679", "rev": "9513031da30861b6ab593625aebe88b811758427",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1179,11 +1222,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1661203638, "lastModified": 1660758567,
"narHash": "sha256-7Ax6zZRmy9SkBtTxlaqdDB9PMzN6C28a4IQ9rrb1nY4=", "narHash": "sha256-9aJVymqt9ruai7Wihaf1y0Z/iktLdvnoz+IBruUcPU8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "f4bef84b28dde65f0ede0b436119d49a697cad05", "rev": "edb9da0e4e4155a6239d178ea47ba51d5b161239",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1201,11 +1244,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1661059282, "lastModified": 1657871515,
"narHash": "sha256-EDC2Dcn30UsPNfKGFY4c7vCZLtbmS8q7TBqrQmfbsWs=", "narHash": "sha256-+mxd8hpxt7aWtJlhHn6HUNj9CWlvRQrHdFvrZMWU+WY=",
"owner": "kmonad", "owner": "kmonad",
"repo": "kmonad", "repo": "kmonad",
"rev": "296e463fe7761a919a2a3e39599293526ce55454", "rev": "95bb58b7347ebacb4654fb21c798e1cd10331b0d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1249,20 +1292,19 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"fufexan", "fufexan",
"rnix-lsp",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1659610603, "lastModified": 1659610603,
"narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=", "narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=",
"owner": "nix-community", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "c6a45e4277fa58abd524681466d3450f896dc094", "rev": "c6a45e4277fa58abd524681466d3450f896dc094",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"type": "github" "type": "github"
} }
@ -1319,11 +1361,11 @@
}, },
"nil_2": { "nil_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_7",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay_6" "rust-overlay": "rust-overlay_5"
}, },
"locked": { "locked": {
"lastModified": 1660934895, "lastModified": 1660934895,
@ -1345,11 +1387,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1661006226, "lastModified": 1658761805,
"narHash": "sha256-OytVjY/W1ASw+N+xrCRaKhcs76ZIcrVRf9xXhOnWzno=", "narHash": "sha256-yPY54xna3ufsrpgk1clhsvI5Q3nNE4WAPUzIr+uEHjQ=",
"owner": "Misterio77", "owner": "Misterio77",
"repo": "nix-colors", "repo": "nix-colors",
"rev": "861546e123ef13c480338edbad8c6f2e7baf0777", "rev": "17d4c968ae3b202a71326b59ae89727d1c21f018",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1363,11 +1405,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1661529565, "lastModified": 1660758526,
"narHash": "sha256-X+SIKjD+2x9eOFYIw7lg+lc22VKCgGYPxuUG7T+sXJc=", "narHash": "sha256-w3Chwi62hampmgkXBhdEhJJzKQnHM+UCwSLcyHbfxsk=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "7fcf2ff6d369665e5de57791c9b0edfc40ebcb99", "rev": "92cb8bc09a6d96427a18b3dddcc23b10a82856c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1439,11 +1481,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1661180311, "lastModified": 1654872030,
"narHash": "sha256-eNxtJdSKvGuorxEBidSuv5sAOIy7yl4+fEAOs+cmTRQ=", "narHash": "sha256-a1e49vvdEapkG9tbC0WLEemLGXbMR6hEBeW22aGwueQ=",
"owner": "matthewcroughan", "owner": "matthewcroughan",
"repo": "nixinate", "repo": "nixinate",
"rev": "65584f4d1c8dfa47e86cae773b4a6ffa16ab132c", "rev": "0f53b4f183fbde2ba2b50d3e7dd910b86ea179ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1469,11 +1511,11 @@
}, },
"nixos-persistence": { "nixos-persistence": {
"locked": { "locked": {
"lastModified": 1661590580, "lastModified": 1646131459,
"narHash": "sha256-XoPSucNvccnT50LWme/7BiENZDwr8tArEg36OGQFFnA=", "narHash": "sha256-GPmgxvUFvQ1GmsGfWHy9+rcxWrczeDhS9XnAIPHi9XQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "2237ad28093cb53ad2eb0fd1a9f870997287e0fa", "rev": "2f39baeb7d039fda5fc8225111bb79474138e6f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1544,11 +1586,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1661353537, "lastModified": 1661008273,
"narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=", "narHash": "sha256-UpDqsGzUswIHG7FwzeIewjWlElF17UVLNbI2pwlbcBY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e304ff0d9db453a4b230e9386418fd974d5804a", "rev": "0cc6444e74cd21e8da8d81ef4cd778492e10f843",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1575,44 +1617,12 @@
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": {
"lastModified": 1655624069,
"narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1660908602, "lastModified": 1660908602,
"narHash": "sha256-SwZ85IPWvC4NxxFhWhRMTJpApSHbY1u4YK2UFWEBWvY=", "narHash": "sha256-SwZ85IPWvC4NxxFhWhRMTJpApSHbY1u4YK2UFWEBWvY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "495b19d5b3e62b4ec7e846bdfb6ef3d9c3b83492",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1661628722,
"narHash": "sha256-oR/7NhG7pPkACToUtaaT6hH+rONE2z5/4NzjoUwEZt8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "324c8aaf25b2f2027af7798e5582ce3040a793b6", "rev": "495b19d5b3e62b4ec7e846bdfb6ef3d9c3b83492",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1624,11 +1634,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1661763713, "lastModified": 1661072238,
"narHash": "sha256-2be2ghRozr5eOba9It6bG8I3vnVNIZ69BYF6xw/UR8I=", "narHash": "sha256-X9jXdO2kS3i+E5fyhNqAfiClLMaC8Qria0m26UXXGIo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f8ea1799c6e931a3fc71b20a7aebecdc591879bd", "rev": "572f1871e41f327bfe84f58388bcdebfd3b774f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1703,12 +1713,12 @@
"pre-commit-hooks_2": { "pre-commit-hooks_2": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"webcord", "webcord-flake",
"dream2nix", "dream2nix",
"flake-utils-pre-commit" "flake-utils-pre-commit"
], ],
"nixpkgs": [ "nixpkgs": [
"webcord", "webcord-flake",
"dream2nix", "dream2nix",
"nixpkgs" "nixpkgs"
] ]
@ -1729,7 +1739,10 @@
}, },
"rnix-lsp": { "rnix-lsp": {
"inputs": { "inputs": {
"naersk": "naersk", "naersk": [
"fufexan",
"naersk"
],
"nixpkgs": [ "nixpkgs": [
"fufexan", "fufexan",
"nixpkgs" "nixpkgs"
@ -1766,12 +1779,29 @@
"nixinate": "nixinate", "nixinate": "nixinate",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-persistence": "nixos-persistence", "nixos-persistence": "nixos-persistence",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_6",
"nur": "nur", "nur": "nur",
"webcord": "webcord_3" "webcord-flake": "webcord-flake"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1654178556,
"narHash": "sha256-LG8J9E/wMBolkWS3VstuvhgQ4jOp3Nk328EXlCYY24U=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "88024c7ec2d44a8be8bf05a6580409200cf726fc",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-analyzer-src_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1657557289, "lastModified": 1657557289,
@ -1788,7 +1818,7 @@
"type": "github" "type": "github"
} }
}, },
"rust-analyzer-src_2": { "rust-analyzer-src_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1657557289, "lastModified": 1657557289,
@ -1823,7 +1853,7 @@
}, },
"rust-overlay_2": { "rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"fufexan", "fufexan",
"helix", "helix",
@ -1873,32 +1903,7 @@
}, },
"rust-overlay_4": { "rust-overlay_4": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": "flake-utils_6",
"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": [ "nixpkgs": [
"helix", "helix",
"nixpkgs" "nixpkgs"
@ -1918,7 +1923,7 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay_6": { "rust-overlay_5": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"nil", "nil",
@ -2038,6 +2043,28 @@
"type": "github" "type": "github"
} }
}, },
"webcord-flake": {
"inputs": {
"dream2nix": "dream2nix_5",
"nixpkgs": [
"nixpkgs"
],
"webcord": "webcord_3"
},
"locked": {
"lastModified": 1660242753,
"narHash": "sha256-M9ibcsDzWHp/678lTyxwwgXgdFx2d1YCevoGEIBVnxc=",
"owner": "fufexan",
"repo": "webcord-flake",
"rev": "0892178832a090f0b9ab1a61e20f5d1389cfb23e",
"type": "github"
},
"original": {
"owner": "fufexan",
"repo": "webcord-flake",
"type": "github"
}
},
"webcord_2": { "webcord_2": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -2055,36 +2082,13 @@
} }
}, },
"webcord_3": { "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, "flake": false,
"locked": { "locked": {
"lastModified": 1661854465, "lastModified": 1659951368,
"narHash": "sha256-/2f+Jb/1MstWtzbnG/gNLG/ds8K7qultXWfb5nlth08=", "narHash": "sha256-PiEuZVRjufVvQuub7/Vl9gHqlkBkl5jcoxHhLkntqsw=",
"owner": "SpacingBat3", "owner": "SpacingBat3",
"repo": "WebCord", "repo": "WebCord",
"rev": "83ad1578b2cbcb1c4e5470ca85a0a6e6f5f8c42e", "rev": "a8e64a78d1e3a8c3d5e11893ebb8ba1ed92d7d12",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View File

@ -15,7 +15,9 @@
nixinate.inputs.nixpkgs.follows = "nixpkgs"; nixinate.inputs.nixpkgs.follows = "nixpkgs";
helix.url = "github:helix-editor/helix"; helix.url = "github:helix-editor/helix";
helix.inputs.nixpkgs.follows = "nixpkgs";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
hyprland.inputs.nixpkgs.follows = "nixpkgs";
fufexan.url = "github:fufexan/dotfiles"; fufexan.url = "github:fufexan/dotfiles";
fufexan.inputs.hyprland.follows = "hyprland"; fufexan.inputs.hyprland.follows = "hyprland";
blog.url = "git+https://git.gaze.systems/dusk/website.git"; blog.url = "git+https://git.gaze.systems/dusk/website.git";
@ -26,8 +28,8 @@
discocss.inputs.nixpkgs.follows = "nixpkgs"; discocss.inputs.nixpkgs.follows = "nixpkgs";
nil.url = "github:oxalica/nil"; nil.url = "github:oxalica/nil";
nil.inputs.nixpkgs.follows = "nixpkgs"; nil.inputs.nixpkgs.follows = "nixpkgs";
webcord.url = "github:fufexan/webcord-flake/system-electron"; webcord-flake.url = "github:fufexan/webcord-flake";
webcord.inputs.nixpkgs.follows = "nixpkgs"; webcord-flake.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs: let outputs = inputs: let

1
hosts/tkaronto/default.nix
View File

@ -118,7 +118,6 @@
enableGC = true; enableGC = true;
autoMount = true; autoMount = true;
}; };
gvfs.enable = true;
}; };
virtualisation = { virtualisation = {

1
hosts/tkaronto/modules/nixbuild.nix
View File

@ -1 +0,0 @@
../../../modules/develop/nixbuild/default.nix

22
modules/develop/nixbuild/default.nix
View File

@ -12,15 +12,15 @@
}; };
}; };
# nix = { nix = {
# distributedBuilds = true; distributedBuilds = true;
# buildMachines = [ buildMachines = [
# { {
# hostName = "eu.nixbuild.net"; hostName = "eu.nixbuild.net";
# system = "x86_64-linux"; system = "x86_64-linux";
# maxJobs = 100; maxJobs = 100;
# supportedFeatures = ["benchmark" "big-parallel"]; supportedFeatures = ["benchmark" "big-parallel"];
# } }
# ]; ];
# }; };
} }

2
modules/gamemode/default.nix
View File

@ -3,7 +3,7 @@
inputs, inputs,
... ...
}: let }: let
hyprland = inputs.hyprland.packages.${pkgs.system}.hyprland; hyprland = inputs.fufexan.packages.${pkgs.system}.hyprland;
startscript = pkgs.writeShellScript "gamemode-start" '' startscript = pkgs.writeShellScript "gamemode-start" ''
export HYPRLAND_INSTANCE_SIGNATURE=$(ls /tmp/hypr | sort | tail -n 1) export HYPRLAND_INSTANCE_SIGNATURE=$(ls /tmp/hypr | sort | tail -n 1)

8
modules/network/iwd.nix
View File

@ -1,12 +1,6 @@
{ {
imports = [./dns]; imports = [./dns];
networking.wireless.iwd = { networking.wireless.iwd.enable = true;
enable = true;
settings = {
Network = { EnableIPv6 = true; };
Settings = { AutoConnect = true; };
};
};
networking.networkmanager.wifi.backend = "iwd"; networking.networkmanager.wifi.backend = "iwd";
services.connman.wifi.backend = "iwd"; services.connman.wifi.backend = "iwd";
} }

BIN
secrets/default.nix
View File

Binary file not shown.

21
users/modules/discord/default.nix
View File

@ -2,34 +2,19 @@
config, config,
inputs, inputs,
pkgs, pkgs,
lib,
... ...
}: { }: {
# imports = [inputs.discocss.hmModule]; imports = [inputs.discocss.hmModule];
# programs.discocss = { # programs.discocss = {
# enable = true; # enable = true;
# discord = inputs.fufexan.packages.${pkgs.system}.discord-electron-openasar; # discord = inputs.webcord-flake.packages.${pkgs.system}.webcord;
# discordAlias = true; # discordAlias = true;
# css = builtins.readFile ./theme.css; # css = builtins.readFile ./theme.css;
# }; # };
home.packages = [inputs.webcord-flake.packages.${pkgs.system}.webcord];
home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [ home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [
".config/WebCord" ".config/WebCord"
]; ];
home.packages =
let
pkg = inputs.webcord.packages.${pkgs.system}.webcord;
in
[(
pkgs.runCommand pkg.name {nativeBuildInputs = [pkgs.makeWrapper];} ''
mkdir -p $out
ln -sf ${pkg}/* $out/
rm $out/bin
mkdir $out/bin
ln -s ${pkg}/bin/webcord $out/bin/webcord
wrapProgram $out/bin/webcord \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [pkgs.pipewire]}"
''
)];
} }

10
users/modules/helix/default.nix
View File

@ -43,5 +43,15 @@
}; };
}; };
}; };
themes = {
catppuccin_mocha = builtins.fromTOML (
builtins.readFile (
builtins.fetchurl {
url = "https://raw.githubusercontent.com/catppuccin/helix/47710cbb38a5462973a484283a749543914c73e9/italics/catppuccin_mocha.toml";
sha256 = "sha256:1bv07mmi6hz7igd2pz7brcgs154989hnq8jmxy8px9d1jpx753di";
}
)
);
};
}; };
} }

2
users/modules/hyprland/default.nix
View File

@ -21,7 +21,7 @@
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland; package = inputs.fufexan.packages.${pkgs.system}.hyprland;
extraConfig = let extraConfig = let
rofi = "${pkgs.rofi-wayland}/bin/rofi"; rofi = "${pkgs.rofi-wayland}/bin/rofi";
launcher = "${rofi} -show drun"; launcher = "${rofi} -show drun";