This commit is contained in:
Dmitriy Kholkin 2022-10-21 13:57:17 +03:00
parent 7889e9e3b3
commit a387344cb0
12 changed files with 456 additions and 112 deletions

488
flake.lock generated
View File

@ -1,13 +1,37 @@
{ {
"nodes": { "nodes": {
"alejandra": {
"inputs": {
"fenix": "fenix",
"flakeCompat": "flakeCompat",
"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"
}
},
"arkenfox-userjs": { "arkenfox-userjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1664904885, "lastModified": 1665257885,
"narHash": "sha256-XUjX+Tno3EU/3IXR/WCn4M5gVR+sKjCzpKcV31dqzWA=", "narHash": "sha256-4PNnCRLomAd5OdN4UEbsVSm8eNuteZHKaUqRVvIBvN8=",
"owner": "arkenfox", "owner": "arkenfox",
"repo": "user.js", "repo": "user.js",
"rev": "db04bc44f2982ae8e39f10d056bc7cfe7804d4fd", "rev": "f4187632faef76df4de0cbb0cdc7199f22fadd76",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,14 +42,15 @@
}, },
"base16": { "base16": {
"inputs": { "inputs": {
"flake-utils-plus": "flake-utils-plus",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1632784880, "lastModified": 1665506760,
"narHash": "sha256-m2HuPvMwSfi95G4ok0aKhHkAq59WrETfGkqTG611V08=", "narHash": "sha256-Rs3LH5qw91S8pCXBNqT2P+Nl4gI/5OqBJvA6WGun2n4=",
"owner": "alukardbf", "owner": "alukardbf",
"repo": "base16-nix", "repo": "base16-nix",
"rev": "27351e8d64bf399d24afdf2e436bdecb8f2b9777", "rev": "96b0826d8baf22873a2e8562a4cfc037e8182486",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -105,6 +130,91 @@
"type": "github" "type": "github"
} }
}, },
"crane": {
"flake": false,
"locked": {
"lastModified": 1661875961,
"narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=",
"owner": "ipetkov",
"repo": "crane",
"rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"devshell": {
"flake": false,
"locked": {
"lastModified": 1653917170,
"narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=",
"owner": "numtide",
"repo": "devshell",
"rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"dream2nix": {
"inputs": {
"alejandra": "alejandra",
"crane": "crane",
"devshell": "devshell",
"flake-utils-pre-commit": "flake-utils-pre-commit",
"gomod2nix": "gomod2nix",
"mach-nix": "mach-nix",
"nixpkgs": [
"webcord",
"nixpkgs"
],
"poetry2nix": "poetry2nix_2",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1664882193,
"narHash": "sha256-uiAYOxN/M4dpaB6ieY3xOvOH6XgHP9NVXDTzSRa3pMc=",
"owner": "nix-community",
"repo": "dream2nix",
"rev": "785b76894263fd76a0e69955e4cd990b7b735bdf",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "dream2nix",
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"webcord",
"dream2nix",
"alejandra",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"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-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -138,6 +248,22 @@
} }
}, },
"flake-compat_3": { "flake-compat_3": {
"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-compat_4": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1648199409, "lastModified": 1648199409,
@ -155,11 +281,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1638122382, "lastModified": 1644229661,
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -173,27 +299,59 @@
"flake-utils": "flake-utils" "flake-utils": "flake-utils"
}, },
"locked": { "locked": {
"lastModified": 1664562030, "lastModified": 1657226504,
"narHash": "sha256-ZakfsWb+v78jmtpQpwNYETuPyY2GJYVqGF6agZGGQAg=", "narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"type": "github"
}
},
"flake-utils-plus_2": {
"inputs": {
"flake-utils": "flake-utils_2"
},
"locked": {
"lastModified": 1666080932,
"narHash": "sha256-7Q3IUnR/HuvUypf+eWixJi+EZCspnezj1bcBusmjsfo=",
"owner": "alukardbf", "owner": "alukardbf",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"rev": "a9b6b680c287791edcb0891da44eeb53ec787a2a", "rev": "6558409baf45eb2bd6bdf6a96120c23c48178671",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "alukardbf", "owner": "alukardbf",
"ref": "v1.3.1-fix",
"repo": "flake-utils-plus", "repo": "flake-utils-plus",
"type": "github" "type": "github"
} }
}, },
"flake-utils-pre-commit": {
"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": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1638122382,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,6 +375,53 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": {
"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"
}
},
"flakeCompat": {
"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"
}
},
"gomod2nix": {
"flake": false,
"locked": {
"lastModified": 1627572165,
"narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=",
"owner": "tweag",
"repo": "gomod2nix",
"rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8",
"type": "github"
},
"original": {
"owner": "tweag",
"repo": "gomod2nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -225,11 +430,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1664983332, "lastModified": 1665949912,
"narHash": "sha256-KyQvgFRwk3qW3Qr+lO5UDqfpST/HaCJY1yB7wPgPUqo=", "narHash": "sha256-NAp+YHTxgnpEaIJanOmtUx9XAnhKTCzG8LlFyZIAz7M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1a8e35d2e53ed2ccd9818fad9c9478d56c655661", "rev": "04f53999788cd47c6ce932d6cbd7cbfd3998712f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -246,11 +451,11 @@
"wlroots": "wlroots" "wlroots": "wlroots"
}, },
"locked": { "locked": {
"lastModified": 1665003520, "lastModified": 1666001925,
"narHash": "sha256-CIEXnmwTjf8AkfhFcGaGZHzFTvNyLe2ucG0DoM5wVmY=", "narHash": "sha256-K4rxS7uj3DfCkdS65BfhNJlEIou4VV5+qAoekrbxroU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "32e8eda40a93f9c4a304faa54a3996087eae86e4", "rev": "da4cfb9c32fecf2e5d2fa065c9e180a2bdec76a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -261,15 +466,15 @@
}, },
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1664712710, "lastModified": 1665317514,
"narHash": "sha256-TScFRDUO7vuHhPpMe1GNjHD+ciF0qgFWYGc0YM+HAds=", "narHash": "sha256-Kk1uPg/yRm6gweBwNn5HrXbgm/tJ6ClHp7a00yQh7gI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "9b3defbae219e67143f89db6a3540ebaf3cf017a", "rev": "d6f8e6456ec59ff51034d3e434739926470af7aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -310,6 +515,21 @@
"type": "github" "type": "github"
} }
}, },
"mach-nix": {
"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": { "naersk": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -339,11 +559,11 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1664984742, "lastModified": 1665761757,
"narHash": "sha256-3w98t0PHcHfh/gp4be0z5R964zn3j5q26XO79hPjttE=", "narHash": "sha256-A6DEvsXzVvBCUah/wD/ZsLu+oGkCmHdJg9x0HHj1jhs=",
"owner": "nixos", "owner": "nixos",
"repo": "nix", "repo": "nix",
"rev": "ac0fb38e8a5a25a84fa17704bd31b453211263eb", "rev": "3093bd3a855b8fa1f572fd5a33c1971adf5e3e08",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -354,18 +574,18 @@
}, },
"nix-alien": { "nix-alien": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix"
}, },
"locked": { "locked": {
"lastModified": 1664886387, "lastModified": 1665917083,
"narHash": "sha256-LKlJ2loqIh9awGIYaxvBhfo1iW0ZlGZ85aertBR5ybU=", "narHash": "sha256-oyln5pIe+tplxrjGmcVnW/3ydmG1rcily3lOe3nq1no=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "1de0f90f84b439cf2a500240533a5b48a15c269f", "rev": "b47b2d88b2d0d825efd309f7fd58c76df34f7048",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,17 +632,18 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1632753066, "lastModified": 1665466769,
"narHash": "sha256-oLs+Jm9zSRUVhTzPzKbQByLPor4IxdhZ6xUThAE1+s0=", "narHash": "sha256-L+qcHpb4Ac3PipMXJY/Ktbu1+KXy23WCZ8pXWmsf7zY=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1224e4bec7b8019f8847dd268a642000073bcfa3", "rev": "0b20bf89e0035b6d62ad58f9db8fdbc99c2b01e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"ref": "release-21.05", "ref": "release-22.05",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-22_05": { "nixpkgs-22_05": {
@ -442,11 +663,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1664673153, "lastModified": 1665277441,
"narHash": "sha256-Cx2eBUEXt8Q0L+0MSiajhpuVkwDf/4zbP8J0zLQAMNQ=", "narHash": "sha256-TTuO5F7sStTBL/twYMSnRakrw1l7FqAYulN7+HPYjqc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "31f704cbbdb277df25ad2642876c485bc0d8f883", "rev": "76ef73e385f96bb438676cf5f21f220694fd3d73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -457,11 +678,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1665003280, "lastModified": 1665959510,
"narHash": "sha256-kza2EvBETstEUZs2EPqL8tWF1XSWX/diED1caL2ZNk4=", "narHash": "sha256-6wE4sgN/rzMiRegJYyM8PrzV0EhXJJC6w7qRZXLfJ+s=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "796e6bb38bd8acc00184a67be5d5eaf59812eb2b", "rev": "d96b7cb160b700892ef54ea22e046f744c774496",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -487,37 +708,21 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1664883812,
"narHash": "sha256-wqBAcVRBxls2nVaNeQaOy9SRg/bvEUiD26TQDprIg8U=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fe76645aaf2fac3baaa2813fd0089930689c53b5",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-wayland": { "nixpkgs-wayland": {
"inputs": { "inputs": {
"cachix": "cachix", "cachix": "cachix",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_3",
"lib-aggregate": "lib-aggregate", "lib-aggregate": "lib-aggregate",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1664999658, "lastModified": 1665858291,
"narHash": "sha256-FEDnLPk/pBTOx3dFIBuJ8xjRGLB4MtdzwwT2fp4mP5c=", "narHash": "sha256-aqazSjyKXnHu0PF7K1Y4i6E4UK/w+BTC5NTu+FvPg/c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "5c9b30992d1a39c2f5f0f2669d2107dff67eebc7", "rev": "1e4635a232db95976217590c77f5d76a91a87f61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -544,11 +749,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1664407130, "lastModified": 1665848363,
"narHash": "sha256-m4vHHvI+Ybjpd3Rn0Zu851P0DfST3UkfMa7SWO7+/dY=", "narHash": "sha256-3Jow1YxzPtQnck1bAAvbVxgRH4gNnkIdw871Vm6UtAU=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c0b69f571968269f35561cc09c17c710d938389d", "rev": "83b198a2083774844962c854f811538323f9f7b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -558,13 +763,28 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1664876616,
"narHash": "sha256-OxZntLnFgKbGUrPJJNLMxxj4yUaN/30+LG9N81ADqZE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0490b307e5556a8804e710d0c744d29c80fbce48",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1664994467, "lastModified": 1665947847,
"narHash": "sha256-WMAg7hrdHcOWLqMiYFV566MjuQuGX5kuEcnPd41+Cdw=", "narHash": "sha256-yNNbvo/u4hyKW37hQhzNBH2r25TmHp74lbeUlMgc43M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "607d05cc17a65461cfb82790c96c48df7e885710", "rev": "e945ad29f5d2449cd4d3fdace6a1222f07701b21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -585,11 +805,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1662879385, "lastModified": 1665455310,
"narHash": "sha256-ZmiyHn0uPH4xHYcOhY0e0sPtfyM6jCF/shmVq2aTOLc=", "narHash": "sha256-gEG1UiKz65SNWDU1NJmxLneo+kn7WjxrfucSk1zhU6o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "poetry2nix", "repo": "poetry2nix",
"rev": "4f8d61cd936f853242a4ce1fd476f5488c288c26", "rev": "d62ba59f1e28c382665c57203a4b9ad11fd7f449",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -598,9 +818,26 @@
"type": "github" "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"
}
},
"polymc": { "polymc": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_4",
"libnbtplusplus": "libnbtplusplus", "libnbtplusplus": "libnbtplusplus",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -621,6 +858,33 @@
"type": "github" "type": "github"
} }
}, },
"pre-commit-hooks": {
"inputs": {
"flake-utils": [
"webcord",
"dream2nix",
"flake-utils-pre-commit"
],
"nixpkgs": [
"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"
}
},
"qbittorrent-ee": { "qbittorrent-ee": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -659,7 +923,8 @@
"base16": "base16", "base16": "base16",
"base16-tokyonight-scheme": "base16-tokyonight-scheme", "base16-tokyonight-scheme": "base16-tokyonight-scheme",
"comma": "comma", "comma": "comma",
"flake-utils-plus": "flake-utils-plus", "flake-compat": "flake-compat_2",
"flake-utils-plus": "flake-utils-plus_2",
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"nix": "nix", "nix": "nix",
@ -667,7 +932,6 @@
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"nur": "nur", "nur": "nur",
"polymc": "polymc", "polymc": "polymc",
@ -675,19 +939,37 @@
"rycee": "rycee", "rycee": "rycee",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",
"vscode-server-fixup": "vscode-server-fixup", "vscode-server-fixup": "vscode-server-fixup",
"webcord": "webcord",
"zsh-autosuggestions": "zsh-autosuggestions", "zsh-autosuggestions": "zsh-autosuggestions",
"zsh-nix-shell": "zsh-nix-shell", "zsh-nix-shell": "zsh-nix-shell",
"zsh-you-should-use": "zsh-you-should-use" "zsh-you-should-use": "zsh-you-should-use"
} }
}, },
"rust-analyzer-src": {
"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"
}
},
"rycee": { "rycee": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1664942562, "lastModified": 1665892985,
"narHash": "sha256-GoGzecK50Eqn8WxaTnVQkvTWX3IuLkB1JEPomBMpL8o=", "narHash": "sha256-+amqfLbUtgOetJzrLNweWiqNvyYJiLPBI4ih0p8Be5o=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "15ea39924432ec1eb29cf12e1174ab4993d33116", "rev": "6e2e55833bd983b963cf10ec2dddcd586b836743",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -784,15 +1066,51 @@
"type": "github" "type": "github"
} }
}, },
"webcord": {
"inputs": {
"dream2nix": "dream2nix",
"nixpkgs": "nixpkgs_4",
"webcord": "webcord_2"
},
"locked": {
"lastModified": 1665619753,
"narHash": "sha256-FmwkmuXTE3gaQaDwD6abKgIED6qKOSVNo1SAeFE/rvY=",
"owner": "fufexan",
"repo": "webcord-flake",
"rev": "f94b5553fb8dcda6cfdd1ab569212c3324aa3885",
"type": "github"
},
"original": {
"owner": "fufexan",
"repo": "webcord-flake",
"type": "github"
}
},
"webcord_2": {
"flake": false,
"locked": {
"lastModified": 1664742535,
"narHash": "sha256-QoXBlhCM97haNlkbU4O2oXITnzrkiM9hYAiNpduVjIQ=",
"owner": "SpacingBat3",
"repo": "WebCord",
"rev": "cb6938bde4f57b252b167b23fc0c2d6120326fff",
"type": "github"
},
"original": {
"owner": "SpacingBat3",
"repo": "WebCord",
"type": "github"
}
},
"wlroots": { "wlroots": {
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1664816798, "lastModified": 1665405587,
"narHash": "sha256-oLJyFT1Fc4UNNaDSN+EYUAWL4CufCBpuS5AV4Z4XANo=", "narHash": "sha256-lVL48azhjGA/oEIcUSZQNwomNs0EzPxCcjgzyDST0PM=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "50cc1ef4d3791d86854dd83c15fff17e5ea1a5b6", "rev": "221ee83d440fb7dcbfd141ef3a459a5a973331b6",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

View File

@ -2,15 +2,18 @@
description = "System configuration"; description = "System configuration";
inputs = { inputs = {
flake-utils-plus.url = "github:alukardbf/flake-utils-plus/v1.3.1-fix"; flake-utils-plus.url = "github:alukardbf/flake-utils-plus";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixpkgs-master.url = "github:nixos/nixpkgs/master";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.05";
nixpkgs-wayland = { nixpkgs-wayland = {
url = "github:nix-community/nixpkgs-wayland"; url = "github:nix-community/nixpkgs-wayland";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix.url = "github:nixos/nix"; nix.url = "github:nixos/nix";
flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -28,10 +31,6 @@
url = "github:nix-community/comma"; url = "github:nix-community/comma";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# miniguest = {
# url = "github:lourkeur/miniguest";
# inputs.nixpkgs.follows = "nixpkgs";
# };
hyprland = { hyprland = {
url = "github:hyprwm/Hyprland"; url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -65,6 +64,10 @@
url = "github:MatthewCash/nixos-vscode-server"; url = "github:MatthewCash/nixos-vscode-server";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
webcord = {
url = "github:fufexan/webcord-flake";
# inputs.nixpkgs.follows = "nixpkgs";
};
zsh-autosuggestions = { zsh-autosuggestions = {
url = "github:zsh-users/zsh-autosuggestions"; url = "github:zsh-users/zsh-autosuggestions";
flake = false; flake = false;
@ -103,7 +106,7 @@
channelsConfig = { allowUnfree = true; }; channelsConfig = { allowUnfree = true; };
channels.unstable.input = nixpkgs; channels.unstable.input = nixpkgs;
channels.unstable-zfs.input = nixpkgs; channels.unstable-zfs.input = nixpkgs;
channels.unstable-zfs.patches = [ ./patches/update-zfs.patch ]; # channels.unstable-zfs.patches = [ ./patches/update-zfs.patch ];
hostDefaults.system = "x86_64-linux"; hostDefaults.system = "x86_64-linux";
hostDefaults.channelName = "unstable"; hostDefaults.channelName = "unstable";
@ -143,7 +146,7 @@
cp flake.lock flake.lock.bak && nix flake update cp flake.lock flake.lock.bak && nix flake update
update-vscode update-vscode
''; '';
upgrade-hyprland = pkgs.writeShellScriptBin "upgrade" '' upgrade-hyprland = pkgs.writeShellScriptBin "upgrade-hyprland" ''
cp flake.lock flake.lock.bak cp flake.lock flake.lock.bak
nix flake lock --update-input hyprland nix flake lock --update-input hyprland
''; '';

View File

@ -51,6 +51,8 @@ let
export PATH="${with pkgs; lib.makeBinPath [ openssh gnupg git coreutils ]}:/run/wrappers/bin/:$PATH" export PATH="${with pkgs; lib.makeBinPath [ openssh gnupg git coreutils ]}:/run/wrappers/bin/:$PATH"
export SHELL=${pkgs.runtimeShell} export SHELL=${pkgs.runtimeShell}
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
export GNUPGHOME=${config.secretsConfig.gnupgHome}
export GPG_TTY="$(tty)"
if [ -d "${password-store}/.git" ]; then if [ -d "${password-store}/.git" ]; then
cd "${password-store}"; git pull cd "${password-store}"; git pull
else else

View File

@ -1,4 +1,4 @@
{ pkgs, config, lib, ... }: { pkgs, config, lib, inputs, ... }:
with config.deviceSpecific; { with config.deviceSpecific; {
programs.adb.enable = true; programs.adb.enable = true;
@ -49,12 +49,14 @@ with config.deviceSpecific; {
# gui # gui
bitwarden bitwarden
ungoogled-chromium
deadbeef deadbeef
discord discord
feh feh
foliate foliate
gparted gparted
jellyfin-media-player jellyfin-media-player
joplin-desktop
networkmanagerapplet networkmanagerapplet
# persepolis # persepolis
pinta pinta
@ -74,6 +76,8 @@ with config.deviceSpecific; {
curlie curlie
duf duf
zsh-z zsh-z
inputs.webcord.packages.${pkgs.system}.default
] ++ lib.optionals (!(isVM || isISO)) [ ] ++ lib.optionals (!(isVM || isISO)) [
audacity audacity
blueman blueman

View File

@ -2,9 +2,9 @@
programs.steam.enable = true; programs.steam.enable = true;
hardware.steam-hardware.enable = true; hardware.steam-hardware.enable = true;
startupApplications = [ # startupApplications = [
"${pkgs.steam}/bin/steam" # "${pkgs.steam}/bin/steam"
]; # ];
systemd.user.services.x11-ownership = rec { systemd.user.services.x11-ownership = rec {
# serviceConfig.Type = "oneshot"; # serviceConfig.Type = "oneshot";
@ -15,4 +15,22 @@
wants = after; wants = after;
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
}; };
# Start Steam only after the network is up
home-manager.users.alukard.systemd.user.services.steam-startup = {
Service = {
ExecStart = "${pkgs.steam}/bin/steam";
Type = "oneshot";
};
Unit = rec {
# After = if config.deviceSpecific.wireguard.enable then [
# "mullvad-daemon.service"
# ] else [
# "network-online.target"
# ];
After = [ "network-online.target" ];
Wants = After;
};
Install.WantedBy = [ "multi-user.target" ];
};
} }

View File

@ -22,7 +22,7 @@ with config.deviceSpecific; {
"kvm.ignore_msrs=1" "kvm.ignore_msrs=1"
]; ];
kernelPackages = pkgs.linuxPackages_zen; kernelPackages = pkgs.linuxPackages_lqx;
supportedFilesystems = [ "ntfs" ]; supportedFilesystems = [ "ntfs" ];

View File

@ -15,8 +15,8 @@ with config.deviceSpecific; {
extraPackages = if devInfo.gpu.vendor == "intel" then [ extraPackages = if devInfo.gpu.vendor == "intel" then [
pkgs.intel-media-driver pkgs.intel-media-driver
] else if devInfo.gpu.vendor == "amd" then [ ] else if devInfo.gpu.vendor == "amd" then [
pkgs.rocm-opencl-icd # pkgs.rocm-opencl-icd
pkgs.rocm-opencl-runtime # pkgs.rocm-opencl-runtime
pkgs.amdvlk pkgs.amdvlk
] else [ ]; ] else [ ];
extraPackages32 = lib.mkIf (devInfo.gpu.vendor == "amd") [ extraPackages32 = lib.mkIf (devInfo.gpu.vendor == "amd") [

View File

@ -21,12 +21,16 @@ with config.deviceSpecific; {
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://nixpkgs-wayland.cachix.org" "https://nixpkgs-wayland.cachix.org"
"https://hyprland.cachix.org" "https://hyprland.cachix.org"
"https://nixos-rocm.cachix.org"
"https://webcord.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE="
"webcord.cachix.org-1:l555jqOZGHd2C9+vS8ccdh8FhqnGe8L78QrHNn+EFEs="
]; ];
trusted-users = [ "root" "alukard" "@wheel" ]; trusted-users = [ "root" "alukard" "@wheel" ];
}; };

View File

@ -1,10 +1,6 @@
{ pkgs, config, lib, inputs, ... }: { pkgs, config, lib, inputs, ... }:
let let
inherit (pkgs) system; inherit (pkgs) system;
stable = import inputs.nixpkgs-stable ({
config = config.nixpkgs.config;
localSystem = { inherit system; };
});
master = import inputs.nixpkgs-master ({ master = import inputs.nixpkgs-master ({
config = config.nixpkgs.config; config = config.nixpkgs.config;
localSystem = { inherit system; }; localSystem = { inherit system; };

View File

@ -3,6 +3,9 @@ with config.deviceSpecific; {
config = lib.mkIf enableVirtualisation { config = lib.mkIf enableVirtualisation {
virtualisation.docker = { virtualisation.docker = {
enable = true; enable = true;
daemon.settings = {
features = { buildkit = true; };
};
storageDriver = if (devInfo.fileSystem == "zfs") then storageDriver = if (devInfo.fileSystem == "zfs") then
"zfs" "zfs"
else if (devInfo.fileSystem == "btrfs") then else if (devInfo.fileSystem == "btrfs") then
@ -15,9 +18,9 @@ with config.deviceSpecific; {
virtualisation.libvirtd = { virtualisation.libvirtd = {
enable = !isServer; enable = !isServer;
qemu = { qemu = {
ovmf.enable = true; # ovmf.enable = true;
runAsRoot = true; runAsRoot = true;
package = pkgs.qemu; # package = pkgs.qemu;
}; };
onBoot = "ignore"; onBoot = "ignore";
onShutdown = "shutdown"; onShutdown = "shutdown";

View File

@ -20,7 +20,7 @@ git commit -m "temp"
read -p "> Press any key to continue...2" -n 1 -r read -p "> Press any key to continue...2" -n 1 -r
python $kCONFIG/scripts/update-zen.py zen $kMAX_VER /tmp/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix python $kCONFIG/scripts/update-zen.py lqx $kMAX_VER /tmp/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix
read -p "> Press any key to continue...3" -n 1 -r read -p "> Press any key to continue...3" -n 1 -r

View File

@ -3,8 +3,4 @@
* spotifyd + cli * spotifyd + cli
* config qbittorrent * config qbittorrent
* telegram theme * telegram theme
* fix rofi theme
* use theme engine from https://github.com/SenchoPens/senixos * use theme engine from https://github.com/SenchoPens/senixos
* make wallpaper package
xprop WM_CLASS