Compare commits
415 commits
85a817ee02
...
eb85e2573d
Author | SHA1 | Date | |
---|---|---|---|
eb85e2573d | |||
538a7c202e | |||
b1c96cb075 | |||
3c09386643 | |||
a7f6983abe | |||
d302447326 | |||
7426658f62 | |||
lelgenio | b97940aa97 | ||
lelgenio | ba4c57b914 | ||
c8578c9ec9 | |||
dd0531a825 | |||
0ca4b6910e | |||
e27e9b584d | |||
9cdb3eb489 | |||
dfb3b88ada | |||
dfde651cb9 | |||
8aa35f1368 | |||
b4876d9dd9 | |||
5d75616eda | |||
e3325220f4 | |||
be3f65adb9 | |||
dbd1099e19 | |||
6b17b910f8 | |||
8625dbc8a2 | |||
30c7871610 | |||
2f67b084d2 | |||
36a717072a | |||
43dd44d237 | |||
655baa24b0 | |||
085ca01d56 | |||
26ca820d4e | |||
36636a8a98 | |||
e9b3ed69c9 | |||
20d72d7787 | |||
07be28a2fb | |||
6859150622 | |||
9137829f02 | |||
90a08dfaa9 | |||
49074303af | |||
ad12a22346 | |||
15c5e33060 | |||
5218277b3e | |||
2ce8246287 | |||
cbeaa72101 | |||
3b411b0c6d | |||
3333772c23 | |||
686f605a6d | |||
2215da6dc5 | |||
a30f87ec71 | |||
48c074f1f4 | |||
9f2382ef2d | |||
96c86f2cc8 | |||
4ddc0a4acd | |||
7bb5a7c5a0 | |||
5cc4532b24 | |||
faca1d3c81 | |||
f54f98ea4e | |||
8f0160ef73 | |||
2ce18fc7a0 | |||
ba3ab547b7 | |||
dc4ca50622 | |||
be28de858d | |||
b489452aba | |||
e925f586a1 | |||
45383a0d8b | |||
de2b80018b | |||
d86b7db36e | |||
e4b9bcca7e | |||
850be61bf3 | |||
9f10425c04 | |||
36d2bedd34 | |||
5f588d7e1a | |||
577328395d | |||
34c35fb4eb | |||
5161c3a5d8 | |||
b4538b5db5 | |||
5fa213ab59 | |||
5571ebd26a | |||
5cbc3b799f | |||
061df3f2c4 | |||
f6c2f4905b | |||
f9d95745ef | |||
b60fc8900a | |||
c7999c3fbe | |||
78d6120281 | |||
916132cf9c | |||
33063a8b99 | |||
2deca2fc3d | |||
c713e32440 | |||
1201faf5fe | |||
6c6e82aae8 | |||
da736e199c | |||
8f2ccfea9d | |||
323a02c6fd | |||
0397a4e166 | |||
f8e48e7fa0 | |||
c40cbf74f3 | |||
2516836026 | |||
0f10937be8 | |||
de26e20ed4 | |||
30ea33079a | |||
4f54c31dc5 | |||
3c8caa0a17 | |||
a78e75055f | |||
e67ed127b9 | |||
8518176f2b | |||
bf382371cb | |||
3bf20808b5 | |||
e53be29b0c | |||
d06253b430 | |||
ed4ded7402 | |||
9165fd4b6f | |||
68a7125822 | |||
d0dd646246 | |||
5edca9c2c6 | |||
8de573b35c | |||
748a3ba0ba | |||
f897680775 | |||
d3f02f8762 | |||
4cd1e7cab1 | |||
7ab7a3459a | |||
c60e22b26a | |||
55ce6457c8 | |||
a3e77a9661 | |||
08d66a4053 | |||
eb25c3c32f | |||
3313416291 | |||
f84a9e7edd | |||
77d1fa78f5 | |||
3530a81491 | |||
05d5414d81 | |||
b16750277b | |||
754ea46301 | |||
b85144a9f3 | |||
2e090030bd | |||
184ac7ff03 | |||
99576a7cb0 | |||
311fb4384e | |||
a78d416cac | |||
d451db8d83 | |||
a0531650c6 | |||
7f8b98c153 | |||
04850913a1 | |||
dc026727c9 | |||
02c6040972 | |||
6c534c590f | |||
e7d0121d46 | |||
fd9628423b | |||
3b05a090d6 | |||
6ff6428277 | |||
5ee50a33b2 | |||
10e4811c3e | |||
9f35809cc6 | |||
b0bd973365 | |||
325cf58e2c | |||
a587610fd1 | |||
7e2c9b087a | |||
35e0704b82 | |||
3830a01240 | |||
6ab508f374 | |||
7ddc64cf61 | |||
e2e6b85d62 | |||
fe06b965b8 | |||
2b642b2aaf | |||
25c8833ec3 | |||
47e3cc536c | |||
52a2cfc73b | |||
9a879481d1 | |||
525a75f620 | |||
85b6c0a559 | |||
5763f59f37 | |||
e4d49b6e2b | |||
142d2c2314 | |||
65d78cb872 | |||
231a273225 | |||
e66076f267 | |||
de6d1e9edb | |||
3916fc3f51 | |||
f3664a410c | |||
26b886e46d | |||
2e4b268fa9 | |||
2d10752d15 | |||
b4ff6d21af | |||
b1f17cf793 | |||
6b45e2fb35 | |||
9995a776d7 | |||
e8f3fa733f | |||
c9f13dbe40 | |||
d18c85efb2 | |||
80ef3f0e6c | |||
ff7c1b3bb3 | |||
2279296549 | |||
4de9729c8f | |||
82db6d783d | |||
804e8b50f5 | |||
a08aca5301 | |||
49040b5be9 | |||
d0d7d7f930 | |||
b8ee69c66b | |||
6528a97d21 | |||
be8be99265 | |||
aec76bd138 | |||
3094240717 | |||
c51f030d0a | |||
22cca89c4a | |||
d1a4f1d4f7 | |||
a18f2791c2 | |||
08c09a7fce | |||
17b43bab27 | |||
f07f6b66a3 | |||
0aad44af19 | |||
43c769617b | |||
58b3150d3a | |||
884d02f003 | |||
b8081cf4c6 | |||
f6530e55ea | |||
d8feb9fe92 | |||
e9d25a7d69 | |||
3ebd680633 | |||
66b22ae784 | |||
19fccaba0e | |||
2e4cd80d89 | |||
b00b4e322f | |||
32b1771867 | |||
eb3eca98c4 | |||
5eca20902c | |||
9c1709c039 | |||
152344a801 | |||
16bdde3504 | |||
95deef964f | |||
c9f6682a2b | |||
3c2c25d388 | |||
9f0d478b41 | |||
6e28ce3ffe | |||
ece5ca2141 | |||
a993a5711d | |||
2357cf053e | |||
6b49c83fff | |||
90fa9564dc | |||
fcc155ab3c | |||
fc6d9d4d62 | |||
195d2b5589 | |||
3548de8d33 | |||
55d5178bb6 | |||
e43975898e | |||
75064dafd4 | |||
8633e67c92 | |||
069c9c60b7 | |||
24aece1aa7 | |||
431fe5bd1b | |||
a2ca5e0042 | |||
15397a871a | |||
34ce503cec | |||
fc60022bb7 | |||
13a740fd6e | |||
a817587c34 | |||
1eabd3405d | |||
da7a3084c7 | |||
44c5fbace4 | |||
b2d356fe6e | |||
430b18f747 | |||
49b921c678 | |||
93a1831e40 | |||
1d03ba2f4a | |||
4019472dc1 | |||
f86b1e977e | |||
16ab674e79 | |||
f27db83936 | |||
61d2767a9f | |||
7aa1cec6fa | |||
27cc126d4a | |||
edeab9f843 | |||
2ab0b84209 | |||
869ba87dab | |||
89cef20b3c | |||
4ad060e795 | |||
3aab632dc3 | |||
ed0a0412bb | |||
429e490bb5 | |||
36b21bc379 | |||
6357800e37 | |||
3fe72cac61 | |||
05e598acf0 | |||
82fb005bc1 | |||
6be8458b9c | |||
47b3aa665f | |||
ce39addcf0 | |||
d09cbf4a10 | |||
90acb5b08c | |||
951bf6bc91 | |||
42b5fcf970 | |||
e7e9f167d7 | |||
c52cbc26df | |||
ab00a850fd | |||
778604cd50 | |||
5445964844 | |||
337a0a211a | |||
1d32343e47 | |||
e7d1840eaf | |||
5f4f95896c | |||
c8c00f08e8 | |||
ba1a36e915 | |||
ce2c4d4deb | |||
4e84cb32c2 | |||
43a0ce5d0f | |||
a024dad386 | |||
37df277974 | |||
1a1f44b997 | |||
c6b05942c5 | |||
f8e4e5344e | |||
2649edfb47 | |||
77cb5087ac | |||
778794f91b | |||
8bbdb28d32 | |||
bd275e8982 | |||
073e578141 | |||
2dd9bea706 | |||
10380a53b5 | |||
5aa0614a59 | |||
39cbe4e5e8 | |||
3d207cb35a | |||
9a69d8b3c3 | |||
7ddf21e6de | |||
192957ead0 | |||
e30fa78d33 | |||
e997ed95d7 | |||
40f8f28b57 | |||
4af864dde7 | |||
f29d93b3c9 | |||
635eef0902 | |||
d95364b3ea | |||
9c9ebff974 | |||
b38dce323a | |||
9ad6bc4ac3 | |||
8329ca5ea0 | |||
15d8216494 | |||
37aed2697d | |||
b26f2fce58 | |||
f1cbae7b53 | |||
d32bd28650 | |||
ba4d00d1df | |||
1c70c3c695 | |||
ee96d61a04 | |||
a8ed33860c | |||
b9c65f797f | |||
2cf980caa1 | |||
f6efa2cc57 | |||
6f3935f736 | |||
b400bd938e | |||
d7277c7222 | |||
ef75e936c6 | |||
5034746b55 | |||
4977cf1628 | |||
9425abdf54 | |||
43a40da5d2 | |||
517086541e | |||
8d980ed634 | |||
e1dc83286a | |||
38d0fe189a | |||
a9b1fd1e9c | |||
7b631196ca | |||
091995849f | |||
320adcf1ac | |||
54d54f521f | |||
d4c7c60ec7 | |||
c9e73492f9 | |||
b081b01841 | |||
ca041b9a48 | |||
6bb17bd0e6 | |||
c6f9e14fa8 | |||
5f95eb8b1a | |||
f396b3cfbd | |||
74b5ba8c13 | |||
9ef72dd902 | |||
d9a40ec660 | |||
3188d11a7b | |||
6dfeeb36ed | |||
72e4a8f932 | |||
62bd9e6676 | |||
76855bedf9 | |||
13797298c2 | |||
7c217a07da | |||
a28a906125 | |||
364980bf63 | |||
b085e22f80 | |||
8a4e545841 | |||
a8e1eda2d9 | |||
1944bda13c | |||
7a670b3aad | |||
58cdca84e5 | |||
7d698c6f0d | |||
5b9ff161c0 | |||
db80138e53 | |||
d9f56ffc93 | |||
e3261735cc | |||
d1782cc03e | |||
8ad3c92683 | |||
8af57c2e9e | |||
b20a9762a1 | |||
ad581a434a | |||
da3e1b132b | |||
17e6f9ecee | |||
007895fcb5 | |||
9ecae78687 | |||
1370ee664b | |||
6c56795c33 | |||
8b3cdd756d | |||
c82e25f0a4 | |||
5f0c129b63 | |||
ce4a6bb501 | |||
f26b404d9d | |||
1036602b03 | |||
caa4495215 | |||
313a8e168a | |||
1beedef599 |
809
flake.lock
809
flake.lock
File diff suppressed because it is too large
Load diff
191
flake.nix
191
flake.nix
|
@ -1,55 +1,45 @@
|
||||||
{
|
{
|
||||||
description = "My system config";
|
description = "My system config";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-22.11";
|
nixpkgs.url = "nixpkgs/nixos-24.05";
|
||||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
||||||
home-manager.url = "github:nix-community/home-manager/release-22.11";
|
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nur.url = "github:nix-community/NUR";
|
|
||||||
|
|
||||||
nix-index-database = {
|
nix-index-database = {
|
||||||
url = "github:Mic92/nix-index-database";
|
url = "github:Mic92/nix-index-database";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
# mpvpaper
|
|
||||||
wegank = {
|
|
||||||
url = "github:wegank/nur-packages";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
hyprland = {
|
|
||||||
url = "github:hyprwm/Hyprland";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
|
||||||
};
|
|
||||||
|
|
||||||
alacritty-sixel.url = "github:ayosec/alacritty";
|
|
||||||
alacritty-sixel.flake = false;
|
|
||||||
|
|
||||||
ranger-sixel.url = "github:remi6397/ranger/feature/sixel";
|
|
||||||
ranger-sixel.flake = false;
|
|
||||||
|
|
||||||
ranger-icons.url = "github:alexanderjeurissen/ranger_devicons";
|
ranger-icons.url = "github:alexanderjeurissen/ranger_devicons";
|
||||||
ranger-icons.flake = false;
|
ranger-icons.flake = false;
|
||||||
|
|
||||||
material-wifi-icons.url = "github:dcousens/material-wifi-icons";
|
|
||||||
material-wifi-icons.flake = false;
|
|
||||||
|
|
||||||
sea-orm-cli.url = "github:lucperkins/nixpkgs/lperkins/sea-orm-cli";
|
|
||||||
|
|
||||||
nil-lsp.url = "github:oxalica/nil";
|
|
||||||
nil-lsp.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
|
||||||
|
|
||||||
plymouth-themes.url = "github:adi1090x/plymouth-themes";
|
plymouth-themes.url = "github:adi1090x/plymouth-themes";
|
||||||
plymouth-themes.flake = false;
|
plymouth-themes.flake = false;
|
||||||
|
|
||||||
lipsum.url = "github:hannenz/lipsum";
|
agenix = {
|
||||||
lipsum.flake = false;
|
url = "github:ryantm/agenix";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
inputs.home-manager.follows = "home-manager";
|
||||||
|
};
|
||||||
|
|
||||||
agenix.url = "github:ryantm/agenix";
|
nixos-mailserver = {
|
||||||
|
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
inputs.nixpkgs-24_05.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
dzgui.url = "github:lelgenio/dzgui-nix";
|
dzgui-nix = {
|
||||||
dzgui.inputs.nixpkgs.follows = "nixpkgs";
|
url = "github:lelgenio/dzgui-nix";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
tlauncher = {
|
||||||
|
url = "git+https://git.lelgenio.xyz/lelgenio/tlauncher-nix";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
disko.url = "github:nix-community/disko";
|
||||||
|
disko.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
# my stuff
|
# my stuff
|
||||||
dhist = {
|
dhist = {
|
||||||
|
@ -60,60 +50,86 @@
|
||||||
url = "github:lelgenio/demoji";
|
url = "github:lelgenio/demoji";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
wl-crosshair = {
|
||||||
|
url = "github:lelgenio/wl-crosshair";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
|
# gnome stuff
|
||||||
|
nixos-conf-editor = {
|
||||||
|
url = "github:vlinkz/nixos-conf-editor";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
nix-software-center = {
|
||||||
|
url = "github:vlinkz/nix-software-center";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
outputs = inputs@{ nixpkgs, nixpkgs-unstable, home-manager, nur, ... }:
|
outputs =
|
||||||
|
inputs:
|
||||||
let
|
let
|
||||||
inherit (import ./user/variables.nix) desktop;
|
nixpkgsConfig = {
|
||||||
system = "x86_64-linux";
|
|
||||||
pkgs = import nixpkgs {
|
|
||||||
inherit system;
|
inherit system;
|
||||||
config = { allowUnfree = true; };
|
config = {
|
||||||
|
allowUnfree = true;
|
||||||
|
};
|
||||||
overlays = old_overlays.all;
|
overlays = old_overlays.all;
|
||||||
};
|
};
|
||||||
lib = nixpkgs.lib;
|
|
||||||
|
inherit (import ./user/variables.nix) desktop;
|
||||||
|
system = "x86_64-linux";
|
||||||
|
pkgs = import inputs.nixpkgs nixpkgsConfig;
|
||||||
|
lib = inputs.nixpkgs.lib;
|
||||||
|
|
||||||
packages = import ./pkgs { inherit pkgs inputs; };
|
packages = import ./pkgs { inherit pkgs inputs; };
|
||||||
|
|
||||||
old_overlays = (import ./overlays { inherit packages inputs; });
|
old_overlays = (import ./overlays { inherit packages inputs; });
|
||||||
|
|
||||||
specialArgs = { inherit inputs; };
|
specialArgs = {
|
||||||
common_modules = [
|
inherit inputs;
|
||||||
{ nixpkgs.pkgs = pkgs; }
|
};
|
||||||
./system/configuration.nix
|
common_modules =
|
||||||
./system/secrets.nix
|
[
|
||||||
./system/specialisation.nix
|
{ nixpkgs.pkgs = pkgs; }
|
||||||
# nur.nixosModules.nur
|
./system/configuration.nix
|
||||||
inputs.agenix.nixosModules.default
|
./system/secrets.nix
|
||||||
inputs.hyprland.nixosModules.default
|
./system/greetd.nix
|
||||||
{
|
{ login-manager.greetd.enable = desktop == "sway"; }
|
||||||
programs.hyprland.enable = true;
|
|
||||||
# programs.hyprland.package = null;
|
inputs.agenix.nixosModules.default
|
||||||
}
|
inputs.dzgui-nix.nixosModules.default
|
||||||
home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
{
|
inputs.disko.nixosModules.disko
|
||||||
home-manager.useGlobalPkgs = true;
|
{
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.users.lelgenio = import ./user/home.nix;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.backupFileExtension = "bkp";
|
home-manager.users.lelgenio = import ./user/home.nix;
|
||||||
# Optionally, use home-manager.extraSpecialArgs to pass
|
home-manager.backupFileExtension = "bkp";
|
||||||
# arguments to home.nix
|
# Optionally, use home-manager.extraSpecialArgs to pass
|
||||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
# arguments to home.nix
|
||||||
}
|
home-manager.extraSpecialArgs = {
|
||||||
] ++ lib.optional (desktop == "sway") ./system/sway.nix
|
inherit inputs;
|
||||||
++ lib.optional (desktop == "gnome") ./system/gnome.nix
|
};
|
||||||
++ lib.optional (desktop == "kde") ./system/kde.nix;
|
}
|
||||||
|
]
|
||||||
|
++ lib.optional (desktop == "gnome") ./system/gnome.nix
|
||||||
|
++ lib.optional (desktop == "kde") ./system/kde.nix;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
checks."${system}" = {
|
||||||
|
disko-format-i15 = pkgs.callPackage ./hosts/i15/partitions-test.nix { };
|
||||||
|
};
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
i15 = lib.nixosSystem {
|
i15 = lib.nixosSystem {
|
||||||
inherit system specialArgs;
|
inherit system specialArgs;
|
||||||
modules = [ ./hosts/i15.nix ] ++ common_modules;
|
modules = [ ./hosts/i15 ] ++ common_modules;
|
||||||
};
|
};
|
||||||
monolith = lib.nixosSystem {
|
monolith = lib.nixosSystem {
|
||||||
inherit system specialArgs;
|
inherit system specialArgs;
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/monolith.nix
|
./hosts/monolith
|
||||||
./system/monolith-gitlab-runner.nix
|
./system/monolith-gitlab-runner.nix
|
||||||
|
./system/monolith-forgejo-runner.nix
|
||||||
./system/nix-serve.nix
|
./system/nix-serve.nix
|
||||||
./system/steam.nix
|
./system/steam.nix
|
||||||
] ++ common_modules;
|
] ++ common_modules;
|
||||||
|
@ -121,28 +137,49 @@
|
||||||
rainbow = lib.nixosSystem {
|
rainbow = lib.nixosSystem {
|
||||||
inherit system specialArgs;
|
inherit system specialArgs;
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/rainbow.nix
|
./hosts/rainbow
|
||||||
|
./system/rainbow-gitlab-runner.nix
|
||||||
|
] ++ common_modules;
|
||||||
|
};
|
||||||
|
double-rainbow = lib.nixosSystem {
|
||||||
|
inherit system specialArgs;
|
||||||
|
modules = [
|
||||||
|
./hosts/double-rainbow.nix
|
||||||
./system/rainbow-gitlab-runner.nix
|
./system/rainbow-gitlab-runner.nix
|
||||||
] ++ common_modules;
|
] ++ common_modules;
|
||||||
};
|
};
|
||||||
pixie = lib.nixosSystem {
|
pixie = lib.nixosSystem {
|
||||||
inherit system specialArgs;
|
inherit system specialArgs;
|
||||||
modules = [ ./hosts/pixie.nix ] ++ common_modules ++ [{
|
modules =
|
||||||
packages.media-packages.enable = lib.mkOverride 0 false;
|
[ ./hosts/pixie.nix ]
|
||||||
programs.steam.enable = lib.mkOverride 0 false;
|
++ common_modules
|
||||||
services.flatpak.enable = lib.mkOverride 0 false;
|
++ [
|
||||||
}];
|
{
|
||||||
|
packages.media-packages.enable = lib.mkOverride 0 false;
|
||||||
|
programs.steam.enable = lib.mkOverride 0 false;
|
||||||
|
services.flatpak.enable = lib.mkOverride 0 false;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
phantom = lib.nixosSystem {
|
||||||
|
inherit system specialArgs;
|
||||||
|
modules = [ ./hosts/phantom ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
homeConfigurations.lelgenio = home-manager.lib.homeManagerConfiguration {
|
homeConfigurations.lelgenio = inputs.home-manager.lib.homeManagerConfiguration {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
|
|
||||||
extraSpecialArgs = { inherit inputs; };
|
extraSpecialArgs = {
|
||||||
|
inherit inputs;
|
||||||
|
osConfig = { };
|
||||||
|
};
|
||||||
|
|
||||||
modules = [ ./user/home.nix ];
|
modules = [ ./user/home.nix ];
|
||||||
};
|
};
|
||||||
|
|
||||||
packages.${system} = packages;
|
packages.${system} = pkgs // packages;
|
||||||
|
|
||||||
|
formatter.${system} = pkgs.nixfmt-rfc-style;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
67
hosts/double-rainbow.nix
Normal file
67
hosts/double-rainbow.nix
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
btrfs_options = [
|
||||||
|
"compress=zstd:3"
|
||||||
|
"noatime"
|
||||||
|
"x-systemd.device-timeout=0"
|
||||||
|
];
|
||||||
|
btrfs_ssd = [
|
||||||
|
"ssd"
|
||||||
|
"discard=async"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
{
|
||||||
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [
|
||||||
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"nvme"
|
||||||
|
"usb_storage"
|
||||||
|
"usbhid"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
|
boot.initrd.kernelModules = [ "i915" ];
|
||||||
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "/dev/disk/by-uuid/a072a77b-ca29-47df-be65-6d310d067d78";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=@" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
|
};
|
||||||
|
|
||||||
|
boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device = "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964";
|
||||||
|
|
||||||
|
fileSystems."/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/97EB-7DB5";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [ ];
|
||||||
|
|
||||||
|
services.udev.extraRules = ''
|
||||||
|
# Force all disks to use mq-deadline scheduler
|
||||||
|
# For some reason "noop" is used by default which is kinda bad when io is saturated
|
||||||
|
ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline"
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
||||||
|
networking.hostName = "double-rainbow"; # Define your hostname.
|
||||||
|
}
|
|
@ -1,15 +1,30 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
btrfs_options = [ "compress=zstd:3" "noatime" ];
|
btrfs_options = [
|
||||||
|
"compress=zstd:3"
|
||||||
|
"noatime"
|
||||||
|
"x-systemd.device-timeout=0"
|
||||||
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules =
|
boot.initrd.availableKernelModules = [
|
||||||
[ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
"rtsx_usb_sdmmc"
|
||||||
|
];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
@ -45,10 +60,12 @@ in
|
||||||
options = [ "subvol=@swap" ] ++ btrfs_options;
|
options = [ "subvol=@swap" ] ++ btrfs_options;
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [{
|
swapDevices = [
|
||||||
device = "/swap/swapfile";
|
{
|
||||||
size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB
|
device = "/swap/swapfile";
|
||||||
}];
|
size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
@ -59,7 +76,6 @@ in
|
||||||
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||||
hardware.cpu.intel.updateMicrocode =
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
networking.hostName = "i15"; # Define your hostname.
|
networking.hostName = "i15"; # Define your hostname.
|
||||||
}
|
}
|
||||||
|
|
38
hosts/i15/default.nix
Normal file
38
hosts/i15/default.nix
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
networking.hostName = "i15"; # Define your hostname.
|
||||||
|
|
||||||
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [
|
||||||
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
"rtsx_usb_sdmmc"
|
||||||
|
];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
disko.devices = (import ./partitions.nix { disks = [ "/dev/sda" ]; });
|
||||||
|
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "/swap/swapfile";
|
||||||
|
size = (1024 * 8) + (1024 * 2); # RAM size + 2 GB
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
19
hosts/i15/partitions-test.nix
Normal file
19
hosts/i15/partitions-test.nix
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
pkgs.makeDiskoTest {
|
||||||
|
name = "test-disko-i15";
|
||||||
|
disko-config = ./partitions.nix;
|
||||||
|
enableOCR = true;
|
||||||
|
bootCommands = ''
|
||||||
|
machine.wait_for_text("[Pp]assphrase for")
|
||||||
|
machine.send_chars("secretsecret\n")
|
||||||
|
'';
|
||||||
|
extraTestScript = ''
|
||||||
|
machine.succeed("cryptsetup isLuks /dev/vda2");
|
||||||
|
machine.succeed("mountpoint /home");
|
||||||
|
'';
|
||||||
|
}
|
73
hosts/i15/partitions.nix
Normal file
73
hosts/i15/partitions.nix
Normal file
|
@ -0,0 +1,73 @@
|
||||||
|
{
|
||||||
|
disks ? [ "/dev/sda" ],
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
btrfs_options = [
|
||||||
|
"compress=zstd:3"
|
||||||
|
"noatime"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
{
|
||||||
|
disk.sda = {
|
||||||
|
type = "disk";
|
||||||
|
device = builtins.elemAt disks 0;
|
||||||
|
content = {
|
||||||
|
type = "table";
|
||||||
|
format = "gpt";
|
||||||
|
partitions = [
|
||||||
|
{
|
||||||
|
type = "partition";
|
||||||
|
name = "NIX_BOOT";
|
||||||
|
start = "1MiB";
|
||||||
|
end = "300MiB";
|
||||||
|
bootable = true;
|
||||||
|
content = {
|
||||||
|
type = "filesystem";
|
||||||
|
extraArgs = [
|
||||||
|
"-n"
|
||||||
|
"BOOT_I15"
|
||||||
|
];
|
||||||
|
format = "vfat";
|
||||||
|
mountpoint = "/boot";
|
||||||
|
# options = [ "defaults" ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
type = "partition";
|
||||||
|
name = "CRYPT_I15";
|
||||||
|
start = "300MiB";
|
||||||
|
end = "100%";
|
||||||
|
content = {
|
||||||
|
type = "luks";
|
||||||
|
name = "main";
|
||||||
|
keyFile = "/tmp/secret.key";
|
||||||
|
content = {
|
||||||
|
type = "btrfs";
|
||||||
|
extraArgs = [
|
||||||
|
"--label"
|
||||||
|
"ROOT_I15"
|
||||||
|
];
|
||||||
|
subvolumes =
|
||||||
|
let
|
||||||
|
mountOptions = btrfs_options;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
"/home" = {
|
||||||
|
inherit mountOptions;
|
||||||
|
};
|
||||||
|
"/nixos" = {
|
||||||
|
inherit mountOptions;
|
||||||
|
mountpoint = "/";
|
||||||
|
};
|
||||||
|
"/swap" = {
|
||||||
|
inherit mountOptions;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,106 +0,0 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
let
|
|
||||||
btrfs_options = [ "compress=zstd:3" "noatime" ];
|
|
||||||
btrfs_ssd = [ "ssd" "discard=async" ];
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
|
||||||
boot.initrd.availableKernelModules =
|
|
||||||
[ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
|
||||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
|
||||||
boot.kernelModules = [
|
|
||||||
"kvm-amd"
|
|
||||||
"amdgpu"
|
|
||||||
];
|
|
||||||
boot.kernelParams = [
|
|
||||||
"video=DP-1:1920x1080@144"
|
|
||||||
];
|
|
||||||
|
|
||||||
hardware.opengl.driSupport = true;
|
|
||||||
# # For 32 bit applications
|
|
||||||
hardware.opengl.driSupport32Bit = true;
|
|
||||||
|
|
||||||
# hardware.opengl.extraPackages = with pkgs; [ amdvlk ];
|
|
||||||
# # For 32 bit applications
|
|
||||||
# # Only available on unstable
|
|
||||||
# hardware.opengl.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ];
|
|
||||||
# environment.variables = { AMD_VULKAN_ICD = "RADV"; };
|
|
||||||
|
|
||||||
boot.extraModulePackages = [
|
|
||||||
((pkgs.amdgpu-kernel-module.override {
|
|
||||||
kernel = config.boot.kernelPackages.kernel;
|
|
||||||
}).overrideAttrs (_: {
|
|
||||||
patches = [ ../patches/kernel/amdgpu-disable-shutdown-on-overheating.diff ];
|
|
||||||
}))
|
|
||||||
];
|
|
||||||
fileSystems."/" = {
|
|
||||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd;
|
|
||||||
};
|
|
||||||
# boot.initrd.luks.reusePassphrases = true;
|
|
||||||
boot.initrd.luks.devices = {
|
|
||||||
"main" = {
|
|
||||||
bypassWorkqueues = true;
|
|
||||||
device = "/dev/disk/by-label/CRYPT_ROOT";
|
|
||||||
};
|
|
||||||
"data" = {
|
|
||||||
bypassWorkqueues = true;
|
|
||||||
device = "/dev/disk/by-label/CRYPT_DATA";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
|
||||||
fileSystems."/boot/efi" = {
|
|
||||||
device = "/dev/disk/by-label/NIXBOOT";
|
|
||||||
fsType = "vfat";
|
|
||||||
};
|
|
||||||
fileSystems."/home" = {
|
|
||||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd;
|
|
||||||
};
|
|
||||||
fileSystems."/home/lelgenio/Games" = {
|
|
||||||
device = "/dev/disk/by-label/BTRFS_DATA";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=@games" "nofail" ] ++ btrfs_options;
|
|
||||||
};
|
|
||||||
fileSystems."/home/lelgenio/Downloads/Torrents" = {
|
|
||||||
device = "/dev/disk/by-label/BTRFS_DATA";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=@torrents" "nofail" ] ++ btrfs_options;
|
|
||||||
};
|
|
||||||
fileSystems."/home/lelgenio/Música" = {
|
|
||||||
device = "/dev/disk/by-label/BTRFS_DATA";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=@music" "nofail" ] ++ btrfs_options;
|
|
||||||
};
|
|
||||||
services.udev.extraRules = ''
|
|
||||||
ACTION=="add", SUBSYSTEM=="pci", DRIVER=="pcieport", ATTR{power/wakeup}="disabled"
|
|
||||||
'';
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
|
|
||||||
powerManagement.cpuFreqGovernor = "ondemand";
|
|
||||||
hardware.cpu.amd.updateMicrocode =
|
|
||||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
networking.hostName = "monolith"; # Define your hostname.
|
|
||||||
|
|
||||||
# swap
|
|
||||||
fileSystems."/swap" = {
|
|
||||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
|
||||||
fsType = "btrfs";
|
|
||||||
# Note these options effect the entire BTRFS filesystem and not just this volume,
|
|
||||||
# with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts
|
|
||||||
options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd;
|
|
||||||
};
|
|
||||||
swapDevices = [{
|
|
||||||
device = "/swap/swapfile";
|
|
||||||
size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB
|
|
||||||
}];
|
|
||||||
}
|
|
181
hosts/monolith/default.nix
Normal file
181
hosts/monolith/default.nix
Normal file
|
@ -0,0 +1,181 @@
|
||||||
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
|
# and may be overwritten by future invocations. Please make changes
|
||||||
|
# to /etc/nixos/configuration.nix instead.
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
btrfs_options = [
|
||||||
|
"compress=zstd:3"
|
||||||
|
"noatime"
|
||||||
|
"x-systemd.device-timeout=0"
|
||||||
|
];
|
||||||
|
btrfs_ssd = [
|
||||||
|
"ssd"
|
||||||
|
"discard=async"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
./partition.nix
|
||||||
|
];
|
||||||
|
boot.initrd.availableKernelModules = [
|
||||||
|
"nvme"
|
||||||
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"usb_storage"
|
||||||
|
"usbhid"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
|
|
||||||
|
hardware.opentabletdriver.enable = true;
|
||||||
|
|
||||||
|
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
|
||||||
|
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||||
|
boot.kernelModules = [
|
||||||
|
"kvm-amd"
|
||||||
|
"amdgpu"
|
||||||
|
"zenpower"
|
||||||
|
];
|
||||||
|
boot.kernelParams = [
|
||||||
|
"amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
|
||||||
|
"video=DP-1:1920x1080@144"
|
||||||
|
# hibernation
|
||||||
|
# "resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/
|
||||||
|
# "resume_offset=36709632" # btrfs inspect-internal map-swapfile -r /swap/swapfile
|
||||||
|
];
|
||||||
|
systemd.sleep.extraConfig = ''
|
||||||
|
HibernateDelaySec=30s
|
||||||
|
SuspendState=mem
|
||||||
|
'';
|
||||||
|
|
||||||
|
hardware.opengl.driSupport = true;
|
||||||
|
# # For 32 bit applications
|
||||||
|
hardware.opengl.driSupport32Bit = true;
|
||||||
|
|
||||||
|
hardware.opengl.extraPackages = with pkgs; [
|
||||||
|
libva
|
||||||
|
libvdpau
|
||||||
|
vaapiVdpau
|
||||||
|
rocm-opencl-icd
|
||||||
|
rocm-opencl-runtime
|
||||||
|
rocmPackages.rocm-smi
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_6_1;
|
||||||
|
|
||||||
|
programs.corectrl = {
|
||||||
|
enable = true;
|
||||||
|
gpuOverclock = {
|
||||||
|
enable = true;
|
||||||
|
ppfeaturemask = "0xffffffff";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# fileSystems."/" = {
|
||||||
|
# device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
|
# fsType = "btrfs";
|
||||||
|
# options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
|
# };
|
||||||
|
# # boot.initrd.luks.reusePassphrases = true;
|
||||||
|
# boot.initrd.luks.devices = {
|
||||||
|
# "main" = {
|
||||||
|
# bypassWorkqueues = true;
|
||||||
|
# device = "/dev/disk/by-label/CRYPT_ROOT";
|
||||||
|
# };
|
||||||
|
# "data" = {
|
||||||
|
# bypassWorkqueues = true;
|
||||||
|
# device = "/dev/disk/by-label/CRYPT_DATA";
|
||||||
|
# };
|
||||||
|
# "bigboy" = {
|
||||||
|
# bypassWorkqueues = true;
|
||||||
|
# device = "/dev/disk/by-label/CRYPT_BIGBOY";
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
# boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||||
|
# fileSystems."/boot/efi" = {
|
||||||
|
# device = "/dev/disk/by-label/NIXBOOT";
|
||||||
|
# fsType = "vfat";
|
||||||
|
# };
|
||||||
|
# fileSystems."/home" = {
|
||||||
|
# device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
|
# fsType = "btrfs";
|
||||||
|
# options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
|
# };
|
||||||
|
# fileSystems."/home/lelgenio/Games" = {
|
||||||
|
# device = "/dev/disk/by-label/BTRFS_DATA";
|
||||||
|
# fsType = "btrfs";
|
||||||
|
# options = [
|
||||||
|
# "subvol=@games"
|
||||||
|
# "nofail"
|
||||||
|
# ] ++ btrfs_options;
|
||||||
|
# };
|
||||||
|
# fileSystems."/home/lelgenio/Downloads/Torrents" = {
|
||||||
|
# device = "/dev/disk/by-label/BTRFS_DATA";
|
||||||
|
# fsType = "btrfs";
|
||||||
|
# options = [
|
||||||
|
# "subvol=@torrents"
|
||||||
|
# "nofail"
|
||||||
|
# ] ++ btrfs_options;
|
||||||
|
# };
|
||||||
|
# fileSystems."/home/lelgenio/Música" = {
|
||||||
|
# device = "/dev/disk/by-label/BTRFS_DATA";
|
||||||
|
# fsType = "btrfs";
|
||||||
|
# options = [
|
||||||
|
# "subvol=@music"
|
||||||
|
# "nofail"
|
||||||
|
# ] ++ btrfs_options;
|
||||||
|
# };
|
||||||
|
# fileSystems."/home/lelgenio/.local/mount/data" = {
|
||||||
|
# device = "/dev/disk/by-label/BTRFS_DATA";
|
||||||
|
# fsType = "btrfs";
|
||||||
|
# options = [
|
||||||
|
# "subvol=@data"
|
||||||
|
# "nofail"
|
||||||
|
# ] ++ btrfs_options;
|
||||||
|
# };
|
||||||
|
# fileSystems."/home/lelgenio/.local/mount/bigboy" = {
|
||||||
|
# device = "/dev/disk/by-label/BTRFS_BIGBOY";
|
||||||
|
# fsType = "btrfs";
|
||||||
|
# options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
|
# };
|
||||||
|
|
||||||
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
|
||||||
|
powerManagement.cpuFreqGovernor = "ondemand";
|
||||||
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
networking.hostName = "monolith"; # Define your hostname.
|
||||||
|
|
||||||
|
services.udev.extraRules = ''
|
||||||
|
# Fix broken suspend with Logitech USB dongle
|
||||||
|
# `lsusb | grep Logitech` will return "vendor:product"
|
||||||
|
ACTION=="add" SUBSYSTEM=="usb" ATTR{idVendor}=="046d" ATTR{idProduct}=="c547" ATTR{power/wakeup}="disabled"
|
||||||
|
# Force all disks to use mq-deadline scheduler
|
||||||
|
# For some reason "noop" is used by default which is kinda bad when io is saturated
|
||||||
|
ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ATTR{../queue/scheduler}="mq-deadline"
|
||||||
|
'';
|
||||||
|
|
||||||
|
# swap
|
||||||
|
# fileSystems."/swap" = {
|
||||||
|
# device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
|
# fsType = "btrfs";
|
||||||
|
# # Note these options effect the entire BTRFS filesystem and not just this volume,
|
||||||
|
# # with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts
|
||||||
|
# options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
|
# };
|
||||||
|
# swapDevices = [
|
||||||
|
# {
|
||||||
|
# device = "/swap/swapfile";
|
||||||
|
# size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB
|
||||||
|
# }
|
||||||
|
# ];
|
||||||
|
}
|
68
hosts/monolith/partition.nix
Normal file
68
hosts/monolith/partition.nix
Normal file
|
@ -0,0 +1,68 @@
|
||||||
|
let
|
||||||
|
btrfs_options = [
|
||||||
|
"compress=zstd:3"
|
||||||
|
"noatime"
|
||||||
|
"x-systemd.device-timeout=0"
|
||||||
|
];
|
||||||
|
btrfs_ssd = btrfs_options ++ [
|
||||||
|
"ssd"
|
||||||
|
"discard=async"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
{
|
||||||
|
disko.devices = {
|
||||||
|
disk = {
|
||||||
|
bigboy_disk = {
|
||||||
|
type = "disk";
|
||||||
|
device = "/dev/nvme0n1";
|
||||||
|
content = {
|
||||||
|
type = "gpt";
|
||||||
|
partitions = {
|
||||||
|
ESP = {
|
||||||
|
size = "2G";
|
||||||
|
type = "EF00";
|
||||||
|
content = {
|
||||||
|
type = "filesystem";
|
||||||
|
format = "vfat";
|
||||||
|
mountpoint = "/boot";
|
||||||
|
mountOptions = [ "defaults" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
luks = {
|
||||||
|
size = "100%";
|
||||||
|
content = {
|
||||||
|
type = "luks";
|
||||||
|
name = "bigboy";
|
||||||
|
# disable settings.keyFile if you want to use interactive password entry
|
||||||
|
passwordFile = "/tmp/secret.key"; # Interactive
|
||||||
|
# settings = {
|
||||||
|
# allowDiscards = true;
|
||||||
|
# keyFile = "/tmp/secret.key";
|
||||||
|
# };
|
||||||
|
# additionalKeyFiles = [ "/tmp/additionalSecret.key" ];
|
||||||
|
content = {
|
||||||
|
type = "btrfs";
|
||||||
|
extraArgs = [ "-f" ];
|
||||||
|
subvolumes = {
|
||||||
|
"/@nixos" = {
|
||||||
|
mountpoint = "/";
|
||||||
|
mountOptions = btrfs_ssd;
|
||||||
|
};
|
||||||
|
"/@home" = {
|
||||||
|
mountpoint = "/home";
|
||||||
|
mountOptions = btrfs_ssd;
|
||||||
|
};
|
||||||
|
"/@swap" = {
|
||||||
|
mountpoint = "/.swapvol";
|
||||||
|
swap.swapfile.size = "32G";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
72
hosts/phantom/default.nix
Normal file
72
hosts/phantom/default.nix
Normal file
|
@ -0,0 +1,72 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./vpsadminos.nix
|
||||||
|
inputs.agenix.nixosModules.default
|
||||||
|
../../system/nix.nix
|
||||||
|
./hardware-config.nix
|
||||||
|
./mastodon.nix
|
||||||
|
./nextcloud.nix
|
||||||
|
./nginx.nix
|
||||||
|
./syncthing.nix
|
||||||
|
./users.nix
|
||||||
|
./writefreely.nix
|
||||||
|
./email.nix
|
||||||
|
./forgejo.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
networking.hostName = "phantom";
|
||||||
|
|
||||||
|
services.nginx.virtualHosts."lelgenio.com" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
root = pkgs.runCommand "www-dir" { } ''
|
||||||
|
mkdir -p $out
|
||||||
|
cat > $out/index.html <<EOF
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<body>
|
||||||
|
<h1>
|
||||||
|
Nothing to see here!
|
||||||
|
<h1>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
EOF
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
# # Enable networking
|
||||||
|
# networking.networkmanager.enable = true;
|
||||||
|
# Set your time zone.
|
||||||
|
time.timeZone = "America/Sao_Paulo";
|
||||||
|
# Select internationalisation properties.
|
||||||
|
i18n.defaultLocale = "pt_BR.utf8";
|
||||||
|
|
||||||
|
boot.kernel.sysctl."fs.inotify.max_user_watches" = 1048576;
|
||||||
|
|
||||||
|
age = {
|
||||||
|
identityPaths = [ "/root/.ssh/id_rsa" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
system.autoUpgrade = {
|
||||||
|
enable = true;
|
||||||
|
dates = "04:40";
|
||||||
|
operation = "switch";
|
||||||
|
flags = [
|
||||||
|
"--update-input"
|
||||||
|
"nixpkgs"
|
||||||
|
"--no-write-lock-file"
|
||||||
|
"-L"
|
||||||
|
];
|
||||||
|
flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
|
||||||
|
};
|
||||||
|
|
||||||
|
networking.firewall.allowedTCPPorts = [ 8745 ];
|
||||||
|
|
||||||
|
system.stateVersion = "23.05"; # Never change this
|
||||||
|
}
|
58
hosts/phantom/email.nix
Normal file
58
hosts/phantom/email.nix
Normal file
|
@ -0,0 +1,58 @@
|
||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
imports = [ inputs.nixos-mailserver.nixosModules.mailserver ];
|
||||||
|
|
||||||
|
mailserver = {
|
||||||
|
enable = true;
|
||||||
|
fqdn = "lelgenio.com";
|
||||||
|
domains = [
|
||||||
|
"lelgenio.xyz"
|
||||||
|
"git.lelgenio.xyz"
|
||||||
|
"lelgenio.com"
|
||||||
|
"git.lelgenio.com"
|
||||||
|
"social.lelgenio.com"
|
||||||
|
];
|
||||||
|
certificateScheme = "acme-nginx";
|
||||||
|
# Create passwords with
|
||||||
|
# nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
|
||||||
|
loginAccounts = {
|
||||||
|
"lelgenio@lelgenio.com" = {
|
||||||
|
hashedPassword = "$2y$05$z5s7QCXcs5uTFsfyYpwNJeWzb3RmzgWxNgcPCr0zjSytkLFF/qZmS";
|
||||||
|
aliases = [
|
||||||
|
"postmaster@lelgenio.com"
|
||||||
|
"lelgenio@lelgenio.xyz"
|
||||||
|
"lelgenio@lelgenio.xyz"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
"noreply@git.lelgenio.com" = {
|
||||||
|
hashedPassword = "$2b$05$TmR1R7ZwXfec7yrOfeBL7u3ZtyXf0up5dEO6uMWSvb/O7LPEm.j0.";
|
||||||
|
};
|
||||||
|
"noreply@social.lelgenio.com" = {
|
||||||
|
hashedPassword = "$2b$05$DcA9xMdvHqqQMZw2.zybI.vfKsQAJtaQ/JB.t9AHu6psstWq97m2C";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Prefer ipv4 and use main ipv6 to avoid reverse DNS issues
|
||||||
|
services.postfix.extraConfig = ''
|
||||||
|
smtp_address_preference = ipv4
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Webmail
|
||||||
|
services.roundcube = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.roundcube.withPlugins (p: [ p.carddav ]);
|
||||||
|
hostName = "mail.lelgenio.com";
|
||||||
|
extraConfig = ''
|
||||||
|
$config['smtp_host'] = "tls://${config.mailserver.fqdn}:587";
|
||||||
|
$config['smtp_user'] = "%u";
|
||||||
|
$config['smtp_pass'] = "%p";
|
||||||
|
$config['plugins'] = [ "carddav", "archive" ];
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
53
hosts/phantom/forgejo.nix
Normal file
53
hosts/phantom/forgejo.nix
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
cfg = config.services.forgejo;
|
||||||
|
srv = cfg.settings.server;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
services.nginx = {
|
||||||
|
virtualHosts.${cfg.settings.server.DOMAIN} = {
|
||||||
|
forceSSL = true;
|
||||||
|
enableACME = true;
|
||||||
|
extraConfig = ''
|
||||||
|
client_max_body_size 512M;
|
||||||
|
'';
|
||||||
|
locations."/".proxyPass = "http://localhost:${toString srv.HTTP_PORT}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services.forgejo = {
|
||||||
|
enable = true;
|
||||||
|
database.type = "postgres";
|
||||||
|
lfs.enable = true;
|
||||||
|
settings = {
|
||||||
|
service.DISABLE_REGISTRATION = true;
|
||||||
|
actions = {
|
||||||
|
ENABLED = true;
|
||||||
|
DEFAULT_ACTIONS_URL = "github";
|
||||||
|
};
|
||||||
|
server = {
|
||||||
|
DOMAIN = "git.lelgenio.com";
|
||||||
|
HTTP_PORT = 3000;
|
||||||
|
ROOT_URL = "https://${srv.DOMAIN}/";
|
||||||
|
};
|
||||||
|
mailer = {
|
||||||
|
ENABLED = true;
|
||||||
|
SMTP_ADDR = "mail.lelgenio.com";
|
||||||
|
FROM = "noreply@git.lelgenio.com";
|
||||||
|
USER = "noreply@git.lelgenio.com";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
mailerPasswordFile = config.age.secrets.phantom-forgejo-mailer-password.path;
|
||||||
|
};
|
||||||
|
|
||||||
|
age.secrets.phantom-forgejo-mailer-password = {
|
||||||
|
file = ../../secrets/phantom-forgejo-mailer-password.age;
|
||||||
|
mode = "400";
|
||||||
|
owner = "forgejo";
|
||||||
|
};
|
||||||
|
}
|
14
hosts/phantom/hardware-config.nix
Normal file
14
hosts/phantom/hardware-config.nix
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "/swap/swapfile";
|
||||||
|
size = (1024 * 2); # 2 GB
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
29
hosts/phantom/mastodon.nix
Normal file
29
hosts/phantom/mastodon.nix
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
services.mastodon = {
|
||||||
|
enable = true;
|
||||||
|
configureNginx = true;
|
||||||
|
localDomain = "social.lelgenio.com";
|
||||||
|
smtp = {
|
||||||
|
authenticate = true;
|
||||||
|
host = "lelgenio.com";
|
||||||
|
fromAddress = "noreply@social.lelgenio.com";
|
||||||
|
user = "noreply@social.lelgenio.com";
|
||||||
|
passwordFile = config.age.secrets.phantom-mastodon-mailer-password.path;
|
||||||
|
};
|
||||||
|
streamingProcesses = 2;
|
||||||
|
extraConfig.SINGLE_USER_MODE = "true";
|
||||||
|
mediaAutoRemove.olderThanDays = 10;
|
||||||
|
};
|
||||||
|
|
||||||
|
age.secrets.phantom-mastodon-mailer-password = {
|
||||||
|
file = ../../secrets/phantom-mastodon-mailer-password.age;
|
||||||
|
mode = "400";
|
||||||
|
owner = "mastodon";
|
||||||
|
};
|
||||||
|
}
|
31
hosts/phantom/nextcloud.nix
Normal file
31
hosts/phantom/nextcloud.nix
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
services.nextcloud = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.nextcloud29;
|
||||||
|
hostName = "cloud.lelgenio.com";
|
||||||
|
https = true;
|
||||||
|
config = {
|
||||||
|
adminpassFile = config.age.secrets.phantom-nextcloud.path;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
services.nginx.virtualHosts.${config.services.nextcloud.hostName} = {
|
||||||
|
forceSSL = true;
|
||||||
|
enableACME = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
age = {
|
||||||
|
secrets.phantom-nextcloud = {
|
||||||
|
file = ../../secrets/phantom-nextcloud.age;
|
||||||
|
mode = "400";
|
||||||
|
owner = "nextcloud";
|
||||||
|
group = "nextcloud";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
46
hosts/phantom/nginx.nix
Normal file
46
hosts/phantom/nginx.nix
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
services.nginx = {
|
||||||
|
enable = true;
|
||||||
|
recommendedProxySettings = true;
|
||||||
|
recommendedTlsSettings = true;
|
||||||
|
recommendedOptimisation = true;
|
||||||
|
recommendedGzipSettings = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Redirect *lelgenio.xyz -> *lelgenio.com
|
||||||
|
services.nginx.virtualHosts =
|
||||||
|
lib.mapAttrs' (key: value: lib.nameValuePair "${key}lelgenio.xyz" value)
|
||||||
|
(
|
||||||
|
lib.genAttrs
|
||||||
|
[
|
||||||
|
""
|
||||||
|
"social."
|
||||||
|
"blog."
|
||||||
|
"cloud."
|
||||||
|
"mail."
|
||||||
|
"git."
|
||||||
|
"syncthing."
|
||||||
|
]
|
||||||
|
(name: {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/".return = "301 $scheme://${name}lelgenio.com$request_uri";
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
security.acme = {
|
||||||
|
acceptTerms = true;
|
||||||
|
defaults.email = "lelgenio@disroot.org";
|
||||||
|
};
|
||||||
|
|
||||||
|
networking.firewall.allowedTCPPorts = [
|
||||||
|
80
|
||||||
|
443
|
||||||
|
];
|
||||||
|
}
|
29
hosts/phantom/syncthing.nix
Normal file
29
hosts/phantom/syncthing.nix
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
|
||||||
|
services.syncthing = {
|
||||||
|
enable = true;
|
||||||
|
dataDir = "/var/lib/syncthing-data";
|
||||||
|
guiAddress = "0.0.0.0:8384";
|
||||||
|
openDefaultPorts = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
services.nginx.virtualHosts."syncthing.lelgenio.com" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://127.0.0.1:8384";
|
||||||
|
extraConfig =
|
||||||
|
# required when the target is also TLS server with multiple hosts
|
||||||
|
"proxy_ssl_server_name on;"
|
||||||
|
+
|
||||||
|
# required when the server wants to use HTTP Authentication
|
||||||
|
"proxy_pass_header Authorization;";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
48
hosts/phantom/users.nix
Normal file
48
hosts/phantom/users.nix
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
security.rtkit.enable = true;
|
||||||
|
services.openssh = {
|
||||||
|
enable = true;
|
||||||
|
ports = [
|
||||||
|
9022
|
||||||
|
22
|
||||||
|
];
|
||||||
|
settings = {
|
||||||
|
PasswordAuthentication = false;
|
||||||
|
KbdInteractiveAuthentication = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
|
users.mutableUsers = false;
|
||||||
|
users.users.lelgenio = {
|
||||||
|
isNormalUser = true;
|
||||||
|
description = "Leonardo Eugênio";
|
||||||
|
hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
|
||||||
|
extraGroups = [
|
||||||
|
"networkmanager"
|
||||||
|
"wheel"
|
||||||
|
"docker"
|
||||||
|
"adbusers"
|
||||||
|
"bluetooth"
|
||||||
|
"corectrl"
|
||||||
|
"vboxusers"
|
||||||
|
];
|
||||||
|
shell = pkgs.fish;
|
||||||
|
openssh.authorizedKeys.keys = [
|
||||||
|
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
users.users.root = {
|
||||||
|
shell = pkgs.fish;
|
||||||
|
openssh.authorizedKeys.keys = [
|
||||||
|
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"
|
||||||
|
];
|
||||||
|
initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3";
|
||||||
|
};
|
||||||
|
security.sudo.wheelNeedsPassword = false;
|
||||||
|
|
||||||
|
programs.fish.enable = true;
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [ git ];
|
||||||
|
}
|
76
hosts/phantom/vpsadminos.nix
Normal file
76
hosts/phantom/vpsadminos.nix
Normal file
|
@ -0,0 +1,76 @@
|
||||||
|
# This file provides compatibility for NixOS to run in a container on vpsAdminOS
|
||||||
|
# hosts.
|
||||||
|
#
|
||||||
|
# If you're experiencing issues, try updating this file to the latest version
|
||||||
|
# from vpsAdminOS repository:
|
||||||
|
#
|
||||||
|
# https://github.com/vpsfreecz/vpsadminos/blob/staging/os/lib/nixos-container/vpsadminos.nix
|
||||||
|
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib;
|
||||||
|
let
|
||||||
|
nameservers = [
|
||||||
|
"1.1.1.1"
|
||||||
|
"2606:4700:4700::1111"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
{
|
||||||
|
networking.nameservers = mkDefault nameservers;
|
||||||
|
services.resolved = mkDefault { fallbackDns = nameservers; };
|
||||||
|
networking.dhcpcd.extraConfig = "noipv4ll";
|
||||||
|
|
||||||
|
systemd.services.systemd-sysctl.enable = false;
|
||||||
|
systemd.services.systemd-oomd.enable = false;
|
||||||
|
systemd.sockets."systemd-journald-audit".enable = false;
|
||||||
|
systemd.mounts = [
|
||||||
|
{
|
||||||
|
where = "/sys/kernel/debug";
|
||||||
|
enable = false;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
systemd.services.rpc-gssd.enable = false;
|
||||||
|
|
||||||
|
# Due to our restrictions in /sys, the default systemd-udev-trigger fails
|
||||||
|
# on accessing PCI devices, etc. Override it to match only network devices.
|
||||||
|
# In addition, boot.isContainer prevents systemd-udev-trigger.service from
|
||||||
|
# being enabled at all, so add it explicitly.
|
||||||
|
systemd.additionalUpstreamSystemUnits = [ "systemd-udev-trigger.service" ];
|
||||||
|
systemd.services.systemd-udev-trigger.serviceConfig.ExecStart = [
|
||||||
|
""
|
||||||
|
"-udevadm trigger --subsystem-match=net --action=add"
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.isContainer = true;
|
||||||
|
boot.enableContainers = mkDefault true;
|
||||||
|
boot.loader.initScript.enable = true;
|
||||||
|
boot.specialFileSystems."/run/keys".fsType = mkForce "tmpfs";
|
||||||
|
boot.systemdExecutable = mkDefault "/run/current-system/systemd/lib/systemd/systemd systemd.unified_cgroup_hierarchy=0";
|
||||||
|
|
||||||
|
# Overrides for <nixpkgs/nixos/modules/virtualisation/container-config.nix>
|
||||||
|
documentation.enable = mkOverride 500 true;
|
||||||
|
documentation.nixos.enable = mkOverride 500 true;
|
||||||
|
networking.useHostResolvConf = mkOverride 500 false;
|
||||||
|
services.openssh.startWhenNeeded = mkOverride 500 false;
|
||||||
|
|
||||||
|
# Bring up the network, /ifcfg.{add,del} are supplied by the vpsAdminOS host
|
||||||
|
systemd.services.networking-setup = {
|
||||||
|
description = "Load network configuration provided by the vpsAdminOS host";
|
||||||
|
before = [ "network.target" ];
|
||||||
|
wantedBy = [ "network.target" ];
|
||||||
|
after = [ "network-pre.target" ];
|
||||||
|
path = [ pkgs.iproute2 ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
RemainAfterExit = true;
|
||||||
|
ExecStart = "${pkgs.bash}/bin/bash /ifcfg.add";
|
||||||
|
ExecStop = "${pkgs.bash}/bin/bash /ifcfg.del";
|
||||||
|
};
|
||||||
|
unitConfig.ConditionPathExists = "/ifcfg.add";
|
||||||
|
restartIfChanged = false;
|
||||||
|
};
|
||||||
|
}
|
30
hosts/phantom/writefreely.nix
Normal file
30
hosts/phantom/writefreely.nix
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
services.writefreely = {
|
||||||
|
enable = true;
|
||||||
|
acme.enable = true;
|
||||||
|
nginx.enable = true;
|
||||||
|
nginx.forceSSL = true;
|
||||||
|
host = "blog.lelgenio.com";
|
||||||
|
admin.name = "lelgenio";
|
||||||
|
admin.initialPasswordFile = config.age.secrets.phantom-writefreely.path;
|
||||||
|
settings.app = {
|
||||||
|
site_name = "Leo's blog";
|
||||||
|
single_user = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
age = {
|
||||||
|
secrets.phantom-writefreely = {
|
||||||
|
file = ../../secrets/phantom-writefreely.age;
|
||||||
|
mode = "400";
|
||||||
|
owner = "writefreely";
|
||||||
|
group = "writefreely";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,13 +1,25 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules =
|
boot.initrd.availableKernelModules = [
|
||||||
[ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
"nvme"
|
||||||
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"usb_storage"
|
||||||
|
"usbhid"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
@ -18,8 +30,7 @@
|
||||||
options = [ "subvol=nixos" ];
|
options = [ "subvol=nixos" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."pixie".device =
|
boot.initrd.luks.devices."pixie".device = "/dev/disk/by-uuid/f4ae5858-d2d6-4cd1-a054-bf5147a9a928";
|
||||||
"/dev/disk/by-uuid/f4ae5858-d2d6-4cd1-a054-bf5147a9a928";
|
|
||||||
|
|
||||||
fileSystems."/home" = {
|
fileSystems."/home" = {
|
||||||
device = "/dev/mapper/pixie";
|
device = "/dev/mapper/pixie";
|
||||||
|
@ -46,8 +57,7 @@
|
||||||
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.veth74f3ffc.useDHCP = lib.mkDefault true;
|
# networking.interfaces.veth74f3ffc.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
hardware.cpu.amd.updateMicrocode =
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
|
|
||||||
networking.hostName = "pixie"; # Define your hostname.
|
networking.hostName = "pixie"; # Define your hostname.
|
||||||
}
|
}
|
|
@ -1,16 +1,34 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
btrfs_options = [ "compress=zstd:3" "noatime" ];
|
btrfs_options = [
|
||||||
btrfs_ssd = [ "ssd" "discard=async" ];
|
"compress=zstd:3"
|
||||||
|
"noatime"
|
||||||
|
"x-systemd.device-timeout=0"
|
||||||
|
];
|
||||||
|
btrfs_ssd = [
|
||||||
|
"ssd"
|
||||||
|
"discard=async"
|
||||||
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules =
|
boot.initrd.availableKernelModules = [
|
||||||
[ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"usb_storage"
|
||||||
|
"usbhid"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
boot.initrd.kernelModules = [ "i915" ];
|
boot.initrd.kernelModules = [ "i915" ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
@ -46,10 +64,12 @@ in
|
||||||
options = [ "subvol=@swap" ] ++ btrfs_ssd;
|
options = [ "subvol=@swap" ] ++ btrfs_ssd;
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [{
|
swapDevices = [
|
||||||
device = "/swap/swapfile";
|
{
|
||||||
size = (1024 * 8);
|
device = "/swap/swapfile";
|
||||||
}];
|
size = (1024 * 8);
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
@ -59,8 +79,7 @@ in
|
||||||
# networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||||
hardware.cpu.intel.updateMicrocode =
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
|
|
||||||
networking.hostName = "rainbow"; # Define your hostname.
|
networking.hostName = "rainbow"; # Define your hostname.
|
||||||
}
|
}
|
|
@ -1,63 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -xe
|
|
||||||
|
|
||||||
settle() {
|
|
||||||
udevadm trigger --subsystem-match=block
|
|
||||||
udevadm settle
|
|
||||||
}
|
|
||||||
|
|
||||||
lsblk
|
|
||||||
echo 'Enter the name of the device to WIPE and install (something like "sda"):'
|
|
||||||
read DRIVE_ID
|
|
||||||
|
|
||||||
echo 'Enter a passphrase to encrypt the disk:'
|
|
||||||
read -s DRIVE_PASSPHRASE
|
|
||||||
|
|
||||||
echo "Creating partition table..."
|
|
||||||
parted -s "/dev/${DRIVE_ID}" -- mklabel gpt
|
|
||||||
|
|
||||||
echo "Creating EFI system partition..."
|
|
||||||
parted -s "/dev/${DRIVE_ID}" -- mkpart ESP 1MiB 1GiB
|
|
||||||
parted -s "/dev/${DRIVE_ID}" -- set 1 boot on
|
|
||||||
mkfs.fat -F32 "/dev/${DRIVE_ID}1" -n NIX_BOOT
|
|
||||||
|
|
||||||
echo "Creating encrypted root partition..."
|
|
||||||
parted -s "/dev/${DRIVE_ID}" -- mkpart luks 1GiB 100%
|
|
||||||
echo "$DRIVE_PASSPHRASE" | cryptsetup --batch-mode luksFormat --label CRYPT_ROOT "/dev/${DRIVE_ID}2"
|
|
||||||
settle
|
|
||||||
echo "$DRIVE_PASSPHRASE" | cryptsetup luksOpen /dev/disk/by-label/CRYPT_ROOT "crypt_root"
|
|
||||||
|
|
||||||
echo "Creating btrfs partition..."
|
|
||||||
mkfs.btrfs --quiet --label NIX_ROOT /dev/mapper/"crypt_root"
|
|
||||||
MNTPOINT=$(mktemp -d)
|
|
||||||
mount /dev/mapper/"crypt_root" "$MNTPOINT"
|
|
||||||
|
|
||||||
echo "Creating subvolumes..."
|
|
||||||
btrfs subvolume create "$MNTPOINT"/@nixos
|
|
||||||
btrfs subvolume create "$MNTPOINT"/@home
|
|
||||||
btrfs subvolume create "$MNTPOINT"/@swap
|
|
||||||
|
|
||||||
echo "Closing btrfs partition..."
|
|
||||||
umount -Rl "$MNTPOINT"
|
|
||||||
rm -rf "$MNTPOINT"
|
|
||||||
|
|
||||||
echo "Mounting root btrfs submodule to '$MNTPOINT' ..."
|
|
||||||
MNTPOINT=$(mktemp -d)
|
|
||||||
mount /dev/disk/by-label/NIX_ROOT "$MNTPOINT" -o subvol=@nixos,noatime,compress=zstd
|
|
||||||
|
|
||||||
echo "Creating and mounting EFI system partition mountpoint..."
|
|
||||||
mkdir -p "$MNTPOINT/boot"
|
|
||||||
mount /dev/disk/by-label/NIX_BOOT "$MNTPOINT/boot"
|
|
||||||
|
|
||||||
echo "Creating home partition mountpoint..."
|
|
||||||
mkdir -p "$MNTPOINT/home"
|
|
||||||
mount /dev/disk/by-label/NIX_ROOT "$MNTPOINT/home" -o subvol=@home,noatime,compress=zstd
|
|
||||||
|
|
||||||
echo "Swapfile"
|
|
||||||
mkdir -p "$MNTPOINT/swap"
|
|
||||||
mount /dev/disk/by-label/NIX_ROOT "$MNTPOINT/swap" -o subvol=@swap,noatime
|
|
||||||
|
|
||||||
# echo "Installing system..."
|
|
||||||
nixos-generate-config --root "$MNTPOINT"
|
|
||||||
# nixos-install --root "$MNTPOINT"
|
|
|
@ -1,83 +1,82 @@
|
||||||
{ inputs, packages, ... }: rec {
|
{ inputs, packages, ... }:
|
||||||
|
rec {
|
||||||
all = [
|
all = [
|
||||||
nur
|
|
||||||
scripts
|
scripts
|
||||||
sway
|
|
||||||
unstable
|
|
||||||
sixel-patches
|
|
||||||
themes
|
themes
|
||||||
new-packages
|
new-packages
|
||||||
patches
|
patches
|
||||||
variables
|
lib_extended
|
||||||
|
disko
|
||||||
];
|
];
|
||||||
|
|
||||||
nur = inputs.nur.overlay;
|
|
||||||
scripts = (import ../scripts);
|
scripts = (import ../scripts);
|
||||||
|
|
||||||
sway = (import ./sway.nix);
|
themes = (
|
||||||
|
final: prev: {
|
||||||
|
papirus_red = (final.papirus-icon-theme.override { color = "red"; });
|
||||||
|
orchis_theme_compact = (
|
||||||
|
final.orchis-theme.override {
|
||||||
|
border-radius = 0;
|
||||||
|
tweaks = [
|
||||||
|
"compact"
|
||||||
|
"solid"
|
||||||
|
];
|
||||||
|
}
|
||||||
|
);
|
||||||
|
nerdfonts_fira_hack = (
|
||||||
|
final.nerdfonts.override {
|
||||||
|
fonts = [
|
||||||
|
"FiraCode"
|
||||||
|
"Hack"
|
||||||
|
];
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
unstable = (final: prev: {
|
new-packages = (
|
||||||
unstable = import inputs.nixpkgs-unstable {
|
final: prev:
|
||||||
inherit (prev) system config;
|
packages
|
||||||
};
|
// {
|
||||||
});
|
dhist = inputs.dhist.packages.${prev.system}.dhist;
|
||||||
|
demoji = inputs.demoji.packages.${prev.system}.default;
|
||||||
|
tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
|
||||||
|
wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
sixel-patches = (import ./sixel-patches.nix (inputs));
|
patches = (
|
||||||
|
final: prev: {
|
||||||
themes = (final: prev: {
|
mySway = prev.sway.override {
|
||||||
material-wifi-icons = final.stdenv.mkDerivation rec {
|
sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
|
||||||
name = "material-wifi-icons";
|
patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
|
||||||
src = inputs.material-wifi-icons;
|
});
|
||||||
installPhase =
|
|
||||||
let dest = "$out/share/fonts/${name}";
|
|
||||||
in ''
|
|
||||||
mkdir -p ${dest}
|
|
||||||
cp material-wifi.ttf ${dest}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
papirus_red = (final.unstable.papirus-icon-theme.override { color = "red"; });
|
|
||||||
orchis_theme_compact = (final.orchis-theme.override { tweaks = [ "compact" "solid" ]; });
|
|
||||||
nerdfonts_fira_hack = (final.nerdfonts.override { fonts = [ "FiraCode" "Hack" ]; });
|
|
||||||
});
|
|
||||||
|
|
||||||
new-packages = (final: prev: packages // {
|
|
||||||
dhist = inputs.dhist.packages.${prev.system}.dhist;
|
|
||||||
demoji = inputs.demoji.packages.${prev.system}.default;
|
|
||||||
dzgui = inputs.dzgui.packages.${prev.system}.dzgui;
|
|
||||||
mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper;
|
|
||||||
|
|
||||||
sea-orm-cli = inputs.sea-orm-cli.legacyPackages.${prev.system}.sea-orm-cli;
|
|
||||||
webcord = (prev.webcord or prev.unstable.webcord).overrideAttrs (old: {
|
|
||||||
patches = (old.patches or [ ]) ++ [ ../patches/webcord/fix-reading-config.patch ];
|
|
||||||
});
|
|
||||||
nil-lsp = inputs.nil-lsp.packages.${prev.system}.nil;
|
|
||||||
});
|
|
||||||
|
|
||||||
patches = (final: prev: {
|
|
||||||
bemenu = prev.bemenu.overrideAttrs (o: {
|
|
||||||
preBuild = ''
|
|
||||||
sed -i 's/ZWLR_LAYER_SHELL_V1_LAYER_TOP/ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY/g' lib/renderers/wayland/window.c
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
|
|
||||||
patches = old.patches
|
|
||||||
++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
|
|
||||||
});
|
|
||||||
steam = prev.unstable.steam.override {
|
|
||||||
extraPkgs = pkgs: with pkgs; [ capitaine-cursors bibata-cursors ];
|
|
||||||
};
|
|
||||||
|
|
||||||
qutebrowser = prev.qutebrowser.overrideAttrs (old: {
|
|
||||||
src = prev.fetchFromGitHub {
|
|
||||||
owner = "pinusc";
|
|
||||||
repo = "qutebrowser";
|
|
||||||
rev = "feature/tree-tabs";
|
|
||||||
sha256 = "sha256-kHxZ3AzbfPJ3im1kQNn8DDlKBn+yPI4SLbSZuBQrUWY=";
|
|
||||||
};
|
};
|
||||||
});
|
}
|
||||||
});
|
);
|
||||||
|
|
||||||
variables = (final: prev: {
|
lib_extended = (
|
||||||
uservars = import ../user/variables.nix;
|
final: prev: {
|
||||||
});
|
lib = prev.lib // rec {
|
||||||
|
# Utility function
|
||||||
|
# Input: [{v1=1;} {v2=2;}]
|
||||||
|
# Output: {v1=1;v2=2;}
|
||||||
|
mergeAttrsSet = prev.lib.foldAttrs (n: _: n) { };
|
||||||
|
|
||||||
|
# Easily translate imperative templating code
|
||||||
|
# Input: [ 1 2 ] (num: { "v${num}" = num; })
|
||||||
|
# Output: {v1=1;v2=2;}
|
||||||
|
forEachMerge = list: func: mergeAttrsSet (prev.lib.forEach list func);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
disko = final: prev: {
|
||||||
|
makeDiskoTest =
|
||||||
|
let
|
||||||
|
makeTest = import (prev.path + "/nixos/tests/make-test-python.nix");
|
||||||
|
eval-config = import (prev.path + "/nixos/lib/eval-config.nix");
|
||||||
|
in
|
||||||
|
(prev.callPackage "${inputs.disko}/tests/lib.nix" { inherit makeTest eval-config; }).makeDiskoTest;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +0,0 @@
|
||||||
inputs: (final: prev: {
|
|
||||||
alacritty = (prev.unstable.alacritty.overrideAttrs (old-alacritty: rec {
|
|
||||||
src = inputs.alacritty-sixel;
|
|
||||||
cargoDeps = old-alacritty.cargoDeps.overrideAttrs (prev.lib.const {
|
|
||||||
inherit src;
|
|
||||||
outputHash = "sha256-jqjYMVkH32z5EFgafiOYAOc5Q/IYs0jjJeqRb0L6WsY=";
|
|
||||||
});
|
|
||||||
}));
|
|
||||||
ranger = (prev.ranger.overridePythonAttrs (old-ranger: rec {
|
|
||||||
src = inputs.ranger-sixel;
|
|
||||||
checkInputs = [ ];
|
|
||||||
propagatedBuildInputs = with prev.python3Packages;
|
|
||||||
old-ranger.propagatedBuildInputs ++ [ astroid pylint pytest ];
|
|
||||||
}));
|
|
||||||
})
|
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
(pkgs: _: {
|
|
||||||
# bash script to let dbus know about important env variables and
|
|
||||||
# propogate them to relevent services run at the end of sway config
|
|
||||||
# see
|
|
||||||
# https://github.com/emersion/xdg-desktop-portal-wlr/wiki/"It-doesn't-work"-Troubleshooting-Checklist
|
|
||||||
# note: this is pretty much the same as /etc/sway/config.d/nixos.conf but also restarts
|
|
||||||
# some user services to make sure they have the correct environment variables
|
|
||||||
dbus-sway-environment = pkgs.writeTextFile {
|
|
||||||
name = "dbus-sway-environment";
|
|
||||||
destination = "/bin/dbus-sway-environment";
|
|
||||||
executable = true;
|
|
||||||
text = ''
|
|
||||||
systemctl --user import-environment
|
|
||||||
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
|
|
||||||
# systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr
|
|
||||||
# systemctl --user start pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
})
|
|
|
@ -1,44 +0,0 @@
|
||||||
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c
|
|
||||||
index bfe80ac0a..5343b8b86 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c
|
|
||||||
@@ -614,7 +614,6 @@ int phm_irq_process(struct amdgpu_device *adev,
|
|
||||||
* Try to do a graceful shutdown to prevent further damage.
|
|
||||||
*/
|
|
||||||
dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n");
|
|
||||||
- orderly_poweroff(true);
|
|
||||||
} else if (src_id == VISLANDS30_IV_SRCID_CG_TSS_THERMAL_HIGH_TO_LOW)
|
|
||||||
dev_emerg(adev->dev, "ERROR: GPU under temperature range detected!\n");
|
|
||||||
else if (src_id == VISLANDS30_IV_SRCID_GPIO_19) {
|
|
||||||
@@ -633,7 +632,6 @@ int phm_irq_process(struct amdgpu_device *adev,
|
|
||||||
* Try to do a graceful shutdown to prevent further damage.
|
|
||||||
*/
|
|
||||||
dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n");
|
|
||||||
- orderly_poweroff(true);
|
|
||||||
} else
|
|
||||||
dev_emerg(adev->dev, "ERROR: GPU under temperature range detected!\n");
|
|
||||||
} else if (client_id == SOC15_IH_CLIENTID_ROM_SMUIO) {
|
|
||||||
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
|
|
||||||
index 70b560737..11373a474 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
|
|
||||||
@@ -1444,7 +1444,6 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,
|
|
||||||
* Try to do a graceful shutdown to prevent further damage.
|
|
||||||
*/
|
|
||||||
dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n");
|
|
||||||
- orderly_poweroff(true);
|
|
||||||
break;
|
|
||||||
case THM_11_0__SRCID__THM_DIG_THERM_H2L:
|
|
||||||
dev_emerg(adev->dev, "ERROR: GPU under temperature range detected\n");
|
|
||||||
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
|
|
||||||
index 89f0f6eb1..99024cfec 100644
|
|
||||||
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
|
|
||||||
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
|
|
||||||
@@ -1386,7 +1386,6 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,
|
|
||||||
* Try to do a graceful shutdown to prevent further damage.
|
|
||||||
*/
|
|
||||||
dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU SW CTF!\n");
|
|
||||||
- orderly_poweroff(true);
|
|
||||||
break;
|
|
||||||
case THM_11_0__SRCID__THM_DIG_THERM_H2L:
|
|
||||||
dev_emerg(adev->dev, "ERROR: GPU under temperature range detected\n");
|
|
19
patches/orchis-fix-warnings.patch
Normal file
19
patches/orchis-fix-warnings.patch
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
commit 9c516cc61775a88312280f7732328d5fdf7af825
|
||||||
|
Author: lelgenio <lelgenio@disroot.org>
|
||||||
|
Date: Mon May 22 11:30:01 2023 -0300
|
||||||
|
|
||||||
|
fix: limit lowest value for corner-radious at 0
|
||||||
|
|
||||||
|
diff --git a/src/_sass/_variables.scss b/src/_sass/_variables.scss
|
||||||
|
index 9915a22..6e87a4f 100644
|
||||||
|
--- a/src/_sass/_variables.scss
|
||||||
|
+++ b/src/_sass/_variables.scss
|
||||||
|
@@ -24,7 +24,7 @@ $large-icon-size: 32px;
|
||||||
|
//
|
||||||
|
|
||||||
|
$window-radius: $default_corner + $space-size;
|
||||||
|
-$corner-radius: if($compact == 'false', $default_corner, $default_corner - 2px);
|
||||||
|
+$corner-radius: if($compact == 'false', $default_corner, max(0, $default_corner - 2px));
|
||||||
|
$material-radius: $default_corner / 2 + 4px;
|
||||||
|
$menu-radius: $default_corner / 4 + $space-size + 2px;
|
||||||
|
$popup-radius: $default_corner + $space-size + 2px;
|
File diff suppressed because it is too large
Load diff
|
@ -1,14 +0,0 @@
|
||||||
diff --git a/sources/code/main/modules/config.ts b/sources/code/main/modules/config.ts
|
|
||||||
index caf51df..41faabe 100644
|
|
||||||
--- a/sources/code/main/modules/config.ts
|
|
||||||
+++ b/sources/code/main/modules/config.ts
|
|
||||||
@@ -158,6 +158,9 @@ class Config<T> {
|
|
||||||
#read(): unknown {
|
|
||||||
const encodedData = readFileSync(this.#path+this.#pathExtension);
|
|
||||||
let decodedData = encodedData.toString();
|
|
||||||
+ if (decodedData === "")
|
|
||||||
+ return {};
|
|
||||||
+
|
|
||||||
if(this.#pathExtension === FileExt.Encrypted)
|
|
||||||
decodedData = safeStorage.decryptString(encodedData);
|
|
||||||
return JSON.parse(decodedData);
|
|
|
@ -1,38 +0,0 @@
|
||||||
{ pkgs
|
|
||||||
, lib
|
|
||||||
, kernel ? pkgs.linuxPackages_latest.kernel
|
|
||||||
}:
|
|
||||||
|
|
||||||
pkgs.stdenv.mkDerivation {
|
|
||||||
pname = "amdgpu-kernel-module";
|
|
||||||
inherit (kernel) src version postPatch nativeBuildInputs;
|
|
||||||
|
|
||||||
kernel_dev = kernel.dev;
|
|
||||||
kernelVersion = kernel.modDirVersion;
|
|
||||||
|
|
||||||
modulePath = "drivers/gpu/drm/amd/amdgpu";
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
BUILT_KERNEL=$kernel_dev/lib/modules/$kernelVersion/build
|
|
||||||
|
|
||||||
cp $BUILT_KERNEL/Module.symvers .
|
|
||||||
cp $BUILT_KERNEL/.config .
|
|
||||||
cp $kernel_dev/vmlinux .
|
|
||||||
|
|
||||||
make "-j$NIX_BUILD_CORES" modules_prepare
|
|
||||||
make "-j$NIX_BUILD_CORES" M=$modulePath modules
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
make \
|
|
||||||
INSTALL_MOD_PATH="$out" \
|
|
||||||
XZ="xz -T$NIX_BUILD_CORES" \
|
|
||||||
M="$modulePath" \
|
|
||||||
modules_install
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "AMD GPU kernel module";
|
|
||||||
license = lib.licenses.gpl3;
|
|
||||||
};
|
|
||||||
}
|
|
64
pkgs/blade-formatter/default.nix
Normal file
64
pkgs/blade-formatter/default.nix
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
mkYarnPackage,
|
||||||
|
fetchFromGitHub,
|
||||||
|
fetchYarnDeps,
|
||||||
|
testers,
|
||||||
|
writeText,
|
||||||
|
runCommand,
|
||||||
|
blade-formatter,
|
||||||
|
}:
|
||||||
|
|
||||||
|
mkYarnPackage rec {
|
||||||
|
pname = "blade-formatter";
|
||||||
|
version = "1.38.2";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "shufo";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-JvILLw7Yp4g/dSsYtZ2ylmlXfS9t+2KADlBrYOJWTpg=";
|
||||||
|
};
|
||||||
|
|
||||||
|
packageJSON = ./package.json;
|
||||||
|
offlineCache = fetchYarnDeps {
|
||||||
|
yarnLock = "${src}/yarn.lock";
|
||||||
|
hash = "sha256-UFDxw3fYMzSUhZw+TCEh/dN7OioKI75LzKSnEwGPKDA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
postBuild = "yarn build";
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
version = testers.testVersion {
|
||||||
|
package = blade-formatter;
|
||||||
|
command = "blade-formatter --version";
|
||||||
|
};
|
||||||
|
|
||||||
|
simple = testers.testEqualContents {
|
||||||
|
assertion = "blade-formatter formats a basic blade file";
|
||||||
|
expected = writeText "expected" ''
|
||||||
|
@if (true)
|
||||||
|
Hello world!
|
||||||
|
@endif
|
||||||
|
'';
|
||||||
|
actual =
|
||||||
|
runCommand "actual"
|
||||||
|
{
|
||||||
|
nativeBuildInputs = [ blade-formatter ];
|
||||||
|
base = writeText "base" ''
|
||||||
|
@if( true ) Hello world! @endif
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
''
|
||||||
|
blade-formatter $base > $out
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Laravel Blade template formatter";
|
||||||
|
homepage = "https://github.com/shufo/blade-formatter";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ lelgenio ];
|
||||||
|
};
|
||||||
|
}
|
120
pkgs/blade-formatter/package.json
Executable file
120
pkgs/blade-formatter/package.json
Executable file
|
@ -0,0 +1,120 @@
|
||||||
|
{
|
||||||
|
"name": "blade-formatter",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 14.0.0"
|
||||||
|
},
|
||||||
|
"keywords": [
|
||||||
|
"php",
|
||||||
|
"formatter",
|
||||||
|
"laravel"
|
||||||
|
],
|
||||||
|
"version": "1.38.2",
|
||||||
|
"description": "An opinionated blade template formatter for Laravel",
|
||||||
|
"main": "./dist/bundle.cjs",
|
||||||
|
"types": "./dist/types/main.d.ts",
|
||||||
|
"type": "module",
|
||||||
|
"exports": {
|
||||||
|
".": {
|
||||||
|
"import": "./dist/bundle.js",
|
||||||
|
"require": "./dist/bundle.cjs",
|
||||||
|
"default": "./dist/bundle.js"
|
||||||
|
},
|
||||||
|
"./*": "./*"
|
||||||
|
},
|
||||||
|
"scripts": {
|
||||||
|
"build": "cross-env NODE_ENV=production node esbuild.js && cross-env NODE_ENV=production ESM_BUILD=true node esbuild.js",
|
||||||
|
"prepublish": "tsc src/main.ts --declaration --emitDeclarationOnly --outDir ./dist/types || true",
|
||||||
|
"watch": "node esbuild.js",
|
||||||
|
"test": "yarn run build && node --experimental-vm-modules node_modules/.bin/jest",
|
||||||
|
"lint": "eslint src -c .eslintrc.json --ext ts",
|
||||||
|
"fix": "prettier {src,__tests__}/**/*.ts --write",
|
||||||
|
"check_formatted": "prettier **/*.ts -c",
|
||||||
|
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
|
||||||
|
"prepare": "husky install",
|
||||||
|
"bin": "cross-env ./bin/blade-formatter.cjs"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"blade-formatter": "bin/blade-formatter.cjs"
|
||||||
|
},
|
||||||
|
"author": "Shuhei Hayashibara",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@prettier/plugin-php": "^0.19.7",
|
||||||
|
"@shufo/tailwindcss-class-sorter": "3.0.1",
|
||||||
|
"aigle": "^1.14.1",
|
||||||
|
"ajv": "^8.9.0",
|
||||||
|
"chalk": "^4.1.0",
|
||||||
|
"concat-stream": "^2.0.0",
|
||||||
|
"detect-indent": "^6.0.0",
|
||||||
|
"find-config": "^1.0.0",
|
||||||
|
"glob": "^8.0.1",
|
||||||
|
"html-attribute-sorter": "^0.4.3",
|
||||||
|
"ignore": "^5.1.8",
|
||||||
|
"js-beautify": "^1.14.8",
|
||||||
|
"lodash": "^4.17.19",
|
||||||
|
"php-parser": "3.1.5",
|
||||||
|
"prettier": "^2.2.0",
|
||||||
|
"tailwindcss": "^3.1.8",
|
||||||
|
"vscode-oniguruma": "1.7.0",
|
||||||
|
"vscode-textmate": "^7.0.1",
|
||||||
|
"xregexp": "^5.0.1",
|
||||||
|
"yargs": "^17.3.1"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@babel/core": "^7.6.4",
|
||||||
|
"@babel/plugin-transform-modules-commonjs": "^7.16.5",
|
||||||
|
"@babel/preset-env": "^7.13.12",
|
||||||
|
"@babel/preset-typescript": "^7.16.5",
|
||||||
|
"@types/concat-stream": "^2.0.0",
|
||||||
|
"@types/find-config": "^1.0.1",
|
||||||
|
"@types/fs-extra": "^11.0.0",
|
||||||
|
"@types/glob": "^8.0.0",
|
||||||
|
"@types/jest": "^29.0.0",
|
||||||
|
"@types/js-beautify": "^1.13.3",
|
||||||
|
"@types/lodash": "^4.14.178",
|
||||||
|
"@types/mocha": "^10.0.0",
|
||||||
|
"@types/node": "^18.0.0",
|
||||||
|
"@types/xregexp": "^4.4.0",
|
||||||
|
"@typescript-eslint/eslint-plugin": "^5.8.1",
|
||||||
|
"@typescript-eslint/parser": "^5.8.1",
|
||||||
|
"app-root-path": "^3.0.0",
|
||||||
|
"babel-jest": "^29.0.0",
|
||||||
|
"codecov": "^3.8.3",
|
||||||
|
"cross-env": "^7.0.3",
|
||||||
|
"esbuild": "^0.19.0",
|
||||||
|
"esbuild-node-externals": "^1.4.1",
|
||||||
|
"eslint": "^8.5.0",
|
||||||
|
"eslint-config-airbnb-base": "^15.0.0",
|
||||||
|
"eslint-config-airbnb-typescript": "^17.0.0",
|
||||||
|
"eslint-config-prettier": "^9.0.0",
|
||||||
|
"eslint-import-resolver-typescript": "^3.0.0",
|
||||||
|
"eslint-plugin-import": "^2.25.3",
|
||||||
|
"eslint-plugin-jest": "^26.0.0",
|
||||||
|
"eslint-plugin-prettier": "^5.0.0",
|
||||||
|
"fs-extra": "^11.0.0",
|
||||||
|
"husky": "^8.0.0",
|
||||||
|
"jest": "^29.0.0",
|
||||||
|
"lint-staged": ">=10",
|
||||||
|
"source-map-loader": "^4.0.0",
|
||||||
|
"ts-jest": "^29.0.0",
|
||||||
|
"ts-loader": "^9.2.6",
|
||||||
|
"ts-migrate": "^0.1.27",
|
||||||
|
"ts-node": "^10.4.0",
|
||||||
|
"typescript": "^5.0.0"
|
||||||
|
},
|
||||||
|
"repository": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/shufo/blade-formatter.git"
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"dist",
|
||||||
|
"src",
|
||||||
|
"bin",
|
||||||
|
"wasm",
|
||||||
|
"syntaxes",
|
||||||
|
"CHANGELOG.md"
|
||||||
|
],
|
||||||
|
"lint-staged": {
|
||||||
|
"*.ts": "yarn run fix"
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,11 +1,12 @@
|
||||||
{ lib
|
{
|
||||||
, rustPlatform
|
lib,
|
||||||
, fetchFromGitHub
|
rustPlatform,
|
||||||
, pkg-config
|
fetchFromGitHub,
|
||||||
, openssl
|
pkg-config,
|
||||||
, zlib
|
openssl,
|
||||||
, stdenv
|
zlib,
|
||||||
, Security ? null
|
stdenv,
|
||||||
|
Security ? null,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
|
@ -22,9 +23,7 @@ rustPlatform.buildRustPackage rec {
|
||||||
cargoSha256 = "sha256-hOB84u55ishahIFSqBnqccqH3OlC9J8mCYzsd23jTyA=";
|
cargoSha256 = "sha256-hOB84u55ishahIFSqBnqccqH3OlC9J8mCYzsd23jTyA=";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
|
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
|
||||||
Security
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Check all the things.";
|
description = "Check all the things.";
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
# Custom packages, that can be defined similarly to ones from nixpkgs
|
# Custom packages, that can be defined similarly to ones from nixpkgs
|
||||||
# You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
|
# You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
|
||||||
|
|
||||||
{ pkgs, inputs }: {
|
{ pkgs, inputs }:
|
||||||
plymouth-theme-red = pkgs.callPackage ./plymouth-theme-red.nix { inherit inputs; };
|
{
|
||||||
|
blade-formatter = pkgs.callPackage ./blade-formatter { };
|
||||||
cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
|
cargo-checkmate = pkgs.callPackage ./cargo-checkmate.nix { };
|
||||||
lipsum = pkgs.callPackage ./lipsum.nix { inherit inputs; };
|
lipsum = pkgs.callPackage ./lipsum.nix { };
|
||||||
amdgpu-kernel-module = pkgs.callPackage ./amdgpu-kernel-module.nix { };
|
emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
|
||||||
|
material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { };
|
||||||
}
|
}
|
||||||
|
|
27
pkgs/emmet-cli.nix
Normal file
27
pkgs/emmet-cli.nix
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
buildNpmPackage,
|
||||||
|
fetchFromGitHub,
|
||||||
|
}:
|
||||||
|
|
||||||
|
buildNpmPackage rec {
|
||||||
|
pname = "emmet-cli";
|
||||||
|
version = "0.0.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "Delapouite";
|
||||||
|
repo = "emmet-cli";
|
||||||
|
rev = "407b0e8c59f65f205967d6be71105e0bd2001d62";
|
||||||
|
hash = "sha256-8lDgD1eIc2r5aB2baaiHKbkFdAxErX5p96MNqztR9rg=";
|
||||||
|
};
|
||||||
|
|
||||||
|
npmDepsHash = "sha256-Utgk/Cw83ffGr2/4aNkp3n3wSOojLZLA7OR+OakYBC0=";
|
||||||
|
|
||||||
|
dontNpmBuild = true;
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "Emmet command line interface";
|
||||||
|
homepage = "https://github.com/Delapouite/emmet-cli";
|
||||||
|
mainProgram = "emmet";
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,23 +1,32 @@
|
||||||
{ pkgs, inputs }:
|
{
|
||||||
pkgs.stdenv.mkDerivation rec {
|
stdenv,
|
||||||
|
fetchFromGitHub,
|
||||||
|
pkg-config,
|
||||||
|
vala,
|
||||||
|
wrapGAppsHook,
|
||||||
|
}:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
pname = "lipsum";
|
pname = "lipsum";
|
||||||
version = "0.0.1";
|
version = "0.0.1";
|
||||||
|
|
||||||
src = inputs.lipsum;
|
src = fetchFromGitHub {
|
||||||
|
owner = "hannenz";
|
||||||
|
repo = "lipsum";
|
||||||
|
rev = "0fb31e6ede10fbd78d7652f5fb21670cddd8e3ed";
|
||||||
|
hash = "sha256-a6uv0tJulN9cAGWxvQr8B0PUJEY8Rx4e759xzS66Xlo=";
|
||||||
|
};
|
||||||
|
|
||||||
buildInputs = with pkgs; [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
glib
|
|
||||||
gtk3.dev
|
|
||||||
vala
|
vala
|
||||||
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [ "PRG=${pname}" ];
|
||||||
"PRG=${pname}"
|
|
||||||
];
|
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
install -Dm 755 "$pname" "$out/bin/$pname"
|
install -Dm 755 "$pname" "$out/bin/$pname"
|
||||||
|
install -Dm 755 "./data/de.hannenz.lipsum.gschema.xml" "$out/share/glib-2.0/schemas/de.hannenz.lipsum.gschema.xml"
|
||||||
|
glib-compile-schemas "$out/share/glib-2.0/schemas/"
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
16
pkgs/material-wifi-icons.nix
Normal file
16
pkgs/material-wifi-icons.nix
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
{ stdenv, fetchFromGitHub }:
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "material-wifi-icons";
|
||||||
|
version = "0.0.1";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "dcousens";
|
||||||
|
repo = "material-wifi-icons";
|
||||||
|
rev = "2daf6b3d96d65beb2a3e37a9a53556aab3826d97";
|
||||||
|
hash = "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc=";
|
||||||
|
};
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
install -D material-wifi.ttf $out/share/fonts/${pname}
|
||||||
|
'';
|
||||||
|
}
|
|
@ -1,25 +0,0 @@
|
||||||
{ pkgs, inputs }:
|
|
||||||
pkgs.stdenv.mkDerivation rec {
|
|
||||||
pname = "red-loader-plymouth";
|
|
||||||
version = "0.0.1";
|
|
||||||
|
|
||||||
src = inputs.plymouth-themes;
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
pkgs.git
|
|
||||||
];
|
|
||||||
|
|
||||||
configurePhase = ''
|
|
||||||
mkdir -p $out/share/plymouth/themes/
|
|
||||||
'';
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
cp -r pack_4/red_loader $out/share/plymouth/themes
|
|
||||||
cat pack_4/red_loader/red_loader.plymouth | sed "s@\/usr\/@$out\/@" > \
|
|
||||||
$out/share/plymouth/themes/red_loader/red_loader.plymouth
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
|
|
11
scripts/_sway_idle_toggle
Normal file
11
scripts/_sway_idle_toggle
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
swayidlectl() {
|
||||||
|
systemctl --user $1 swayidle.service
|
||||||
|
}
|
||||||
|
|
||||||
|
if swayidlectl status > /dev/null; then
|
||||||
|
swayidlectl stop
|
||||||
|
else
|
||||||
|
swayidlectl start
|
||||||
|
fi
|
26
scripts/auto_connect_gamepad
Executable file
26
scripts/auto_connect_gamepad
Executable file
|
@ -0,0 +1,26 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
list_paired_controllers() {
|
||||||
|
bluetoothctl devices Paired | grep -i 'controller' | cut -d' ' -f2
|
||||||
|
}
|
||||||
|
|
||||||
|
count_connected_controllers() {
|
||||||
|
bluetoothctl devices Connected | grep -i 'controller' | wc -l
|
||||||
|
}
|
||||||
|
|
||||||
|
try_to_connect_to_all_controllers() {
|
||||||
|
list_paired_controllers | while read paired_controller; do
|
||||||
|
echo "Trying to connect to controller $paired_controller"
|
||||||
|
bluetoothctl connect "$paired_controller"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
echo "looping"
|
||||||
|
if test "$(count_connected_controllers)" -ne 0 ; then
|
||||||
|
echo "there is a controller connected, not attempting to connect to any other"
|
||||||
|
sleep 10s
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
try_to_connect_to_all_controllers
|
||||||
|
done
|
10
scripts/color_picker
Executable file
10
scripts/color_picker
Executable file
|
@ -0,0 +1,10 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -xe
|
||||||
|
|
||||||
|
grim -g "$(slurp -b aabbcc00 -p)" - |
|
||||||
|
convert - txt:- |
|
||||||
|
grep -oE '#[0-9A-Fa-f]{6}' |
|
||||||
|
wl-copy -n
|
||||||
|
|
||||||
|
notify-send "$(wl-paste)" "Copied to clipboard"
|
|
@ -1,47 +1,140 @@
|
||||||
(final: prev:
|
(
|
||||||
with prev;
|
final: prev:
|
||||||
let
|
with prev;
|
||||||
import_script = (_: path: import (path) { inherit pkgs lib; });
|
let
|
||||||
create_script = (name: text: runtimeInputs:
|
import_script = (_: path: import (path) { inherit pkgs lib; });
|
||||||
let
|
create_script = (
|
||||||
script_body = pkgs.writeTextFile {
|
name: text: runtimeInputs:
|
||||||
inherit name;
|
let
|
||||||
executable = true;
|
script_body = pkgs.writeTextFile {
|
||||||
text = ''
|
inherit name;
|
||||||
${builtins.readFile text}
|
executable = true;
|
||||||
'';
|
text = ''
|
||||||
};
|
${builtins.readFile text}
|
||||||
in
|
'';
|
||||||
(pkgs.writeShellApplication {
|
};
|
||||||
inherit name runtimeInputs;
|
in
|
||||||
text = ''exec ${script_body} "$@"'';
|
(pkgs.writeShellApplication {
|
||||||
checkPhase = "";
|
inherit name runtimeInputs;
|
||||||
}));
|
text = ''exec ${script_body} "$@"'';
|
||||||
create_scripts =
|
checkPhase = "";
|
||||||
lib.mapAttrs (name: deps: create_script name ./${name} deps);
|
})
|
||||||
in
|
);
|
||||||
create_scripts
|
create_scripts = lib.mapAttrs (name: deps: create_script name ./${name} deps);
|
||||||
{
|
|
||||||
|
pass = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
||||||
|
in
|
||||||
|
create_scripts {
|
||||||
br = [ ];
|
br = [ ];
|
||||||
bmenu = [ final.bemenu final.dhist fish j4-dmenu-desktop jq sway ];
|
bmenu = [
|
||||||
down_meme = [ wl-clipboard yt-dlp libnotify ];
|
final.bemenu
|
||||||
wl-copy-file = [ wl-clipboard fish ];
|
final.dhist
|
||||||
|
fish
|
||||||
|
j4-dmenu-desktop
|
||||||
|
jq
|
||||||
|
sway
|
||||||
|
];
|
||||||
|
down_meme = [
|
||||||
|
wl-clipboard
|
||||||
|
yt-dlp
|
||||||
|
libnotify
|
||||||
|
];
|
||||||
|
wl-copy-file = [
|
||||||
|
wl-clipboard
|
||||||
|
fish
|
||||||
|
];
|
||||||
_diffr = [ diffr ];
|
_diffr = [ diffr ];
|
||||||
_thunar-terminal = [ final.terminal ];
|
_thunar-terminal = [ final.terminal ];
|
||||||
kak-pager = [ fish final._diffr ];
|
_sway_idle_toggle = [ final.swayidle ];
|
||||||
|
kak-pager = [
|
||||||
|
fish
|
||||||
|
final._diffr
|
||||||
|
];
|
||||||
kak-man-pager = [ final.kak-pager ];
|
kak-man-pager = [ final.kak-pager ];
|
||||||
musmenu = [ mpc-cli final.wdmenu trash-cli xdg-user-dirs libnotify sd wl-clipboard ];
|
helix-pager = [
|
||||||
showkeys =
|
fish
|
||||||
[ ]; # This will not work unless programs.wshowkeys is enabled systemwide
|
final._diffr
|
||||||
|
];
|
||||||
|
helix-man-pager = [ final.helix-pager ];
|
||||||
|
musmenu = [
|
||||||
|
mpc-cli
|
||||||
|
final.wdmenu
|
||||||
|
trash-cli
|
||||||
|
xdg-user-dirs
|
||||||
|
libnotify
|
||||||
|
sd
|
||||||
|
wl-clipboard
|
||||||
|
];
|
||||||
|
showkeys = [ ]; # This will not work unless programs.wshowkeys is enabled systemwide
|
||||||
terminal = [ alacritty ];
|
terminal = [ alacritty ];
|
||||||
playerctl-status = [ playerctl ];
|
playerctl-status = [ playerctl ];
|
||||||
wpass = [ final.wdmenu fd pass sd wl-clipboard wtype ];
|
pass-export = [
|
||||||
screenshotsh =
|
pass2csv
|
||||||
[ capitaine-cursors grim slurp jq sway wl-clipboard xdg-user-dirs ];
|
gnupg
|
||||||
volumesh = [ pulseaudio libnotify ];
|
];
|
||||||
pulse_sink = [ pulseaudio pamixer final.wdmenu ];
|
wpass = [
|
||||||
} // lib.mapAttrs import_script {
|
final.wdmenu
|
||||||
wdmenu = ./wdmenu.nix;
|
fd
|
||||||
wlauncher = ./wlauncher.nix;
|
pass
|
||||||
_gpg-unlock = ./_gpg-unlock.nix;
|
sd
|
||||||
})
|
wl-clipboard
|
||||||
|
wtype
|
||||||
|
];
|
||||||
|
screenshotsh = [
|
||||||
|
capitaine-cursors
|
||||||
|
grim
|
||||||
|
slurp
|
||||||
|
jq
|
||||||
|
sway
|
||||||
|
wl-clipboard
|
||||||
|
xdg-user-dirs
|
||||||
|
];
|
||||||
|
volumesh = [
|
||||||
|
pulseaudio
|
||||||
|
libnotify
|
||||||
|
];
|
||||||
|
pulse_sink = [
|
||||||
|
pulseaudio
|
||||||
|
pamixer
|
||||||
|
final.wdmenu
|
||||||
|
];
|
||||||
|
color_picker = [
|
||||||
|
grim
|
||||||
|
slurp
|
||||||
|
wl-clipboard
|
||||||
|
libnotify
|
||||||
|
imagemagick
|
||||||
|
];
|
||||||
|
dzadd = [
|
||||||
|
procps
|
||||||
|
libnotify
|
||||||
|
final.wdmenu
|
||||||
|
jq
|
||||||
|
mpv
|
||||||
|
pqiv
|
||||||
|
python3Packages.deemix
|
||||||
|
mpc-cli
|
||||||
|
final.mpdDup
|
||||||
|
];
|
||||||
|
mpdDup = [
|
||||||
|
mpc-cli
|
||||||
|
perl
|
||||||
|
];
|
||||||
|
readQrCode = [
|
||||||
|
grim
|
||||||
|
zbar
|
||||||
|
wl-clipboard
|
||||||
|
];
|
||||||
|
auto_connect_gamepad = [
|
||||||
|
bluez
|
||||||
|
coreutils
|
||||||
|
gnugrep
|
||||||
|
];
|
||||||
|
vrr-fullscreen = [ ];
|
||||||
|
}
|
||||||
|
// lib.mapAttrs import_script {
|
||||||
|
wdmenu = ./wdmenu.nix;
|
||||||
|
wlauncher = ./wlauncher.nix;
|
||||||
|
_gpg-unlock = ./_gpg-unlock.nix;
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
|
@ -6,9 +6,11 @@ cd "$DIR"
|
||||||
|
|
||||||
yt-dlp --merge-output-format mp4 "$(wl-paste)"
|
yt-dlp --merge-output-format mp4 "$(wl-paste)"
|
||||||
|
|
||||||
FILENAME="$(ls)"
|
FILENAME="$(ls | head -n1)"
|
||||||
|
|
||||||
cp * "$HOME/Downloads/Memes/$FILENAME"
|
mkdir -p "$HOME/Downloads/Memes"
|
||||||
|
|
||||||
|
cp "$FILENAME" "$HOME/Downloads/Memes/$FILENAME"
|
||||||
|
|
||||||
wl-copy-file "$HOME/Downloads/Memes/$FILENAME"
|
wl-copy-file "$HOME/Downloads/Memes/$FILENAME"
|
||||||
|
|
||||||
|
|
176
scripts/dzadd
Executable file
176
scripts/dzadd
Executable file
|
@ -0,0 +1,176 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -ex
|
||||||
|
|
||||||
|
tmpf=$(mktemp /tmp/dzadd.XXXXXX)
|
||||||
|
|
||||||
|
clean() {
|
||||||
|
test "$?" -eq "0" ||
|
||||||
|
notify-send "Exiting with error"
|
||||||
|
|
||||||
|
set +e
|
||||||
|
kill "$mpvPid"
|
||||||
|
rm -f "$tmpf"
|
||||||
|
}
|
||||||
|
|
||||||
|
trap clean EXIT
|
||||||
|
|
||||||
|
main() {
|
||||||
|
sType=$(printf "Track\nAlbum\nArtist" | wdmenu | tr '[:upper:]' '[:lower:]')
|
||||||
|
test -n "$sType" || exit 1
|
||||||
|
|
||||||
|
query=$(echo -n | wdmenu | sed 's/[^ a-z0-9]//g;s/ /+/g')
|
||||||
|
test -n "$query" || exit 1
|
||||||
|
|
||||||
|
case "$sType" in
|
||||||
|
track)
|
||||||
|
deezer_category="track"
|
||||||
|
jqFilter='.data[]| "\(.title) - \(.album.title) - \(.artist.name) |\(.id)"'
|
||||||
|
;;
|
||||||
|
album)
|
||||||
|
deezer_category="album"
|
||||||
|
jqFilter='.data[]| "\(.nb_tracks) - \(.title) - \(.artist.name) |\(.id)"'
|
||||||
|
;;
|
||||||
|
artist)
|
||||||
|
deezer_category="artist"
|
||||||
|
jqFilter='.data[]| "\(.nb_fan) - \(.name) |\(.id)"'
|
||||||
|
;;
|
||||||
|
top50)
|
||||||
|
deezer_category="artist"
|
||||||
|
jqFilter='.data[]| "\(.nb_fan) - \(.name) |\(.id)"'
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
curl -m30 -s "api.deezer.com/search/${deezer_category}?q=${query}" |
|
||||||
|
sed 's/|//g' |
|
||||||
|
jq -r "$jqFilter" >"$tmpf"
|
||||||
|
|
||||||
|
pick_song
|
||||||
|
}
|
||||||
|
|
||||||
|
pick_song() {
|
||||||
|
choice=$(cat "$tmpf" | cut -d\| -f1 | wdmenu)
|
||||||
|
choice=$(grep "$choice" "$tmpf" | head -n 1)
|
||||||
|
choiceId=$(printf "%s" "$choice" | cut -d\| -f2)
|
||||||
|
|
||||||
|
case "$sType" in
|
||||||
|
top50)
|
||||||
|
choiceUrl="http://deezer.com/${deezer_category}/${choiceId}/top?=limit=50"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
choiceUrl="http://deezer.com/${deezer_category}/${choiceId}"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
|
||||||
|
pick_action "$choiceUrl"
|
||||||
|
}
|
||||||
|
|
||||||
|
pick_action() {
|
||||||
|
|
||||||
|
choiceUrl="$1"
|
||||||
|
|
||||||
|
COMMON_CHOISES="View Image\nDownload\nCopy URL\nAnother"
|
||||||
|
choice=$(printf "Preview\n${COMMON_CHOISES}" | wdmenu)
|
||||||
|
|
||||||
|
case "$choice" in
|
||||||
|
|
||||||
|
"Preview")
|
||||||
|
common_preview
|
||||||
|
;;
|
||||||
|
|
||||||
|
"View Image")
|
||||||
|
common_art
|
||||||
|
;;
|
||||||
|
|
||||||
|
"Download")
|
||||||
|
common_download
|
||||||
|
;;
|
||||||
|
|
||||||
|
"Copy URL")
|
||||||
|
wl-copy
|
||||||
|
;;
|
||||||
|
|
||||||
|
"Another")
|
||||||
|
pick_song
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
|
||||||
|
esac
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
common_preview() {
|
||||||
|
|
||||||
|
case "$sType" in
|
||||||
|
track)
|
||||||
|
;;
|
||||||
|
album)
|
||||||
|
preview_suffix=tracks
|
||||||
|
;;
|
||||||
|
artist)
|
||||||
|
preview_suffix=top
|
||||||
|
;;
|
||||||
|
top50)
|
||||||
|
preview_suffix=top
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
choicePreview=$(
|
||||||
|
curl -m30 -s "http://api.deezer.com/${deezer_category}/${choiceId}/${preview_suffix}" |
|
||||||
|
jq -r '.preview, .data[0].preview | select(. != null)'
|
||||||
|
)
|
||||||
|
|
||||||
|
mpv --quiet --volume=50 --no-resume-playback "$choicePreview" &
|
||||||
|
mpvPid="$!"
|
||||||
|
choice=$(printf "$COMMON_CHOISES" | wdmenu -p 'Download?')
|
||||||
|
kill "$mpvPid" || true
|
||||||
|
}
|
||||||
|
|
||||||
|
common_art() {
|
||||||
|
|
||||||
|
case "$sType" in
|
||||||
|
track)
|
||||||
|
image_filter='.album.cover_big'
|
||||||
|
;;
|
||||||
|
album)
|
||||||
|
image_filter='.cover_big'
|
||||||
|
;;
|
||||||
|
artist)
|
||||||
|
image_filter='.picture_big'
|
||||||
|
;;
|
||||||
|
top50)
|
||||||
|
image_filter='.picture_big'
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
curl -m30 -s "api.deezer.com/${deezer_category}/${choiceId}" |
|
||||||
|
jq -r "$image_filter" |
|
||||||
|
xargs curl -m30 -s |
|
||||||
|
pqiv -
|
||||||
|
|
||||||
|
pick_action
|
||||||
|
}
|
||||||
|
|
||||||
|
common_download() {
|
||||||
|
notify-send "Starting Download"
|
||||||
|
deemix "$choiceUrl" </dev/null &&
|
||||||
|
notify-send "Download Successful" ||
|
||||||
|
notify-send "Download Failed"
|
||||||
|
mpc add /
|
||||||
|
mpdDup
|
||||||
|
}
|
||||||
|
|
||||||
|
main
|
3
scripts/helix-man-pager
Executable file
3
scripts/helix-man-pager
Executable file
|
@ -0,0 +1,3 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
col -b -x | hx
|
28
scripts/helix-pager
Normal file
28
scripts/helix-pager
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
#!/usr/bin/env fish
|
||||||
|
|
||||||
|
if test (count $argv) -ne 0
|
||||||
|
for i in $argv
|
||||||
|
cat "$i"
|
||||||
|
end | eval (status filename)
|
||||||
|
exit 0
|
||||||
|
end
|
||||||
|
|
||||||
|
set term_line_count (tput lines)
|
||||||
|
|
||||||
|
while read line
|
||||||
|
set -a input_lines "$line"
|
||||||
|
|
||||||
|
set input_line_count (printf "%s\n" $input_lines | wc -l)
|
||||||
|
|
||||||
|
if test "$term_line_count" -lt "$input_line_count"
|
||||||
|
begin
|
||||||
|
printf "%s\n" $input_lines
|
||||||
|
cat
|
||||||
|
end | hx
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
printf "%s\n" $input_lines
|
|
@ -1,6 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
col -b -x |
|
|
||||||
kak -e '
|
kak -e '
|
||||||
map global normal q :q<ret>;
|
map global normal q :q<ret>;
|
||||||
set buffer filetype man;
|
set buffer filetype man;
|
||||||
|
|
5
scripts/mpdDup
Executable file
5
scripts/mpdDup
Executable file
|
@ -0,0 +1,5 @@
|
||||||
|
#!/bin/sh
|
||||||
|
mpc playlist -f '%position%\t%file%' |
|
||||||
|
sort -k 2 |
|
||||||
|
perl -ne 'm/(.*)\t(.*)/; print "$1\n" if $2 eq $prev; $prev=$2' |
|
||||||
|
mpc del
|
10
scripts/pass-export
Executable file
10
scripts/pass-export
Executable file
|
@ -0,0 +1,10 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
if test -z "$PASSWORD_STORE_DIR"; then
|
||||||
|
PASSWORD_STORE_DIR="$HOME/.password-store"
|
||||||
|
fi
|
||||||
|
|
||||||
|
pass2csv "$PASSWORD_STORE_DIR" "$HOME/passwords.csv" \
|
||||||
|
-f User '(user|login)(:\s*)?' \
|
||||||
|
-f TOTP 'otpauth(:)?' \
|
||||||
|
-f URL 'url(:\s*)?'
|
|
@ -2,13 +2,9 @@
|
||||||
|
|
||||||
PLAYERCTL="playerctl --ignore-player=mpd"
|
PLAYERCTL="playerctl --ignore-player=mpd"
|
||||||
|
|
||||||
STATUS="$(env LC_ALL=C $PLAYERCTL status title)"
|
test "$(LC_ALL=C $PLAYERCTL status)" = "Playing" \
|
||||||
TITLE="$($PLAYERCTL metadata title)"
|
&& printf " %s" "$($PLAYERCTL metadata title)" \
|
||||||
ARTIST="$($PLAYERCTL metadata artist)"
|
&& test -n "$($PLAYERCTL metadata artist)" \
|
||||||
|
&& printf " - %s" "$($PLAYERCTL metadata artist)"
|
||||||
test "$STATUS" = "Playing" \
|
|
||||||
&& printf " %s" "$TITLE" \
|
|
||||||
&& test -n "$ARTIST" \
|
|
||||||
&& printf " - %s" "$ARTIST"
|
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
|
|
18
scripts/readQrCode
Executable file
18
scripts/readQrCode
Executable file
|
@ -0,0 +1,18 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
main() {
|
||||||
|
|
||||||
|
if wl-paste | zbarimg -q --raw - | wl-copy
|
||||||
|
then
|
||||||
|
notify-send "Copied" "QrCode was copied to clipboard"
|
||||||
|
rm "$LOGFILE"
|
||||||
|
else
|
||||||
|
notify-send "Failed to read QrCode" "Log file is '$LOGFILE'"
|
||||||
|
fi
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGFILE=$(mktemp /tmp/qrcode-XXXXXXXX.log)
|
||||||
|
main > "$LOGFILE" 2>&1
|
|
@ -45,7 +45,7 @@ get_vol_system() {
|
||||||
}
|
}
|
||||||
|
|
||||||
is_muted_system() {
|
is_muted_system() {
|
||||||
pamixer --get-mute >/dev/null
|
test "$(pamixer --get-mute)" = "true" >/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
change_vol_system() {
|
change_vol_system() {
|
||||||
|
|
28
scripts/vrr-fullscreen
Executable file
28
scripts/vrr-fullscreen
Executable file
|
@ -0,0 +1,28 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# List of supported outputs for VRR
|
||||||
|
output_vrr_whitelist=(
|
||||||
|
"DP-1"
|
||||||
|
"DP-2"
|
||||||
|
)
|
||||||
|
|
||||||
|
# Toggle VRR for fullscreened apps in prespecified displays to avoid stutters while in desktop
|
||||||
|
swaymsg -t subscribe -m '[ "window" ]' | while read window_json; do
|
||||||
|
window_event=$(echo ${window_json} | jq -r '.change')
|
||||||
|
|
||||||
|
# Process only focus change and fullscreen toggle
|
||||||
|
if [[ $window_event = "focus" || $window_event = "fullscreen_mode" ]]; then
|
||||||
|
output_json=$(swaymsg -t get_outputs | jq -r '.[] | select(.focused == true)')
|
||||||
|
output_name=$(echo ${output_json} | jq -r '.name')
|
||||||
|
|
||||||
|
# Use only VRR in whitelisted outputs
|
||||||
|
if [[ ${output_vrr_whitelist[*]} =~ ${output_name} ]]; then
|
||||||
|
output_vrr_status=$(echo ${output_json} | jq -r '.adaptive_sync_status')
|
||||||
|
window_fullscreen_status=$(echo ${window_json} | jq -r '.container.fullscreen_mode')
|
||||||
|
|
||||||
|
# Only update output if nesseccary to avoid flickering
|
||||||
|
[[ $output_vrr_status = "disabled" && $window_fullscreen_status = "1" ]] && swaymsg output "${output_name}" adaptive_sync 1
|
||||||
|
[[ $output_vrr_status = "enabled" && $window_fullscreen_status = "0" ]] && swaymsg output "${output_name}" adaptive_sync 0
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
|
@ -1,12 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
|
||||||
inherit (pkgs.uservars) dmenu;
|
|
||||||
available_menus = {
|
|
||||||
bmenu = "bmenu";
|
|
||||||
rofi = "rofi -dmenu -sort";
|
|
||||||
};
|
|
||||||
menu_cmd = available_menus.${dmenu};
|
|
||||||
in
|
|
||||||
pkgs.writeShellScriptBin "wdmenu" ''
|
pkgs.writeShellScriptBin "wdmenu" ''
|
||||||
exec ${menu_cmd} "$@"
|
exec bmenu "$@"
|
||||||
''
|
''
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let
|
||||||
inherit (pkgs.uservars) dmenu;
|
inherit (config.my) dmenu;
|
||||||
available_menus = {
|
available_menus = {
|
||||||
bmenu = "bmenu run";
|
bmenu = "bmenu run";
|
||||||
rofi = "rofi -show drun -sort";
|
rofi = "rofi -show drun -sort";
|
||||||
|
|
|
@ -10,12 +10,13 @@ if test (count $argv) != 1
|
||||||
end
|
end
|
||||||
|
|
||||||
set -a file (realpath $argv[1])
|
set -a file (realpath $argv[1])
|
||||||
|
set -a url (string escape --style=url "$file")
|
||||||
set -e argv[1]
|
set -e argv[1]
|
||||||
|
|
||||||
if test -d "$file"
|
if test -d "$file"
|
||||||
die 1 "Cannot copy directories" >&2
|
die 1 "Cannot copy directories" >&2
|
||||||
else if test -f "$file"
|
else if test -f "$file"
|
||||||
wl-copy $argv -t text/uri-list "file:///$file"
|
wl-copy $argv -t text/uri-list "file:///$url"
|
||||||
else
|
else
|
||||||
die 2 "No file found" >&2
|
die 2 "No file found" >&2
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,12 +1,4 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
|
||||||
inherit (pkgs.uservars) dmenu;
|
|
||||||
available_menus = {
|
|
||||||
bmenu = "bmenu run";
|
|
||||||
rofi = "rofi -show drun -sort";
|
|
||||||
};
|
|
||||||
menu_cmd = available_menus.${dmenu};
|
|
||||||
in
|
|
||||||
pkgs.writeShellScriptBin "wlauncher" ''
|
pkgs.writeShellScriptBin "wlauncher" ''
|
||||||
exec ${menu_cmd} "$@"
|
exec bmenu run "$@"
|
||||||
''
|
''
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
_gpg-unlock
|
_gpg-unlock
|
||||||
set -xe
|
set -xe
|
||||||
|
|
||||||
|
@ -7,11 +9,21 @@ find_file() {
|
||||||
wdmenu -p "Password" $@
|
wdmenu -p "Password" $@
|
||||||
}
|
}
|
||||||
|
|
||||||
main() {
|
print_actions_for_entry() {
|
||||||
|
echo "Autotype"
|
||||||
|
if test -n "$username"; then
|
||||||
|
echo "Username -> $username"
|
||||||
|
fi
|
||||||
|
echo "Password"
|
||||||
|
if test -n "$otp"; then
|
||||||
|
echo "OTP"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
test -n "$PASSWORD_STORE_DIR" &&
|
main() {
|
||||||
cd "$PASSWORD_STORE_DIR" ||
|
test -n "$PASSWORD_STORE_DIR" &&
|
||||||
cd "$HOME/.password-store"
|
cd "$PASSWORD_STORE_DIR" ||
|
||||||
|
cd "$HOME/.password-store"
|
||||||
|
|
||||||
entry=`find_file "$@"`
|
entry=`find_file "$@"`
|
||||||
|
|
||||||
|
@ -19,8 +31,9 @@ main() {
|
||||||
|
|
||||||
username=`pass show "$entry" 2>/dev/null | perl -ne 'print $2 if /^(login|user|email): (.*)/'`
|
username=`pass show "$entry" 2>/dev/null | perl -ne 'print $2 if /^(login|user|email): (.*)/'`
|
||||||
password=`pass show "$entry" 2>/dev/null | head -n 1`
|
password=`pass show "$entry" 2>/dev/null | head -n 1`
|
||||||
|
otp=`pass otp "$entry" 2>/dev/null` || true
|
||||||
|
|
||||||
action=`printf "Autotype\nUsername -> $username\nPassword" | wdmenu -p Action`
|
action="$(print_actions_for_entry | wdmenu -p Action)"
|
||||||
|
|
||||||
case $action in
|
case $action in
|
||||||
Autotype)
|
Autotype)
|
||||||
|
@ -30,6 +43,8 @@ main() {
|
||||||
printf '%s' "$username" | wl-copy;;
|
printf '%s' "$username" | wl-copy;;
|
||||||
Password)
|
Password)
|
||||||
printf '%s' "$password" | wl-copy;;
|
printf '%s' "$password" | wl-copy;;
|
||||||
|
OTP)
|
||||||
|
pass otp "$entry" | wl-copy;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
BIN
secrets/monolith-forgejo-runner-token.age
Normal file
BIN
secrets/monolith-forgejo-runner-token.age
Normal file
Binary file not shown.
BIN
secrets/phantom-forgejo-mailer-password.age
Normal file
BIN
secrets/phantom-forgejo-mailer-password.age
Normal file
Binary file not shown.
13
secrets/phantom-mastodon-mailer-password.age
Normal file
13
secrets/phantom-mastodon-mailer-password.age
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
age-encryption.org/v1
|
||||||
|
-> ssh-rsa BwwxHg
|
||||||
|
Mnc+/tJ0QqxHkg2nl9gEkz5Oj1RgxtOZnD5gRv66ISUOqZhNm1+F+xVEdKn843/q
|
||||||
|
/WzH0f1cTF9NXP8vIaEo//bMmp50obJAd+JNovJxV+0gb9L55Nu7ayvK+eyk6j5n
|
||||||
|
eb8TxUnwh5BPkEyc6akDh/O49GXzLlVoFD6Ik/0f3YCqUDNAYOl2bsssXtevCeK/
|
||||||
|
WEPoCFGhZfNUrOo/0eAhiujZZ5zVb0CWNqXi8VTe2eWOE20VJULcN13TEyO3ZePx
|
||||||
|
bAPBmDfS5GgGlV4INWxVLaIMDrzlm0tYozbBNNUbdLFFOhIOrgvay9RWxdk0u2hJ
|
||||||
|
MPKoKsJ96EFxrbZJdS0W7a+aZk/Q3A3Civ2rtPx+5UANhmlY8e1lUHa26e1vA4K7
|
||||||
|
ApoMtDyCbuZ9FbLurwl9zO64wWP68aKzuyKOIw+wpy41NQ/PcViSY8KNG9Pt7A2N
|
||||||
|
CcOkByx+rwz+JdNHbOF8O4FFG4fNSWn7SvVtu5ymGgVi1bOd8PdJpjDR+6Is0SX7
|
||||||
|
|
||||||
|
--- DHNyITb7ZseEV58MOD/zHeH5vff0hhlbKg27rlYECGk
|
||||||
|
ÆJ…¨Úãè·<hUs/¿ïš}ó´Zi`ˆ‘ 'ÂJŸ°z5ùÃgõãŸ%€ì‡`¤º%/˜‚±<01>ˆ„á-Î<x—íõÉ’|
|
15
secrets/phantom-nextcloud.age
Normal file
15
secrets/phantom-nextcloud.age
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
age-encryption.org/v1
|
||||||
|
-> ssh-rsa BwwxHg
|
||||||
|
bpGCgyaAPDutva1Gp/YPuek6IZTXJHKb7+oIAV/x+7Ry4Oci9zM2VWvPVE/rPE/d
|
||||||
|
0AzBX1NvsWBB005w42RfiErk4FQYRCouwNR1FNjUWNdQOmku++RPfxBXspAFIDkQ
|
||||||
|
yM7mqbhwf5by5rZY+2kl20QxkErkVtZolus1am9RV4uyXfdPaRcKjWOuPiEim42d
|
||||||
|
YdeCXq4nJGxlL3tRunIqLIZGhV08wHBl7Dubhn9hdD6/ekDk0RloVTBDZUY5tUPL
|
||||||
|
dJk+bfFPI0DimytzCwyQbWEHOkdiWYSNzbx2JhTSvuqefHP1UzB2LukaQc2gOJFV
|
||||||
|
mVKvQuGpOWknytMUhM6zCTvRw4OQutAZd96OniQYTas/vnmfT2l2n9aMEzQK157A
|
||||||
|
U9DmsvhBypILiQSPpA7QrGB1QVuRjAFJA86ASY1FAT6MdBBK4vZ8fK7mpT06JO/n
|
||||||
|
gwv+UlvFBziWHzA/1GOLrfD+ExjmbeucRZr5XGszrAaK/7GPZt4LF69hRmKegL94
|
||||||
|
|
||||||
|
-> 9I3~SC,<-grease M$2 RibFL]C
|
||||||
|
uR6MirHtTc4Tyrcw3T2my+BN2Q
|
||||||
|
--- 56zk9BqgwQqNymga1mUDgpvtfIpMy5i/JnaSXbjx6jk
|
||||||
|
ÞQÚÞ—Ž)NâÿÚ¦¨Žß‘-†ŸÀ ÷ÑDz-ÖIÅß-°]p$ÉX5æT·PU=u;kæ8}wÁV¦mšç=
|
16
secrets/phantom-renawiki.age
Normal file
16
secrets/phantom-renawiki.age
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
age-encryption.org/v1
|
||||||
|
-> ssh-rsa BwwxHg
|
||||||
|
BUJ9L1bwZ0RWj3FmMghmZDkY4iuc0gujS3Rfat+hj/pg+MALZ69Tovc5RnqmOZT/
|
||||||
|
pTGPTzWj3WO70YU+wCUHKZ74JcKdL3wSD1FWOWYRvyDV3gxZjDTjw4Grs+sH9M4Z
|
||||||
|
MrhdoyY95fhmGZHJ7Qkx/aKCAK/OaFSu5Vhh37ykmLd1gQ9NJYQ+G3lLr1Mrqjd/
|
||||||
|
1QaBqJtJpAFTA0eCd3+oBtQ/qgHD2ZBJcOmkS9sRC6S4YKNoyoDifTbL29aJC4f/
|
||||||
|
08myI0WH/ApbtN1hWuiVWibmy/9/76IAvgUqi8fULNY5w7Otz3nKGV+mDA5+oD11
|
||||||
|
jCHZJdcec9JFyZ/V2mh/PoHpNawksNPy85eJ0MpM1avM25Qib8kWJM6fnZb7uJzt
|
||||||
|
DsYCl2q4ILnTaieuTSJUfgacKbrwSv7MQfgdh1SkXAShyZ7aSCoDhsgSdOVwYoAX
|
||||||
|
Mspm0NtodeV7493qZwYspO6H0xbfh20vXa1DOeMt98T1iP0aYYhfRXkb0wACx1QF
|
||||||
|
|
||||||
|
-> \z/RLj3S-grease cmv( uCkG*= .cX3S 9r^&
|
||||||
|
OVTVTnB3PjD4COiRCtQ
|
||||||
|
--- EhfDqxfjLIHF9Sa7V4ytO1xsRK8p23WDsWcB9/B9fRw
|
||||||
|
.ß=–£))/’ö‰Í¹êÒ‹#´ýLÁƒŒÓ‰Ž—|p
|
||||||
|
7 ÍñÄKä®7ò²Š@üCJfš:w6Pè•@@/N<>7¿
|
BIN
secrets/phantom-writefreely.age
Normal file
BIN
secrets/phantom-writefreely.age
Normal file
Binary file not shown.
|
@ -2,9 +2,19 @@ let
|
||||||
main_ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15";
|
main_ssh_public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
"rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ];
|
"rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [
|
||||||
"monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ];
|
main_ssh_public_key
|
||||||
|
];
|
||||||
|
"monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age".publicKeys = [
|
||||||
|
main_ssh_public_key
|
||||||
|
];
|
||||||
"gitlab-runner-thoreb-telemetria-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ];
|
"gitlab-runner-thoreb-telemetria-registrationConfigFile.age".publicKeys = [ main_ssh_public_key ];
|
||||||
|
"monolith-forgejo-runner-token.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ];
|
"lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"monolith-nix-serve-privkey.age".publicKeys = [ main_ssh_public_key ];
|
"monolith-nix-serve-privkey.age".publicKeys = [ main_ssh_public_key ];
|
||||||
|
"phantom-nextcloud.age".publicKeys = [ main_ssh_public_key ];
|
||||||
|
"phantom-writefreely.age".publicKeys = [ main_ssh_public_key ];
|
||||||
|
"phantom-renawiki.age".publicKeys = [ main_ssh_public_key ];
|
||||||
|
"phantom-forgejo-mailer-password.age".publicKeys = [ main_ssh_public_key ];
|
||||||
|
"phantom-mastodon-mailer-password.age".publicKeys = [ main_ssh_public_key ];
|
||||||
}
|
}
|
||||||
|
|
6
settings/default.nix
Normal file
6
settings/default.nix
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
{ lib, ... }:
|
||||||
|
{
|
||||||
|
options = {
|
||||||
|
my = lib.mkOption { };
|
||||||
|
};
|
||||||
|
}
|
4
switch
4
switch
|
@ -1,5 +1,9 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
nix fmt
|
||||||
|
|
||||||
|
git --no-pager diff
|
||||||
|
|
||||||
sudo nice ionice \
|
sudo nice ionice \
|
||||||
nixos-rebuild \
|
nixos-rebuild \
|
||||||
switch \
|
switch \
|
||||||
|
|
12
switch-phantom
Executable file
12
switch-phantom
Executable file
|
@ -0,0 +1,12 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
nix fmt
|
||||||
|
|
||||||
|
git --no-pager diff
|
||||||
|
|
||||||
|
nixos-rebuild switch --flake .#phantom \
|
||||||
|
--update-input nixpkgs \
|
||||||
|
--no-write-lock-file \
|
||||||
|
--build-host phantom \
|
||||||
|
--target-host phantom \
|
||||||
|
"$@"
|
17
system/bluetooth.nix
Normal file
17
system/bluetooth.nix
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
services.blueman.enable = true;
|
||||||
|
hardware.bluetooth = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
General = {
|
||||||
|
DiscoverableTimeout = 0;
|
||||||
|
# Discoverable = true;
|
||||||
|
AlwaysPairable = true;
|
||||||
|
};
|
||||||
|
Policy = {
|
||||||
|
AutoEnable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,6 +1,13 @@
|
||||||
{ config, pkgs, inputs, ... }: {
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
console = {
|
console = {
|
||||||
font = "ter-120n";
|
font = "${pkgs.terminus_font}/share/consolefonts/ter-120n.psf.gz";
|
||||||
packages = [ pkgs.terminus_font ];
|
packages = [ pkgs.terminus_font ];
|
||||||
earlySetup = false;
|
earlySetup = false;
|
||||||
};
|
};
|
||||||
|
@ -16,6 +23,11 @@
|
||||||
"rd.systemd.show_status=false"
|
"rd.systemd.show_status=false"
|
||||||
"rd.udev.log_level=3"
|
"rd.udev.log_level=3"
|
||||||
"udev.log_priority=3"
|
"udev.log_priority=3"
|
||||||
|
|
||||||
|
# Disable password timeout
|
||||||
|
"luks.options=timeout=0"
|
||||||
|
"rd.luks.options=timeout=0"
|
||||||
|
"rootflags=x-systemd.device-timeout=0"
|
||||||
];
|
];
|
||||||
|
|
||||||
initrd.systemd.enable = true;
|
initrd.systemd.enable = true;
|
||||||
|
@ -31,9 +43,9 @@
|
||||||
};
|
};
|
||||||
plymouth = {
|
plymouth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = "red_loader";
|
theme = lib.mkIf (config.my.desktop == "sway") "red_loader";
|
||||||
themePackages = [
|
themePackages = with pkgs; [
|
||||||
pkgs.plymouth-theme-red
|
(adi1090x-plymouth-themes.override { selected_themes = [ "red_loader" ]; })
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,10 @@
|
||||||
{ pkgs, lib, config, ... }: {
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
services.cachix-watch-store = {
|
services.cachix-watch-store = {
|
||||||
enable = true;
|
enable = true;
|
||||||
cacheName = "lelgenio";
|
cacheName = "lelgenio";
|
||||||
|
|
|
@ -1,119 +1,42 @@
|
||||||
# Edit this configuration file to define what should be installed on
|
# Edit this configuration file to define what should be installed on
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
# your system. Help is available in the configuration.nix(5) man page
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||||
{ config, pkgs, inputs, ... }: {
|
{
|
||||||
imports = [ ./gamemode.nix ./cachix.nix ./media-packages.nix ./boot.nix ];
|
config,
|
||||||
packages.media-packages.enable = true;
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./gamemode.nix
|
||||||
|
./cachix.nix
|
||||||
|
./media-packages.nix
|
||||||
|
./boot.nix
|
||||||
|
./thunar.nix
|
||||||
|
./nix.nix
|
||||||
|
./fonts.nix
|
||||||
|
./sound.nix
|
||||||
|
./bluetooth.nix
|
||||||
|
./locale.nix
|
||||||
|
./users.nix
|
||||||
|
./containers.nix
|
||||||
|
./network.nix
|
||||||
|
../settings
|
||||||
|
];
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
my = import ../user/variables.nix;
|
||||||
|
|
||||||
boot.kernel.sysctl = {
|
|
||||||
"vm.max_map_count" = 1048576; # Needed by DayZ
|
|
||||||
};
|
|
||||||
|
|
||||||
zramSwap.enable = true;
|
zramSwap.enable = true;
|
||||||
|
|
||||||
programs.adb.enable = true;
|
programs.adb.enable = true;
|
||||||
services.udev.packages = [ pkgs.android-udev-rules ];
|
services.udev.packages = [ pkgs.android-udev-rules ];
|
||||||
|
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
|
||||||
# Configure network proxy if necessary
|
|
||||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
|
||||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
|
||||||
# Enable networking
|
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
# Set your time zone.
|
|
||||||
time.timeZone = "America/Sao_Paulo";
|
|
||||||
# Select internationalisation properties.
|
|
||||||
i18n.defaultLocale = "pt_BR.utf8";
|
|
||||||
|
|
||||||
# Enable the GNOME Desktop Environment.
|
|
||||||
# services.xserver.displayManager.gdm.enable = true;
|
|
||||||
# services.xserver.desktopManager.gnome.enable = true;
|
|
||||||
# services.xserver.displayManager.autologin.user = "lelgenio";
|
|
||||||
|
|
||||||
# Configure keymap in X11
|
|
||||||
services.xserver = {
|
|
||||||
layout = "us";
|
|
||||||
xkbVariant = "colemak";
|
|
||||||
};
|
|
||||||
console.keyMap = "colemak";
|
|
||||||
# Enable CUPS to print documents.
|
|
||||||
# services.printing.enable = true;
|
|
||||||
services.flatpak.enable = true;
|
|
||||||
virtualisation.docker.enable = true;
|
|
||||||
virtualisation.docker.autoPrune.enable = true;
|
|
||||||
programs.firejail.enable = true;
|
|
||||||
|
|
||||||
security.rtkit.enable = true;
|
|
||||||
services.openssh = {
|
|
||||||
enable = true;
|
|
||||||
kbdInteractiveAuthentication = false;
|
|
||||||
passwordAuthentication = false;
|
|
||||||
permitRootLogin = "no";
|
|
||||||
ports = [ 9022 ];
|
|
||||||
};
|
|
||||||
# programs.ssh = {
|
|
||||||
# startAgent = true;
|
|
||||||
# extraConfig = ''
|
|
||||||
# AddKeysToAgent yes
|
|
||||||
# '';
|
|
||||||
# };
|
|
||||||
|
|
||||||
## Enable sound with pipewire.
|
|
||||||
sound.enable = true;
|
|
||||||
hardware.pulseaudio.enable = false;
|
|
||||||
services.pipewire = {
|
|
||||||
enable = true;
|
|
||||||
wireplumber.enable = true;
|
|
||||||
pulse.enable = true;
|
|
||||||
alsa.enable = true;
|
|
||||||
jack.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.blueman.enable = true;
|
|
||||||
hardware.bluetooth = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.bluezFull;
|
|
||||||
settings = {
|
|
||||||
General = {
|
|
||||||
DiscoverableTimeout = 0;
|
|
||||||
# Discoverable = true;
|
|
||||||
AlwaysPairable = true;
|
|
||||||
};
|
|
||||||
Policy = { AutoEnable = true; };
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
# Enable touchpad support (enabled default in most desktopManager).
|
||||||
services.xserver.libinput.enable = true;
|
services.libinput.enable = true;
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
|
||||||
users.mutableUsers = false;
|
|
||||||
users.users.lelgenio = {
|
|
||||||
isNormalUser = true;
|
|
||||||
description = "Leonardo Eugênio";
|
|
||||||
hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
|
|
||||||
extraGroups = [ "networkmanager" "wheel" "docker" "adbusers" "bluetooth" ];
|
|
||||||
shell = pkgs.fish;
|
|
||||||
openssh.authorizedKeys.keys = [
|
|
||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
users.users.root.initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3";
|
|
||||||
|
|
||||||
# services.getty.autologinUser = "lelgenio";
|
|
||||||
programs.fish.enable = true;
|
|
||||||
# TODO: enable thunar plugins
|
|
||||||
# programs.thunar.enable = true;
|
|
||||||
# programs.thunar.plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ];
|
|
||||||
services.gvfs.enable = true; # Mount, trash, and other functionalities
|
|
||||||
services.tumbler.enable = true; # Thumbnail support for images
|
|
||||||
# Allow unfree packages
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
|
|
||||||
|
packages.media-packages.enable = true;
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
pinentry-curses
|
|
||||||
pavucontrol
|
pavucontrol
|
||||||
|
|
||||||
glib # gsettings
|
glib # gsettings
|
||||||
|
@ -122,63 +45,15 @@
|
||||||
gnome3.adwaita-icon-theme # default gnome cursors
|
gnome3.adwaita-icon-theme # default gnome cursors
|
||||||
];
|
];
|
||||||
|
|
||||||
fonts.enableDefaultFonts = true;
|
|
||||||
fonts.fonts = with pkgs; [
|
|
||||||
noto-fonts
|
|
||||||
noto-fonts-cjk
|
|
||||||
noto-fonts-emoji
|
|
||||||
nerdfonts_fira_hack
|
|
||||||
];
|
|
||||||
|
|
||||||
services.geoclue2.enable = true;
|
services.geoclue2.enable = true;
|
||||||
# programs.qt5ct.enable = true;
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
|
||||||
# started in user sessions.
|
|
||||||
# programs.mtr.enable = true;
|
|
||||||
services.pcscd.enable = true;
|
|
||||||
programs.gnupg.agent = {
|
|
||||||
enable = true;
|
|
||||||
enableSSHSupport = true;
|
|
||||||
pinentryFlavor = "curses";
|
|
||||||
};
|
|
||||||
# List services that you want to enable:
|
|
||||||
# Enable the OpenSSH daemon.
|
|
||||||
# services.openssh.enable = true;
|
|
||||||
# Open ports in the firewall.
|
|
||||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
|
||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
|
||||||
# Or disable the firewall altogether.
|
|
||||||
networking.firewall.enable = false;
|
|
||||||
security.sudo.wheelNeedsPassword = false;
|
|
||||||
|
|
||||||
nix.registry.nixpkgs.flake = inputs.nixpkgs;
|
systemd.extraConfig = ''
|
||||||
nix = {
|
DefaultTimeoutStopSec=10s
|
||||||
gc = {
|
'';
|
||||||
automatic = true;
|
services.logind.extraConfig = ''
|
||||||
dates = "weekly";
|
HandlePowerKey=suspend
|
||||||
options = "--delete-older-than 7d";
|
'';
|
||||||
};
|
|
||||||
optimise.automatic = true;
|
|
||||||
settings = {
|
|
||||||
auto-optimise-store = true;
|
|
||||||
substituters = [
|
|
||||||
# "http://nixcache.lelgenio.1337.cx:5000"
|
|
||||||
"https://hyprland.cachix.org"
|
|
||||||
"https://lelgenio.cachix.org"
|
|
||||||
"https://wegank.cachix.org"
|
|
||||||
];
|
|
||||||
trusted-public-keys = [
|
|
||||||
# "nixcache.lelgenio.1337.cx:zxCfx7S658llDgAUG0JVyNrlAdFVvPniSdDOkvfTPS8="
|
|
||||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
|
||||||
"lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc="
|
|
||||||
"wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs="
|
|
||||||
];
|
|
||||||
};
|
|
||||||
package = pkgs.unstable.nixFlakes; # or versioned attributes like nixVersions.nix_2_8
|
|
||||||
extraOptions = ''
|
|
||||||
experimental-features = nix-command flakes
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|
20
system/containers.nix
Normal file
20
system/containers.nix
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
services.flatpak.enable = true;
|
||||||
|
|
||||||
|
virtualisation.docker = {
|
||||||
|
enable = true;
|
||||||
|
autoPrune = {
|
||||||
|
enable = true;
|
||||||
|
dates = "monthly";
|
||||||
|
flags = [
|
||||||
|
"--all"
|
||||||
|
"--volumes"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.extra-container.enable = true;
|
||||||
|
|
||||||
|
programs.firejail.enable = true;
|
||||||
|
}
|
10
system/fonts.nix
Normal file
10
system/fonts.nix
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
fonts.enableDefaultPackages = true;
|
||||||
|
fonts.packages = with pkgs; [
|
||||||
|
noto-fonts
|
||||||
|
noto-fonts-cjk
|
||||||
|
noto-fonts-emoji
|
||||||
|
nerdfonts_fira_hack
|
||||||
|
];
|
||||||
|
}
|
|
@ -1,8 +1,16 @@
|
||||||
{ config, pkgs, inputs, ... }: {
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
programs.gamemode.enable = true;
|
programs.gamemode.enable = true;
|
||||||
programs.gamemode.enableRenice = true;
|
programs.gamemode.enableRenice = true;
|
||||||
programs.gamemode.settings = {
|
programs.gamemode.settings = {
|
||||||
general = { renice = 10; };
|
general = {
|
||||||
|
renice = 10;
|
||||||
|
};
|
||||||
|
|
||||||
# Warning: GPU optimisations have the potential to damage hardware
|
# Warning: GPU optimisations have the potential to damage hardware
|
||||||
gpu = {
|
gpu = {
|
||||||
|
|
52
system/gitlab-runner.nix
Normal file
52
system/gitlab-runner.nix
Normal file
|
@ -0,0 +1,52 @@
|
||||||
|
{ pkgs, lib, ... }:
|
||||||
|
{
|
||||||
|
mkNixRunner =
|
||||||
|
registrationConfigFile: with lib; rec {
|
||||||
|
# File should contain at least these two variables:
|
||||||
|
# `CI_SERVER_URL`
|
||||||
|
# `REGISTRATION_TOKEN`
|
||||||
|
inherit registrationConfigFile; # 2
|
||||||
|
dockerImage = "alpine:3.18.2";
|
||||||
|
dockerAllowedImages = [ dockerImage ];
|
||||||
|
dockerVolumes = [
|
||||||
|
"/etc/nix/nix.conf:/etc/nix/nix.conf:ro"
|
||||||
|
"/nix/store:/nix/store:ro"
|
||||||
|
"/nix/var/nix/db:/nix/var/nix/db:ro"
|
||||||
|
"/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro"
|
||||||
|
];
|
||||||
|
dockerDisableCache = true;
|
||||||
|
preBuildScript = pkgs.writeScript "setup-container" ''
|
||||||
|
mkdir -p -m 0755 /nix/var/log/nix/drvs
|
||||||
|
mkdir -p -m 0755 /nix/var/nix/gcroots
|
||||||
|
mkdir -p -m 0755 /nix/var/nix/profiles
|
||||||
|
mkdir -p -m 0755 /nix/var/nix/temproots
|
||||||
|
mkdir -p -m 0755 /nix/var/nix/userpool
|
||||||
|
mkdir -p -m 1777 /nix/var/nix/gcroots/per-user
|
||||||
|
mkdir -p -m 1777 /nix/var/nix/profiles/per-user
|
||||||
|
mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root
|
||||||
|
mkdir -p -m 0700 "$HOME/.nix-defexpr"
|
||||||
|
|
||||||
|
. ${pkgs.nix}/etc/profile.d/nix.sh
|
||||||
|
|
||||||
|
${pkgs.nix}/bin/nix-env -i ${
|
||||||
|
concatStringsSep " " (
|
||||||
|
with pkgs;
|
||||||
|
[
|
||||||
|
nix
|
||||||
|
cacert
|
||||||
|
git
|
||||||
|
openssh
|
||||||
|
]
|
||||||
|
)
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
environmentVariables = {
|
||||||
|
ENV = "/etc/profile";
|
||||||
|
USER = "root";
|
||||||
|
NIX_REMOTE = "daemon";
|
||||||
|
PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
|
||||||
|
NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
|
||||||
|
};
|
||||||
|
tagList = [ "nix" ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,16 +1,44 @@
|
||||||
# Edit this configuration file to define what should be installed on
|
{ pkgs, lib, ... }:
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
{
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
services.xserver = {
|
||||||
{ config, pkgs, ... }: {
|
enable = true;
|
||||||
# Enable the X11 windowing system.
|
desktopManager.gnome = {
|
||||||
services.xserver.enable = true;
|
enable = true;
|
||||||
# Enable the GNOME Desktop Environment.
|
# Enable VRR (Variable Refresh Rate)
|
||||||
services.xserver.displayManager.gdm.enable = true;
|
extraGSettingsOverridePackages = with pkgs; [ gnome.mutter ];
|
||||||
services.xserver.desktopManager.gnome.enable = true;
|
extraGSettingsOverrides = ''
|
||||||
|
[org.gnome.mutter]
|
||||||
|
experimental-features=['variable-refresh-rate', 'scale-monitor-framebuffer']
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
displayManager.gdm.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Workaround for https://github.com/NixOS/nixpkgs/issues/103746
|
||||||
|
systemd.services."getty@tty1".enable = false;
|
||||||
|
systemd.services."autovt@tty1".enable = false;
|
||||||
|
|
||||||
|
services.displayManager.autoLogin = {
|
||||||
|
enable = true;
|
||||||
|
user = "lelgenio";
|
||||||
|
};
|
||||||
|
|
||||||
|
programs.kdeconnect = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.gnomeExtensions.gsconnect;
|
||||||
|
};
|
||||||
|
|
||||||
|
hardware.opentabletdriver.enable = lib.mkForce false;
|
||||||
|
|
||||||
# services.xserver.displayManager.autologin.user = "lelgenio";
|
# services.xserver.displayManager.autologin.user = "lelgenio";
|
||||||
environment.systemPackages = with pkgs;
|
environment.systemPackages =
|
||||||
with gnome; [
|
with pkgs;
|
||||||
|
with gnome;
|
||||||
|
[
|
||||||
gnome-tweaks
|
gnome-tweaks
|
||||||
dconf-editor
|
dconf-editor
|
||||||
|
|
||||||
|
chrome-gnome-shell
|
||||||
|
gnomeExtensions.quick-settings-audio-devices-hider
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
97
system/greetd.nix
Normal file
97
system/greetd.nix
Normal file
|
@ -0,0 +1,97 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
inherit (config.my)
|
||||||
|
key
|
||||||
|
accent
|
||||||
|
font
|
||||||
|
theme
|
||||||
|
desktop
|
||||||
|
;
|
||||||
|
|
||||||
|
cfg = config.login-manager.greetd;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.login-manager.greetd = {
|
||||||
|
enable = lib.mkEnableOption "Use greetd as login manager";
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
|
||||||
|
# Enable the X11 windowing system.
|
||||||
|
services.xserver.enable = false;
|
||||||
|
|
||||||
|
# enable sway window manager
|
||||||
|
programs.sway = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.mySway;
|
||||||
|
wrapperFeatures.gtk = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
services.dbus.enable = true;
|
||||||
|
programs.wshowkeys.enable = true;
|
||||||
|
xdg.portal = {
|
||||||
|
enable = true;
|
||||||
|
wlr.enable = true;
|
||||||
|
# Always pick the first monitor, this is fine since I only ever use a single monitor
|
||||||
|
wlr.settings.screencast.chooser_type = "none";
|
||||||
|
# gtk portal needed to make gtk apps happy
|
||||||
|
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||||
|
};
|
||||||
|
services.greetd =
|
||||||
|
let
|
||||||
|
greetd_main_script = pkgs.writeShellScriptBin "main" ''
|
||||||
|
export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}"
|
||||||
|
${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop}
|
||||||
|
swaymsg exit
|
||||||
|
'';
|
||||||
|
swayConfig = pkgs.writeText "greetd-sway-config" ''
|
||||||
|
# `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet.
|
||||||
|
exec "${greetd_main_script}/bin/main"
|
||||||
|
bindsym Mod4+shift+e exec swaynag \
|
||||||
|
-t warning \
|
||||||
|
-m 'What do you want to do?' \
|
||||||
|
-b 'Poweroff' 'systemctl poweroff' \
|
||||||
|
-b 'Reboot' 'systemctl reboot'
|
||||||
|
input "*" {
|
||||||
|
repeat_delay 200
|
||||||
|
repeat_rate 30
|
||||||
|
xkb_layout us(colemak)
|
||||||
|
xkb_numlock enabled
|
||||||
|
xkb_options lv3:lsgt_switch,grp:shifts_toggle
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
{
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
initial_session = {
|
||||||
|
command = desktop;
|
||||||
|
user = "lelgenio";
|
||||||
|
};
|
||||||
|
default_session = {
|
||||||
|
command = "${pkgs.sway}/bin/sway --config ${swayConfig}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
sway
|
||||||
|
swaylock
|
||||||
|
swayidle
|
||||||
|
|
||||||
|
wayland
|
||||||
|
pkgs.xdg-desktop-portal
|
||||||
|
pkgs.xdg-desktop-portal-wlr
|
||||||
|
|
||||||
|
## Theme
|
||||||
|
capitaine-cursors
|
||||||
|
bibata-cursors
|
||||||
|
orchis_theme_compact
|
||||||
|
papirus_red
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,4 +1,5 @@
|
||||||
{ config, pkgs, ... }: {
|
{ config, pkgs, ... }:
|
||||||
|
{
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
# Enable the KDE Desktop Environment.
|
# Enable the KDE Desktop Environment.
|
||||||
|
|
13
system/locale.nix
Normal file
13
system/locale.nix
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
{ pkgs, config, ... }:
|
||||||
|
{
|
||||||
|
time.timeZone = "America/Sao_Paulo";
|
||||||
|
environment.variables.TZ = config.time.timeZone;
|
||||||
|
i18n.defaultLocale = "pt_BR.utf8";
|
||||||
|
|
||||||
|
# Configure keymap in X11
|
||||||
|
services.xserver.xkb = {
|
||||||
|
layout = "us";
|
||||||
|
variant = "colemak";
|
||||||
|
};
|
||||||
|
console.keyMap = "colemak";
|
||||||
|
}
|
|
@ -1,6 +1,13 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{
|
||||||
let cfg = config.packages.media-packages;
|
config,
|
||||||
in {
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
cfg = config.packages.media-packages;
|
||||||
|
in
|
||||||
|
{
|
||||||
options.packages.media-packages = {
|
options.packages.media-packages = {
|
||||||
enable = lib.mkEnableOption "media packages";
|
enable = lib.mkEnableOption "media packages";
|
||||||
};
|
};
|
||||||
|
@ -9,15 +16,18 @@ in {
|
||||||
down_meme
|
down_meme
|
||||||
yt-dlp
|
yt-dlp
|
||||||
ffmpeg
|
ffmpeg
|
||||||
|
obs-studio
|
||||||
imagemagick
|
imagemagick
|
||||||
mpc-cli
|
mpc-cli
|
||||||
pkgs.unstable.helvum
|
helvum
|
||||||
gimp
|
gimp
|
||||||
inkscape
|
inkscape
|
||||||
kdenlive
|
krita
|
||||||
blender
|
kdePackages.kdenlive
|
||||||
|
pitivi
|
||||||
|
blender-hip
|
||||||
libreoffice
|
libreoffice
|
||||||
godot
|
godot_4
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
20
system/monolith-forgejo-runner.nix
Normal file
20
system/monolith-forgejo-runner.nix
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
{ pkgs, config, ... }:
|
||||||
|
{
|
||||||
|
services.gitea-actions-runner = {
|
||||||
|
package = pkgs.forgejo-actions-runner;
|
||||||
|
instances.default = {
|
||||||
|
enable = true;
|
||||||
|
name = "monolith";
|
||||||
|
url = "https://git.lelgenio.com";
|
||||||
|
tokenFile = config.age.secrets.monolith-forgejo-runner-token.path;
|
||||||
|
labels = [
|
||||||
|
# provide a debian base with nodejs for actions
|
||||||
|
"debian-latest:docker://node:18-bullseye"
|
||||||
|
# fake the ubuntu name, because node provides no ubuntu builds
|
||||||
|
"ubuntu-latest:docker://node:18-bullseye"
|
||||||
|
# provide native execution on the host
|
||||||
|
#"native:host"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,4 +1,13 @@
|
||||||
{ config, pkgs, lib, ... }: {
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner;
|
||||||
|
in
|
||||||
|
{
|
||||||
boot.kernel.sysctl."net.ipv4.ip_forward" = true;
|
boot.kernel.sysctl."net.ipv4.ip_forward" = true;
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
services.gitlab-runner = {
|
services.gitlab-runner = {
|
||||||
|
@ -11,52 +20,16 @@
|
||||||
# dockerPrivileged = true;
|
# dockerPrivileged = true;
|
||||||
# };
|
# };
|
||||||
thoreb_builder = {
|
thoreb_builder = {
|
||||||
registrationConfigFile = config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
registrationConfigFile =
|
||||||
|
config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
||||||
dockerImage = "debian";
|
dockerImage = "debian";
|
||||||
dockerPrivileged = true;
|
dockerPrivileged = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# runner for building in docker via host's nix-daemon
|
# runner for building in docker via host's nix-daemon
|
||||||
# nix store will be readable in runner, might be insecure
|
# nix store will be readable in runner, might be insecure
|
||||||
nix = with lib;{
|
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
|
||||||
# File should contain at least these two variables:
|
thoreb-itinerario-nix = mkNixRunner config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
||||||
# `CI_SERVER_URL`
|
|
||||||
# `REGISTRATION_TOKEN`
|
|
||||||
registrationConfigFile = config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path; # 2
|
|
||||||
dockerImage = "alpine";
|
|
||||||
dockerVolumes = [
|
|
||||||
"/nix/store:/nix/store:ro"
|
|
||||||
"/nix/var/nix/db:/nix/var/nix/db:ro"
|
|
||||||
"/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro"
|
|
||||||
];
|
|
||||||
dockerDisableCache = true;
|
|
||||||
preBuildScript = pkgs.writeScript "setup-container" ''
|
|
||||||
mkdir -p -m 0755 /nix/var/log/nix/drvs
|
|
||||||
mkdir -p -m 0755 /nix/var/nix/gcroots
|
|
||||||
mkdir -p -m 0755 /nix/var/nix/profiles
|
|
||||||
mkdir -p -m 0755 /nix/var/nix/temproots
|
|
||||||
mkdir -p -m 0755 /nix/var/nix/userpool
|
|
||||||
mkdir -p -m 1777 /nix/var/nix/gcroots/per-user
|
|
||||||
mkdir -p -m 1777 /nix/var/nix/profiles/per-user
|
|
||||||
mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root
|
|
||||||
mkdir -p -m 0700 "$HOME/.nix-defexpr"
|
|
||||||
. ${pkgs.nix}/etc/profile.d/nix-daemon.sh
|
|
||||||
${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixos-20.09 nixpkgs # 3
|
|
||||||
${pkgs.nix}/bin/nix-channel --update nixpkgs
|
|
||||||
${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])}
|
|
||||||
'';
|
|
||||||
environmentVariables = {
|
|
||||||
ENV = "/etc/profile";
|
|
||||||
USER = "root";
|
|
||||||
NIX_REMOTE = "daemon";
|
|
||||||
PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
|
|
||||||
NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
|
|
||||||
};
|
|
||||||
tagList = [ "nix" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd.services.gitlab-runner.serviceConfig.Nice = 10;
|
systemd.services.gitlab-runner.serviceConfig.Nice = 10;
|
||||||
|
|
25
system/network.nix
Normal file
25
system/network.nix
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
|
# Configure network proxy if necessary
|
||||||
|
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||||
|
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||||
|
# Enable networking
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
|
# Open kde connect ports
|
||||||
|
programs.kdeconnect.enable = true;
|
||||||
|
|
||||||
|
# Enable CUPS to print documents.
|
||||||
|
# services.printing.enable = true;
|
||||||
|
|
||||||
|
security.rtkit.enable = true;
|
||||||
|
services.openssh = {
|
||||||
|
enable = true;
|
||||||
|
ports = [ 9022 ];
|
||||||
|
settings = {
|
||||||
|
PermitRootLogin = "no";
|
||||||
|
PasswordAuthentication = false;
|
||||||
|
KbdInteractiveAuthentication = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,4 +1,10 @@
|
||||||
{ config, pkgs, lib, ... }: {
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
services.nix-serve = {
|
services.nix-serve = {
|
||||||
enable = true;
|
enable = true;
|
||||||
secretKeyFile = config.age.secrets.monolith-nix-serve-privkey.path;
|
secretKeyFile = config.age.secrets.monolith-nix-serve-privkey.path;
|
||||||
|
|
50
system/nix.nix
Normal file
50
system/nix.nix
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
collectFlakeInputs =
|
||||||
|
input: [ input ] ++ lib.concatMap collectFlakeInputs (builtins.attrValues (input.inputs or { }));
|
||||||
|
in
|
||||||
|
{
|
||||||
|
system.extraDependencies = collectFlakeInputs inputs.self;
|
||||||
|
|
||||||
|
nix.registry.nixpkgs.flake = inputs.nixpkgs;
|
||||||
|
nix = {
|
||||||
|
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
|
||||||
|
gc = {
|
||||||
|
automatic = true;
|
||||||
|
dates = "weekly";
|
||||||
|
options = "--delete-older-than 7d";
|
||||||
|
};
|
||||||
|
optimise.automatic = true;
|
||||||
|
settings = {
|
||||||
|
trusted-users = [
|
||||||
|
"root"
|
||||||
|
"@wheel"
|
||||||
|
];
|
||||||
|
substituters = [
|
||||||
|
"https://cache.nixos.org"
|
||||||
|
"https://nix-community.cachix.org"
|
||||||
|
# "http://nixcache.lelgenio.1337.cx:5000"
|
||||||
|
"https://lelgenio.cachix.org"
|
||||||
|
"https://wegank.cachix.org"
|
||||||
|
"https://snowflakeos.cachix.org/"
|
||||||
|
];
|
||||||
|
trusted-public-keys = [
|
||||||
|
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||||
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
|
# "nixcache.lelgenio.1337.cx:zxCfx7S658llDgAUG0JVyNrlAdFVvPniSdDOkvfTPS8="
|
||||||
|
"lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc="
|
||||||
|
"wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs="
|
||||||
|
"snowflakeos.cachix.org-1:gXb32BL86r9bw1kBiw9AJuIkqN49xBvPd1ZW8YlqO70="
|
||||||
|
];
|
||||||
|
};
|
||||||
|
extraOptions = ''
|
||||||
|
experimental-features = nix-command flakes repl-flake
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,4 +1,13 @@
|
||||||
{ config, pkgs, lib, ... }: {
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
inherit (pkgs.callPackage ./gitlab-runner.nix { }) mkNixRunner;
|
||||||
|
in
|
||||||
|
{
|
||||||
boot.kernel.sysctl."net.ipv4.ip_forward" = true;
|
boot.kernel.sysctl."net.ipv4.ip_forward" = true;
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
services.gitlab-runner = {
|
services.gitlab-runner = {
|
||||||
|
@ -11,10 +20,14 @@
|
||||||
# dockerPrivileged = true;
|
# dockerPrivileged = true;
|
||||||
# };
|
# };
|
||||||
thoreb_builder = {
|
thoreb_builder = {
|
||||||
registrationConfigFile = config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
registrationConfigFile =
|
||||||
|
config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
||||||
dockerImage = "debian";
|
dockerImage = "debian";
|
||||||
dockerPrivileged = true;
|
dockerPrivileged = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
|
||||||
|
thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd.services.gitlab-runner.serviceConfig.Nice = 10;
|
systemd.services.gitlab-runner.serviceConfig.Nice = 10;
|
||||||
|
|
|
@ -1,14 +1,13 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
age = {
|
age = {
|
||||||
identityPaths = [ "/home/lelgenio/.ssh/id_rsa" ];
|
identityPaths = [ "/root/.ssh/id_rsa" ];
|
||||||
secrets.lelgenio-cachix.file = ../secrets/lelgenio-cachix.age;
|
secrets.lelgenio-cachix.file = ../secrets/lelgenio-cachix.age;
|
||||||
secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file =
|
secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
|
||||||
../secrets/monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
|
secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file = ../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age;
|
||||||
secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.file =
|
secrets.monolith-forgejo-runner-token.file = ../secrets/monolith-forgejo-runner-token.age;
|
||||||
../secrets/gitlab-runner-thoreb-telemetria-registrationConfigFile.age;
|
secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file = ../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
|
||||||
secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.file =
|
secrets.monolith-nix-serve-privkey.file = ../secrets/monolith-nix-serve-privkey.age;
|
||||||
../secrets/rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.age;
|
secrets.phantom-forgejo-mailer-password.file = ../secrets/phantom-forgejo-mailer-password.age;
|
||||||
secrets.monolith-nix-serve-privkey.file =
|
|
||||||
../secrets/monolith-nix-serve-privkey.age;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
12
system/sound.nix
Normal file
12
system/sound.nix
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
sound.enable = true;
|
||||||
|
hardware.pulseaudio.enable = false;
|
||||||
|
services.pipewire = {
|
||||||
|
enable = true;
|
||||||
|
wireplumber.enable = true;
|
||||||
|
pulse.enable = true;
|
||||||
|
alsa.enable = true;
|
||||||
|
jack.enable = true;
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,24 +0,0 @@
|
||||||
{ pkgs, ... }: {
|
|
||||||
specialisation.dark-theme.configuration = {
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
(final: prev: {
|
|
||||||
uservars = prev.uservars;
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
|
||||||
specialisation.light-theme.configuration = {
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
(final: prev: {
|
|
||||||
uservars = prev.uservars // rec {
|
|
||||||
theme = prev.uservars.themes.light;
|
|
||||||
color = theme.color;
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
|
||||||
environment.systemPackages = [
|
|
||||||
(pkgs.writeShellScriptBin "theme" ''
|
|
||||||
sudo "/nix/var/nix/profiles/system/specialisation/$1-theme/bin/switch-to-configuration" test
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
}
|
|
|
@ -1,6 +1,33 @@
|
||||||
{ config, pkgs, inputs, ... }: {
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
|
programs.steam.package = pkgs.steam.override {
|
||||||
|
extraLibraries =
|
||||||
|
pkgs:
|
||||||
|
with config.hardware.opengl;
|
||||||
|
if pkgs.hostPlatform.is64bit then
|
||||||
|
[ package ] ++ extraPackages
|
||||||
|
else
|
||||||
|
[ package32 ] ++ extraPackages32;
|
||||||
|
|
||||||
|
extraPkgs =
|
||||||
|
pkgs: with pkgs; [
|
||||||
|
capitaine-cursors
|
||||||
|
bibata-cursors
|
||||||
|
mangohud
|
||||||
|
xdg-user-dirs
|
||||||
|
];
|
||||||
|
};
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
protontricks
|
protontricks
|
||||||
|
bottles
|
||||||
];
|
];
|
||||||
|
|
||||||
|
programs.dzgui.enable = true;
|
||||||
|
programs.dzgui.package = inputs.dzgui-nix.packages.${pkgs.system}.default;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,75 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
let
|
|
||||||
inherit (pkgs.uservars) key accent font theme;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
|
||||||
services.xserver.enable = false;
|
|
||||||
|
|
||||||
# enable sway window manager
|
|
||||||
programs.sway = {
|
|
||||||
enable = true;
|
|
||||||
wrapperFeatures.gtk = true;
|
|
||||||
};
|
|
||||||
services.dbus.enable = true;
|
|
||||||
programs.wshowkeys.enable = true;
|
|
||||||
xdg.portal = {
|
|
||||||
enable = true;
|
|
||||||
wlr.enable = true;
|
|
||||||
# gtk portal needed to make gtk apps happy
|
|
||||||
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
|
||||||
};
|
|
||||||
services.greetd =
|
|
||||||
let
|
|
||||||
greetd_main_script = pkgs.writeShellScriptBin "main" ''
|
|
||||||
${pkgs.dbus-sway-environment}/bin/dbus-sway-environment
|
|
||||||
export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}"
|
|
||||||
${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c sway
|
|
||||||
swaymsg exit
|
|
||||||
'';
|
|
||||||
swayConfig = pkgs.writeText "greetd-sway-config" ''
|
|
||||||
# `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet.
|
|
||||||
exec "${greetd_main_script}/bin/main"
|
|
||||||
bindsym Mod4+shift+e exec swaynag \
|
|
||||||
-t warning \
|
|
||||||
-m 'What do you want to do?' \
|
|
||||||
-b 'Poweroff' 'systemctl poweroff' \
|
|
||||||
-b 'Reboot' 'systemctl reboot'
|
|
||||||
input "*" {
|
|
||||||
repeat_delay 200
|
|
||||||
repeat_rate 30
|
|
||||||
xkb_layout us(colemak)
|
|
||||||
xkb_numlock enabled
|
|
||||||
xkb_options lv3:lsgt_switch,grp:shifts_toggle
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
initial_session = {
|
|
||||||
command = "${pkgs.sway}/bin/sway";
|
|
||||||
user = "lelgenio";
|
|
||||||
};
|
|
||||||
default_session = {
|
|
||||||
command = "${pkgs.sway}/bin/sway --config ${swayConfig}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
sway
|
|
||||||
swaylock
|
|
||||||
swayidle
|
|
||||||
|
|
||||||
wayland
|
|
||||||
pkgs.xdg-desktop-portal
|
|
||||||
pkgs.xdg-desktop-portal-wlr
|
|
||||||
|
|
||||||
## Theme
|
|
||||||
capitaine-cursors
|
|
||||||
bibata-cursors
|
|
||||||
orchis_theme_compact
|
|
||||||
papirus_red
|
|
||||||
];
|
|
||||||
}
|
|
32
system/thunar.nix
Normal file
32
system/thunar.nix
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
programs.thunar = {
|
||||||
|
enable = true;
|
||||||
|
plugins = with pkgs.xfce; [
|
||||||
|
thunar-archive-plugin
|
||||||
|
thunar-volman
|
||||||
|
];
|
||||||
|
};
|
||||||
|
# Mount, trash, and other functionalities
|
||||||
|
services.gvfs.enable = true;
|
||||||
|
# Thumbnail support for images
|
||||||
|
services.tumbler.enable = true;
|
||||||
|
|
||||||
|
environment.systemPackages = [
|
||||||
|
(pkgs.writeTextFile {
|
||||||
|
name = "thumbs";
|
||||||
|
text = ''
|
||||||
|
[Thumbnailer Entry]
|
||||||
|
TryExec=unzip
|
||||||
|
Exec=sh -c "${pkgs.unzip}/bin/unzip -p %i preview.png > %o"
|
||||||
|
MimeType=application/x-krita;
|
||||||
|
'';
|
||||||
|
destination = "/share/thumbnailers/kra.thumbnailer";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
}
|
29
system/users.nix
Normal file
29
system/users.nix
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
security.sudo.wheelNeedsPassword = false;
|
||||||
|
|
||||||
|
# services.getty.autologinUser = "lelgenio";
|
||||||
|
programs.fish.enable = true;
|
||||||
|
|
||||||
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
|
users.mutableUsers = false;
|
||||||
|
users.users.lelgenio = {
|
||||||
|
isNormalUser = true;
|
||||||
|
description = "Leonardo Eugênio";
|
||||||
|
hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
|
||||||
|
extraGroups = [
|
||||||
|
"networkmanager"
|
||||||
|
"wheel"
|
||||||
|
"docker"
|
||||||
|
"adbusers"
|
||||||
|
"bluetooth"
|
||||||
|
"corectrl"
|
||||||
|
"vboxusers"
|
||||||
|
];
|
||||||
|
shell = pkgs.fish;
|
||||||
|
openssh.authorizedKeys.keys = [
|
||||||
|
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxR/w+38b2lX90yNBqhq3mUmkn1WGu6GAPhN1tVp2ZjYRJNV/+5gWCnTtOWYtDx35HmK/spQ2Qy8X9ttkzORa24fysNx1Iqn/TiXhD7eIJjbGPnrOpIKTkW5/uB3SD/P5NBSa06//BaqJU4sBlG79hoXRpod052hQtdpTVDiMCIV+iboWPKqopmJJfWdBtVnHXs9rep0htPRExxGslImFk7Z6xjcaHyCpIQZPlOGf+sGsmUU7jRqzvZFV8ucIdbnAlMHrU4pepNFhuraESyZVTa/bi9sw0iozXp5Q5+5thMebEslmT1Z771kI4sieDy+O4r8c0Sx2/VY1UAzcpq1faggc3YB01MTh+tiEC6xdMvZLrQGL1NBWjHleMyL53GU5ERluC0vXJF3Hv3BGGBDfXWbrEm5n06DHr2apRVJGC0LwiQ7Woud1X4V4X1pKSusxCVMjT2lmcOwV6YhKhB2sowJc1OdMx4+tL0UWE+YKSZgBHfolwk6ml0F4EO9nnUHc= lelgenio@i15"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
users.users.root.initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3";
|
||||||
|
}
|
2
update
2
update
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
nix flake update --verbose --print-build-logs
|
nix flake update --verbose --print-build-logs
|
||||||
./switch
|
exec ./switch "$@"
|
||||||
|
|
|
@ -1,6 +1,16 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
inherit (pkgs.uservars) key theme accent font;
|
inherit (config.my)
|
||||||
|
key
|
||||||
|
theme
|
||||||
|
accent
|
||||||
|
font
|
||||||
|
;
|
||||||
inherit (theme) color;
|
inherit (theme) color;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
@ -10,7 +20,9 @@ in
|
||||||
settings = {
|
settings = {
|
||||||
font = {
|
font = {
|
||||||
size = font.size.small;
|
size = font.size.small;
|
||||||
normal = { family = font.mono; };
|
normal = {
|
||||||
|
family = font.mono;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
colors = {
|
colors = {
|
||||||
primary = {
|
primary = {
|
||||||
|
@ -31,8 +43,8 @@ in
|
||||||
cyan = "${color.normal.cyan}";
|
cyan = "${color.normal.cyan}";
|
||||||
white = "${color.normal.white}";
|
white = "${color.normal.white}";
|
||||||
};
|
};
|
||||||
|
draw_bold_text_with_bright_colors = false;
|
||||||
};
|
};
|
||||||
draw_bold_text_with_bright_colors = false;
|
|
||||||
window = {
|
window = {
|
||||||
opacity = theme.opacity / 100.0;
|
opacity = theme.opacity / 100.0;
|
||||||
dynamic_padding = true;
|
dynamic_padding = true;
|
||||||
|
@ -40,32 +52,35 @@ in
|
||||||
|
|
||||||
hints = {
|
hints = {
|
||||||
alphabet = key.hints;
|
alphabet = key.hints;
|
||||||
enabled = [{
|
enabled = [
|
||||||
regex =
|
{
|
||||||
let
|
regex =
|
||||||
mimes =
|
let
|
||||||
"(mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)";
|
mimes = "(mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)";
|
||||||
# I fucking hate regex, look at this bullshit
|
# I fucking hate regex, look at this bullshit
|
||||||
delimiters = ''^\\u0000-\\u001F\\u007F-\\u009F<>"\\s{-}\\^⟨⟩`'';
|
delimiters = ''^\\u0000-\\u001F\\u007F-\\u009F<>"\\s{-}\\^⟨⟩`'';
|
||||||
# Kakoune uses these characters to represent whitespace,
|
# Kakoune uses these characters to represent whitespace,
|
||||||
# but alacritty doesn't know about them
|
# but alacritty doesn't know about them
|
||||||
whitespace_characters = ''¬·→'';
|
whitespace_characters = ''¬·→'';
|
||||||
in
|
in
|
||||||
"${mimes}[${delimiters}${whitespace_characters}]+";
|
"${mimes}[${delimiters}${whitespace_characters}]+";
|
||||||
command = "xdg-open";
|
command = "xdg-open";
|
||||||
post_processing = true;
|
post_processing = true;
|
||||||
mouse = {
|
mouse = {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
mods = "None";
|
mods = "None";
|
||||||
};
|
};
|
||||||
binding = {
|
binding = {
|
||||||
key = "U";
|
key = "U";
|
||||||
mods = "Control|Shift";
|
mods = "Control|Shift";
|
||||||
};
|
};
|
||||||
}];
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
mouse = { hide_when_typing = true; };
|
mouse = {
|
||||||
key_bindings = [
|
hide_when_typing = true;
|
||||||
|
};
|
||||||
|
keyboard.bindings = [
|
||||||
{
|
{
|
||||||
key = lib.toUpper key.up;
|
key = lib.toUpper key.up;
|
||||||
mode = "Vi|~Search";
|
mode = "Vi|~Search";
|
||||||
|
@ -141,7 +156,9 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
home.sessionVariables = { TERMINAL = "alacritty"; };
|
home.sessionVariables = {
|
||||||
|
TERMINAL = "alacritty";
|
||||||
|
};
|
||||||
|
|
||||||
# Look at this fucking bullshit:
|
# Look at this fucking bullshit:
|
||||||
# https://gitlab.gnome.org/GNOME/glib/-/blob/20c4fcb2a7246a2b205649eae3ebda4296217afc/gio/gdesktopappinfo.c#L2702
|
# https://gitlab.gnome.org/GNOME/glib/-/blob/20c4fcb2a7246a2b205649eae3ebda4296217afc/gio/gdesktopappinfo.c#L2702
|
||||||
|
|
|
@ -1,6 +1,17 @@
|
||||||
{ config, pkgs, lib, inputs, ... }:
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
inherit (pkgs.uservars) key theme accent font;
|
inherit (config.my)
|
||||||
|
key
|
||||||
|
theme
|
||||||
|
accent
|
||||||
|
font
|
||||||
|
;
|
||||||
inherit (theme) color;
|
inherit (theme) color;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,59 +1,23 @@
|
||||||
{ config, pkgs, lib, inputs, ... }: {
|
{
|
||||||
systemd.user.services = {
|
config,
|
||||||
astroid = lib.mkIf (pkgs.uservars.email-client == "astroid") {
|
pkgs,
|
||||||
Unit = {
|
lib,
|
||||||
Description = "Astroid Email client";
|
inputs,
|
||||||
PartOf = [ "graphical-session.target" ];
|
...
|
||||||
After = [ "graphical-session.target" ];
|
}:
|
||||||
};
|
{
|
||||||
Service = {
|
wayland.windowManager.sway = {
|
||||||
ExecStartPre = "/usr/bin/env sleep 10s";
|
extraConfig = ''
|
||||||
ExecStart = "${pkgs.astroid}/bin/astroid";
|
exec thunderbird
|
||||||
Restart = "on-failure";
|
exec webcord
|
||||||
TimeoutStopSec = 10;
|
exec telegram-desktop
|
||||||
};
|
'';
|
||||||
Install = { WantedBy = [ "sway-session.target" ]; };
|
|
||||||
};
|
|
||||||
thunderbird = lib.mkIf (pkgs.uservars.email-client == "thunderbird") {
|
|
||||||
Unit = {
|
|
||||||
Description = "Thunderbird Email client";
|
|
||||||
PartOf = [ "graphical-session.target" ];
|
|
||||||
After = [ "graphical-session.target" ];
|
|
||||||
};
|
|
||||||
Service = {
|
|
||||||
ExecStartPre = "/usr/bin/env sleep 10s";
|
|
||||||
ExecStart = "${pkgs.thunderbird}/bin/thunderbird";
|
|
||||||
Restart = "on-failure";
|
|
||||||
};
|
|
||||||
Install = { WantedBy = [ "sway-session.target" ]; };
|
|
||||||
};
|
|
||||||
discord = {
|
|
||||||
Unit = {
|
|
||||||
Description = "Discord Internet voice chat";
|
|
||||||
PartOf = [ "graphical-session.target" ];
|
|
||||||
After = [ "graphical-session.target" "pipewire-pulse.service" "tray.service" "telegram.service" ];
|
|
||||||
};
|
|
||||||
Service = {
|
|
||||||
ExecStartPre = "/usr/bin/env sleep 12s";
|
|
||||||
ExecStart = "${pkgs.webcord}/bin/webcord";
|
|
||||||
Restart = "on-failure";
|
|
||||||
};
|
|
||||||
Install = { WantedBy = [ "sway-session.target" ]; };
|
|
||||||
};
|
|
||||||
telegram = {
|
|
||||||
Unit = {
|
|
||||||
Description = "Telegram Internet chat";
|
|
||||||
PartOf = [ "graphical-session.target" ];
|
|
||||||
After = [ "graphical-session.target" "pipewire-pulse.service" "tray.service" ];
|
|
||||||
};
|
|
||||||
Service = {
|
|
||||||
ExecStartPre = "/usr/bin/env sleep 11s";
|
|
||||||
ExecStart = "${pkgs.tdesktop}/bin/telegram-desktop";
|
|
||||||
Restart = "on-failure";
|
|
||||||
};
|
|
||||||
Install = { WantedBy = [ "sway-session.target" ]; };
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [ tdesktop webcord thunderbird ];
|
home.packages = with pkgs; [
|
||||||
|
tdesktop
|
||||||
|
webcord
|
||||||
|
thunderbird
|
||||||
|
element-desktop-wayland
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue