Compare commits
104 commits
release-24
...
main
Author | SHA1 | Date | |
---|---|---|---|
f2f4a01c6a | |||
ddf010febb | |||
8887600322 | |||
bd7ae3084a | |||
lelgenio | 43f376d9ac | ||
dbb165237e | |||
914d2ffde5 | |||
1fd0100b3c | |||
74624151b9 | |||
ab40423e4e | |||
b1f467866a | |||
bc2ee9c165 | |||
65bdab45c6 | |||
323e3cc7ce | |||
113919f4b8 | |||
a07a96b3bd | |||
324814f7e2 | |||
49d0cf16e3 | |||
ed511cd0fd | |||
9da25c99fe | |||
3bf1bd220e | |||
30225c2678 | |||
560b6f1c2a | |||
4b7f28b93b | |||
991aeebc14 | |||
6237543c62 | |||
5e4c04502d | |||
18cf69a760 | |||
ec9c0addc0 | |||
7588c36d97 | |||
a2a82dbe7c | |||
981fe889ff | |||
3b78f02c27 | |||
b00b0bceb0 | |||
lelgenio | c091e2d40d | ||
lelgenio | c73663340a | ||
a8543c5090 | |||
665dc96362 | |||
0da79f1fd7 | |||
84e26f0573 | |||
1c5cdc9e27 | |||
lelgenio | 1e50c2e9dc | ||
b7d17a0173 | |||
1475ab2806 | |||
752f029bce | |||
82b8006bea | |||
77d82ba339 | |||
0c5a95665c | |||
da1634aa29 | |||
ea235409b8 | |||
99a9adc489 | |||
34de8dab67 | |||
4fdc28fd18 | |||
b3aadef8cb | |||
2de6fdb7be | |||
a4d1e30625 | |||
8bcdf0e67e | |||
8d4dbf5d71 | |||
03d852b612 | |||
3d0fe199ce | |||
19f1d8c1a0 | |||
325ba751d8 | |||
f5945b14fa | |||
cca203b104 | |||
c4f9705002 | |||
0fa3ae4add | |||
lelgenio | 6b85e09715 | ||
83d268e422 | |||
f44b2cd53d | |||
ada392b3f3 | |||
bb023ea24a | |||
670c7d3629 | |||
c98c2cd0db | |||
675708d695 | |||
lelgenio | 9ce5b5b04d | ||
lelgenio | 7f98148366 | ||
lelgenio | af5a00b926 | ||
lelgenio | f93ffbb1a9 | ||
lelgenio | d0033a98f1 | ||
lelgenio | 2057a24a63 | ||
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 |
766
flake.lock
766
flake.lock
|
@ -16,37 +16,23 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"advisory-db_2": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1683272394,
|
|
||||||
"narHash": "sha256-4XQZbSZ8XYAeASpr0Er8mNPnjbYLJwvaB+VyH+bt6DE=",
|
|
||||||
"owner": "rustsec",
|
|
||||||
"repo": "advisory-db",
|
|
||||||
"rev": "50bed3ba4066e6255dab434dc845e7f655812ce1",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "rustsec",
|
|
||||||
"repo": "advisory-db",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"agenix": {
|
"agenix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"darwin": "darwin",
|
"darwin": "darwin",
|
||||||
"home-manager": "home-manager",
|
"home-manager": [
|
||||||
|
"home-manager"
|
||||||
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1716561646,
|
"lastModified": 1723293904,
|
||||||
"narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
|
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
|
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -97,20 +83,17 @@
|
||||||
},
|
},
|
||||||
"crane_2": {
|
"crane_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_2",
|
|
||||||
"flake-utils": "flake-utils_4",
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"maildir-notify-daemon",
|
"warthunder-leak-counter",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
]
|
||||||
"rust-overlay": "rust-overlay_2"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683505101,
|
"lastModified": 1718730147,
|
||||||
"narHash": "sha256-VBU64Jfu2V4sUR5+tuQS9erBRAe/QEYUxdVMcJGMZZs=",
|
"narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=",
|
||||||
"owner": "ipetkov",
|
"owner": "ipetkov",
|
||||||
"repo": "crane",
|
"repo": "crane",
|
||||||
"rev": "7b5bd9e5acb2bb0cfba2d65f34d8568a894cdb6c",
|
"rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -186,20 +169,60 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dzgui-nix": {
|
"disko": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715128199,
|
"lastModified": 1726590912,
|
||||||
"narHash": "sha256-mj23cBtiDKy3pgg+J26UA8giZgmJApO8IQlC6+XTAx8=",
|
"narHash": "sha256-5bxY85siOIqOcQ8TOMAWLkMUZvLUADS2i5TsZhzUIZY=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "disko",
|
||||||
|
"rev": "d32d1504c77d7f6ba7e033357dcf638baceab9b7",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "disko",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"dzgui": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1702780245,
|
||||||
|
"narHash": "sha256-cdW5LN2Q7eYW8xIqKPQfeYPd7e6VdJGaoA9NMHesCrE=",
|
||||||
|
"owner": "aclist",
|
||||||
|
"repo": "dztui",
|
||||||
|
"rev": "28323f3edb8fa747dc559d1939ccdd7729e4e3a1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "aclist",
|
||||||
|
"repo": "dztui",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"dzgui-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"dzgui": "dzgui",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1702850463,
|
||||||
|
"narHash": "sha256-qR/c/GjsLUzrCyHN/Q9nnClduf6OqTg26S1AFYKPzxA=",
|
||||||
"owner": "lelgenio",
|
"owner": "lelgenio",
|
||||||
"repo": "dzgui-nix",
|
"repo": "dzgui-nix",
|
||||||
"rev": "03968bade43d23c47e8b4f102c711c171c446645",
|
"rev": "2ed6515b27d8186b9fedfe1dcaf861f07e796a0d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "lelgenio",
|
"owner": "lelgenio",
|
||||||
|
"ref": "dzgui-4.1.0",
|
||||||
"repo": "dzgui-nix",
|
"repo": "dzgui-nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -243,52 +266,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_2": {
|
"flake-compat_2": {
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1673956053,
|
|
||||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1696426674,
|
|
||||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
|
||||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
|
||||||
"revCount": 57,
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat_4": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1650374568,
|
|
||||||
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat_5": {
|
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696426674,
|
"lastModified": 1696426674,
|
||||||
|
@ -322,24 +299,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils-plus": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils_6"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1696331477,
|
|
||||||
"narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=",
|
|
||||||
"owner": "gytis-ivaskevicius",
|
|
||||||
"repo": "flake-utils-plus",
|
|
||||||
"rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "gytis-ivaskevicius",
|
|
||||||
"repo": "flake-utils-plus",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_2": {
|
"flake-utils_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_3"
|
"systems": "systems_3"
|
||||||
|
@ -411,43 +370,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_6": {
|
"flake-utils_6": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_8"
|
"systems": "systems_7"
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1694529238,
|
|
||||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_7": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_10"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681202837,
|
|
||||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_8": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_11"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
@ -466,36 +389,15 @@
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"agenix",
|
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1703113217,
|
"lastModified": 1726592409,
|
||||||
"narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
|
"narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
|
"rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594",
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1717527182,
|
|
||||||
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "845a5c4c073f74105022533907703441e0464bc3",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -505,192 +407,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"hyprcursor": {
|
|
||||||
"inputs": {
|
|
||||||
"hyprlang": [
|
|
||||||
"hyprland",
|
|
||||||
"hyprlang"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"hyprland",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"systems": [
|
|
||||||
"hyprland",
|
|
||||||
"systems"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1716576411,
|
|
||||||
"narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=",
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "hyprcursor",
|
|
||||||
"rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "hyprcursor",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"hyprland": {
|
|
||||||
"inputs": {
|
|
||||||
"hyprcursor": "hyprcursor",
|
|
||||||
"hyprlang": "hyprlang",
|
|
||||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"systems": "systems_4",
|
|
||||||
"xdph": "xdph"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1717605046,
|
|
||||||
"narHash": "sha256-zzdMmUNJCPY1KqVjzpukHOecae1AiAzwmBN5hq7jM2U=",
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "Hyprland",
|
|
||||||
"rev": "c95845b1488b4bd63e901cbdc4cb68c27a45971b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "Hyprland",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"hyprland-protocols": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"hyprland",
|
|
||||||
"xdph",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"systems": [
|
|
||||||
"hyprland",
|
|
||||||
"xdph",
|
|
||||||
"systems"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1691753796,
|
|
||||||
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "hyprland-protocols",
|
|
||||||
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "hyprland-protocols",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"hyprlang": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"hyprland",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"systems": [
|
|
||||||
"hyprland",
|
|
||||||
"systems"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1716473782,
|
|
||||||
"narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=",
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "hyprlang",
|
|
||||||
"rev": "87d5d984109c839482b88b4795db073eb9ed446f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "hyprlang",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"hyprwayland-scanner": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"hyprland",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"systems": [
|
|
||||||
"hyprland",
|
|
||||||
"systems"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1716058375,
|
|
||||||
"narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=",
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "hyprwayland-scanner",
|
|
||||||
"rev": "3afed4364790aebe0426077631af1e164a9650cc",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "hyprwayland-scanner",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"lipsum": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1630421397,
|
|
||||||
"narHash": "sha256-a6uv0tJulN9cAGWxvQr8B0PUJEY8Rx4e759xzS66Xlo=",
|
|
||||||
"owner": "hannenz",
|
|
||||||
"repo": "lipsum",
|
|
||||||
"rev": "0fb31e6ede10fbd78d7652f5fb21670cddd8e3ed",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hannenz",
|
|
||||||
"repo": "lipsum",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"maildir-notify-daemon": {
|
|
||||||
"inputs": {
|
|
||||||
"advisory-db": "advisory-db_2",
|
|
||||||
"crane": "crane_2",
|
|
||||||
"flake-utils": "flake-utils_5",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1683946606,
|
|
||||||
"narHash": "sha256-nzI8XDjf7Q0NZdVuxEvkkU4x0w229DmJZAN2yB92oMc=",
|
|
||||||
"owner": "lelgenio",
|
|
||||||
"repo": "maildir-notify-daemon",
|
|
||||||
"rev": "f609cbd6dd6accce8f24594bc2e13822023e3d79",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "lelgenio",
|
|
||||||
"repo": "maildir-notify-daemon",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"material-wifi-icons": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1703850449,
|
|
||||||
"narHash": "sha256-KykU5J7SdpBDG+6rkD//XeHd+6pK3qabe+88RduhwKc=",
|
|
||||||
"owner": "dcousens",
|
|
||||||
"repo": "material-wifi-icons",
|
|
||||||
"rev": "2daf6b3d96d65beb2a3e37a9a53556aab3826d97",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "dcousens",
|
|
||||||
"repo": "material-wifi-icons",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-index-database": {
|
"nix-index-database": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -698,11 +414,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717297675,
|
"lastModified": 1726449931,
|
||||||
"narHash": "sha256-43UmlS1Ifx17y93/Vc258U7bOlAAIZbu8dsGDHOIIr0=",
|
"narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "972a52bee3991ae1f1899e6452e0d7c01ee566d9",
|
"rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -711,88 +427,24 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix-software-center": {
|
|
||||||
"inputs": {
|
|
||||||
"nixos-appstream-data": "nixos-appstream-data",
|
|
||||||
"nixpkgs": "nixpkgs_2",
|
|
||||||
"utils": "utils"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1714856183,
|
|
||||||
"narHash": "sha256-Ue7xV+rZqImux4DDj3VMla4LIH2g8VeXbTJwgvX7wOo=",
|
|
||||||
"owner": "vlinkz",
|
|
||||||
"repo": "nix-software-center",
|
|
||||||
"rev": "b9e0f53536e1e94e7d8c3cda3c6866b3f9d01386",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "vlinkz",
|
|
||||||
"repo": "nix-software-center",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixos-appstream-data": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": [
|
|
||||||
"nix-software-center",
|
|
||||||
"utils"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"nix-software-center",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1712858390,
|
|
||||||
"narHash": "sha256-XE7gr+zU3N4SHPAhsgk8cVAFp1iBg+Lxxp3y4dUF1vE=",
|
|
||||||
"owner": "korfuri",
|
|
||||||
"repo": "nixos-appstream-data",
|
|
||||||
"rev": "0465d42a4433faa63b7a5eb0b8d397937c9fc13a",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "korfuri",
|
|
||||||
"ref": "flake",
|
|
||||||
"repo": "nixos-appstream-data",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixos-conf-editor": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": "flake-compat_3",
|
|
||||||
"nixpkgs": "nixpkgs_3",
|
|
||||||
"snowfall-lib": "snowfall-lib"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1707338010,
|
|
||||||
"narHash": "sha256-UtLeZzDdk96sLTRcWsGrkWCslNUDytrGe0VmOTB/iig=",
|
|
||||||
"owner": "vlinkz",
|
|
||||||
"repo": "nixos-conf-editor",
|
|
||||||
"rev": "27b5e92f580f794c690093503869aab242f075ab",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "vlinkz",
|
|
||||||
"repo": "nixos-conf-editor",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixos-mailserver": {
|
"nixos-mailserver": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"blobs": "blobs",
|
"blobs": "blobs",
|
||||||
"flake-compat": "flake-compat_5",
|
"flake-compat": "flake-compat_2",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"nixpkgs-24_05": "nixpkgs-24_05",
|
"nixpkgs-24_05": [
|
||||||
"utils": "utils_2"
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717515260,
|
"lastModified": 1718084203,
|
||||||
"narHash": "sha256-UJhSsczeTpRpoXICuRk++NORXE2qNTEwOn0rL3uTJ3E=",
|
"narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"rev": "b51ae1a235353ffdfa9f5874e6aea32e367a5739",
|
"rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -804,73 +456,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714562304,
|
"lastModified": 1726447378,
|
||||||
"narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=",
|
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7",
|
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-24_05": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1717144377,
|
|
||||||
"narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "805a384895c696f802a9bf5bf4720f37385df547",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"ref": "nixos-24.05",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1692638711,
|
|
||||||
"narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1698318101,
|
|
||||||
"narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_4": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1717281328,
|
|
||||||
"narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -916,20 +506,16 @@
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
"demoji": "demoji",
|
"demoji": "demoji",
|
||||||
"dhist": "dhist",
|
"dhist": "dhist",
|
||||||
|
"disko": "disko",
|
||||||
"dzgui-nix": "dzgui-nix",
|
"dzgui-nix": "dzgui-nix",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager",
|
||||||
"hyprland": "hyprland",
|
|
||||||
"lipsum": "lipsum",
|
|
||||||
"maildir-notify-daemon": "maildir-notify-daemon",
|
|
||||||
"material-wifi-icons": "material-wifi-icons",
|
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nix-software-center": "nix-software-center",
|
|
||||||
"nixos-conf-editor": "nixos-conf-editor",
|
|
||||||
"nixos-mailserver": "nixos-mailserver",
|
"nixos-mailserver": "nixos-mailserver",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs",
|
||||||
"plymouth-themes": "plymouth-themes",
|
"plymouth-themes": "plymouth-themes",
|
||||||
"ranger-icons": "ranger-icons",
|
"ranger-icons": "ranger-icons",
|
||||||
"tlauncher": "tlauncher",
|
"tlauncher": "tlauncher",
|
||||||
|
"warthunder-leak-counter": "warthunder-leak-counter",
|
||||||
"wl-crosshair": "wl-crosshair"
|
"wl-crosshair": "wl-crosshair"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -977,56 +563,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay_2": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": [
|
|
||||||
"maildir-notify-daemon",
|
|
||||||
"crane",
|
|
||||||
"flake-utils"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"maildir-notify-daemon",
|
|
||||||
"crane",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1683080331,
|
|
||||||
"narHash": "sha256-nGDvJ1DAxZIwdn6ww8IFwzoHb2rqBP4wv/65Wt5vflk=",
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"rev": "d59c3fa0cba8336e115b376c2d9e91053aa59e56",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"snowfall-lib": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": "flake-compat_4",
|
|
||||||
"flake-utils-plus": "flake-utils-plus",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixos-conf-editor",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1696432959,
|
|
||||||
"narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=",
|
|
||||||
"owner": "snowfallorg",
|
|
||||||
"repo": "lib",
|
|
||||||
"rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "snowfallorg",
|
|
||||||
"repo": "lib",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems": {
|
"systems": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
|
@ -1042,36 +578,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_10": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems_11": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems_2": {
|
"systems_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681028828,
|
"lastModified": 1681028828,
|
||||||
|
@ -1104,16 +610,16 @@
|
||||||
},
|
},
|
||||||
"systems_4": {
|
"systems_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1689347949,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default-linux",
|
"repo": "default",
|
||||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "default-linux",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -1162,39 +668,9 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_8": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems_9": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tlauncher": {
|
"tlauncher": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_7",
|
"flake-utils": "flake-utils_4",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
|
@ -1215,25 +691,7 @@
|
||||||
},
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_7"
|
"systems": "systems_4"
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1689068808,
|
|
||||||
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"utils_2": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_9"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709126324,
|
"lastModified": 1709126324,
|
||||||
|
@ -1249,9 +707,31 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"warthunder-leak-counter": {
|
||||||
|
"inputs": {
|
||||||
|
"crane": "crane_2",
|
||||||
|
"flake-utils": "flake-utils_5",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1719076817,
|
||||||
|
"narHash": "sha256-B6NTomYXL50j6fabZrAGvTPp3zv5oFxNUhwvLhDNoMw=",
|
||||||
|
"ref": "refs/heads/main",
|
||||||
|
"rev": "406d6646970191c016a375f25a35aa00dfa0d4aa",
|
||||||
|
"revCount": 4,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.lelgenio.com/lelgenio/warthunder-leak-counter"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.lelgenio.com/lelgenio/warthunder-leak-counter"
|
||||||
|
}
|
||||||
|
},
|
||||||
"wl-crosshair": {
|
"wl-crosshair": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_8",
|
"flake-utils": "flake-utils_6",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
|
@ -1269,36 +749,6 @@
|
||||||
"repo": "wl-crosshair",
|
"repo": "wl-crosshair",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"xdph": {
|
|
||||||
"inputs": {
|
|
||||||
"hyprland-protocols": "hyprland-protocols",
|
|
||||||
"hyprlang": [
|
|
||||||
"hyprland",
|
|
||||||
"hyprlang"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"hyprland",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"systems": [
|
|
||||||
"hyprland",
|
|
||||||
"systems"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1716290197,
|
|
||||||
"narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
|
||||||
"rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hyprwm",
|
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
46
flake.nix
46
flake.nix
|
@ -10,35 +10,27 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
hyprland = {
|
|
||||||
url = "github:hyprwm/Hyprland";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
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;
|
|
||||||
|
|
||||||
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";
|
|
||||||
lipsum.flake = false;
|
|
||||||
|
|
||||||
agenix = {
|
agenix = {
|
||||||
url = "github:ryantm/agenix";
|
url = "github:ryantm/agenix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
inputs.home-manager.follows = "home-manager";
|
||||||
};
|
};
|
||||||
|
|
||||||
nixos-mailserver = {
|
nixos-mailserver = {
|
||||||
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
|
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
inputs.nixpkgs-24_05.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
dzgui-nix = {
|
dzgui-nix = {
|
||||||
url = "github:lelgenio/dzgui-nix";
|
url = "github:lelgenio/dzgui-nix/dzgui-4.1.0";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
tlauncher = {
|
tlauncher = {
|
||||||
|
@ -46,6 +38,9 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
disko.url = "github:nix-community/disko";
|
||||||
|
disko.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
# my stuff
|
# my stuff
|
||||||
dhist = {
|
dhist = {
|
||||||
url = "github:lelgenio/dhist";
|
url = "github:lelgenio/dhist";
|
||||||
|
@ -55,18 +50,14 @@
|
||||||
url = "github:lelgenio/demoji";
|
url = "github:lelgenio/demoji";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
maildir-notify-daemon = {
|
|
||||||
url = "github:lelgenio/maildir-notify-daemon";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
wl-crosshair = {
|
wl-crosshair = {
|
||||||
url = "github:lelgenio/wl-crosshair";
|
url = "github:lelgenio/wl-crosshair";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
warthunder-leak-counter = {
|
||||||
# gnome stuff
|
url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter";
|
||||||
nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nix-software-center.url = "github:vlinkz/nix-software-center";
|
};
|
||||||
};
|
};
|
||||||
outputs =
|
outputs =
|
||||||
inputs:
|
inputs:
|
||||||
|
@ -96,15 +87,13 @@
|
||||||
{ nixpkgs.pkgs = pkgs; }
|
{ nixpkgs.pkgs = pkgs; }
|
||||||
./system/configuration.nix
|
./system/configuration.nix
|
||||||
./system/secrets.nix
|
./system/secrets.nix
|
||||||
./system/specialisation.nix
|
|
||||||
./system/greetd.nix
|
./system/greetd.nix
|
||||||
{ login-manager.greetd.enable = desktop == "sway" || desktop == "hyprland"; }
|
{ login-manager.greetd.enable = desktop == "sway"; }
|
||||||
|
|
||||||
inputs.agenix.nixosModules.default
|
inputs.agenix.nixosModules.default
|
||||||
inputs.hyprland.nixosModules.default
|
|
||||||
inputs.dzgui-nix.nixosModules.default
|
inputs.dzgui-nix.nixosModules.default
|
||||||
{ programs.hyprland.enable = (desktop == "hyprland"); }
|
|
||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
inputs.disko.nixosModules.disko
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
|
@ -121,15 +110,18 @@
|
||||||
++ lib.optional (desktop == "kde") ./system/kde.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/monolith-forgejo-runner.nix
|
||||||
./system/nix-serve.nix
|
./system/nix-serve.nix
|
||||||
|
@ -139,7 +131,7 @@
|
||||||
rainbow = lib.nixosSystem {
|
rainbow = lib.nixosSystem {
|
||||||
inherit system specialArgs;
|
inherit system specialArgs;
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/rainbow.nix
|
./hosts/rainbow
|
||||||
./system/rainbow-gitlab-runner.nix
|
./system/rainbow-gitlab-runner.nix
|
||||||
] ++ common_modules;
|
] ++ common_modules;
|
||||||
};
|
};
|
||||||
|
|
|
@ -46,6 +46,12 @@ in
|
||||||
|
|
||||||
swapDevices = [ ];
|
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
|
# 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
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
|
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;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -20,7 +20,11 @@ let
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
imports = [
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
./partition.nix
|
||||||
|
./undervolt.nix
|
||||||
|
];
|
||||||
boot.initrd.availableKernelModules = [
|
boot.initrd.availableKernelModules = [
|
||||||
"nvme"
|
"nvme"
|
||||||
"xhci_pci"
|
"xhci_pci"
|
||||||
|
@ -40,10 +44,8 @@ in
|
||||||
"zenpower"
|
"zenpower"
|
||||||
];
|
];
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
|
"amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
|
||||||
"video=DP-1:1920x1080@144"
|
"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 = ''
|
systemd.sleep.extraConfig = ''
|
||||||
HibernateDelaySec=30s
|
HibernateDelaySec=30s
|
||||||
|
@ -63,14 +65,14 @@ in
|
||||||
rocmPackages.rocm-smi
|
rocmPackages.rocm-smi
|
||||||
];
|
];
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/mnt/old" = {
|
||||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd;
|
options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
};
|
};
|
||||||
# boot.initrd.luks.reusePassphrases = true;
|
# boot.initrd.luks.reusePassphrases = true;
|
||||||
boot.initrd.luks.devices = {
|
boot.initrd.luks.devices = {
|
||||||
"main" = {
|
"old" = {
|
||||||
bypassWorkqueues = true;
|
bypassWorkqueues = true;
|
||||||
device = "/dev/disk/by-label/CRYPT_ROOT";
|
device = "/dev/disk/by-label/CRYPT_ROOT";
|
||||||
};
|
};
|
||||||
|
@ -78,21 +80,21 @@ in
|
||||||
bypassWorkqueues = true;
|
bypassWorkqueues = true;
|
||||||
device = "/dev/disk/by-label/CRYPT_DATA";
|
device = "/dev/disk/by-label/CRYPT_DATA";
|
||||||
};
|
};
|
||||||
"bigboy" = {
|
# "bigboy" = {
|
||||||
bypassWorkqueues = true;
|
# bypassWorkqueues = true;
|
||||||
device = "/dev/disk/by-label/CRYPT_BIGBOY";
|
# 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;
|
|
||||||
};
|
};
|
||||||
|
# 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" = {
|
fileSystems."/home/lelgenio/Games" = {
|
||||||
device = "/dev/disk/by-label/BTRFS_DATA";
|
device = "/dev/disk/by-label/BTRFS_DATA";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
|
@ -125,27 +127,11 @@ in
|
||||||
"nofail"
|
"nofail"
|
||||||
] ++ btrfs_options;
|
] ++ btrfs_options;
|
||||||
};
|
};
|
||||||
fileSystems."/home/lelgenio/.local/mount/bigboy" = {
|
fileSystems."/home/lelgenio/.local/mount/old" = {
|
||||||
device = "/dev/disk/by-label/BTRFS_BIGBOY";
|
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
|
options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
};
|
};
|
||||||
fileSystems."/home/lelgenio/projects" = {
|
|
||||||
device = "/dev/disk/by-label/BTRFS_BIGBOY";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [
|
|
||||||
"subvol=@projects"
|
|
||||||
"nofail"
|
|
||||||
] ++ btrfs_options ++ btrfs_ssd;
|
|
||||||
};
|
|
||||||
fileSystems."/var/lib/docker" = {
|
|
||||||
device = "/dev/disk/by-label/BTRFS_BIGBOY";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [
|
|
||||||
"subvol=@docker"
|
|
||||||
"nofail"
|
|
||||||
] ++ btrfs_options ++ btrfs_ssd;
|
|
||||||
};
|
|
||||||
|
|
||||||
# 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
|
||||||
|
@ -157,6 +143,8 @@ in
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
networking.hostName = "monolith"; # Define your hostname.
|
networking.hostName = "monolith"; # Define your hostname.
|
||||||
|
|
||||||
|
virtualisation.virtualbox.host.enable = true;
|
||||||
|
|
||||||
services.udev.extraRules = ''
|
services.udev.extraRules = ''
|
||||||
# Fix broken suspend with Logitech USB dongle
|
# Fix broken suspend with Logitech USB dongle
|
||||||
# `lsusb | grep Logitech` will return "vendor:product"
|
# `lsusb | grep Logitech` will return "vendor:product"
|
||||||
|
@ -166,18 +154,23 @@ in
|
||||||
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"
|
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
|
boot.tmp = {
|
||||||
fileSystems."/swap" = {
|
cleanOnBoot = true;
|
||||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
useTmpfs = true;
|
||||||
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 = [
|
|
||||||
{
|
# swap
|
||||||
device = "/swap/swapfile";
|
# fileSystems."/swap" = {
|
||||||
size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB
|
# 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";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
18
hosts/monolith/undervolt.nix
Normal file
18
hosts/monolith/undervolt.nix
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
let
|
||||||
|
undervoltGpu = pkgs.writeShellScript "undervolt-gpu" ''
|
||||||
|
set -xe
|
||||||
|
cd $1
|
||||||
|
echo "manual" > power_dpm_force_performance_level
|
||||||
|
echo "1" > pp_power_profile_mode
|
||||||
|
test -e pp_od_clk_voltage
|
||||||
|
echo "vo -100" > pp_od_clk_voltage
|
||||||
|
echo "c" > pp_od_clk_voltage
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
{
|
||||||
|
boot.kernelParams = [ "amdgpu.ppfeaturemask=0xfffd7fff" ];
|
||||||
|
services.udev.extraRules = ''
|
||||||
|
ACTION=="add", SUBSYSTEM=="hwmon", ATTR{name}=="amdgpu", ATTR{power1_cap}="186000000", RUN+="${undervoltGpu} %S%p/device"
|
||||||
|
'';
|
||||||
|
}
|
26
hosts/phantom/davi.nix
Normal file
26
hosts/phantom/davi.nix
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
users.users.davikiwi = {
|
||||||
|
isNormalUser = true;
|
||||||
|
description = "Davi";
|
||||||
|
hashedPassword = "$y$j9T$0e/rczjOVCy7PuwC3pG0V/$gTHZhfO4wQSlFvbDyfghbCnGI2uDI0a52zSrQ/yOA5A";
|
||||||
|
openssh.authorizedKeys.keys = [
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGgZDBnj+gVMHqoNvjpx2T/HqnxUDbLPshu+t7301gXd Davi@DESKTOP-EVHFGJ9"
|
||||||
|
];
|
||||||
|
extraGroups = [ "docker" ];
|
||||||
|
packages = with pkgs; [
|
||||||
|
(pkgs.python3.withPackages (python-pkgs: [
|
||||||
|
python-pkgs.pip
|
||||||
|
python-pkgs.wheel
|
||||||
|
]))
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
services.nginx.virtualHosts."davikiwi.lelgenio.com" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://127.0.0.1:24618";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -18,8 +18,13 @@
|
||||||
./writefreely.nix
|
./writefreely.nix
|
||||||
./email.nix
|
./email.nix
|
||||||
./forgejo.nix
|
./forgejo.nix
|
||||||
|
./warthunder-leak-counter.nix
|
||||||
|
./invidious.nix
|
||||||
|
./davi.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
networking.hostName = "phantom";
|
||||||
|
|
||||||
services.nginx.virtualHosts."lelgenio.com" = {
|
services.nginx.virtualHosts."lelgenio.com" = {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
|
@ -51,6 +56,11 @@
|
||||||
identityPaths = [ "/root/.ssh/id_rsa" ];
|
identityPaths = [ "/root/.ssh/id_rsa" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nix.settings = {
|
||||||
|
cores = 1;
|
||||||
|
max-jobs = 1;
|
||||||
|
};
|
||||||
|
|
||||||
system.autoUpgrade = {
|
system.autoUpgrade = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dates = "04:40";
|
dates = "04:40";
|
||||||
|
@ -59,7 +69,7 @@
|
||||||
"--update-input"
|
"--update-input"
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
"--no-write-lock-file"
|
"--no-write-lock-file"
|
||||||
"-L"
|
"--print-build-logs"
|
||||||
];
|
];
|
||||||
flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
|
flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
|
||||||
};
|
};
|
||||||
|
|
|
@ -5,9 +5,6 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
# It's important to let Digital Ocean set the hostname so we get rDNS to work
|
|
||||||
networking.hostName = "";
|
|
||||||
|
|
||||||
imports = [ inputs.nixos-mailserver.nixosModules.mailserver ];
|
imports = [ inputs.nixos-mailserver.nixosModules.mailserver ];
|
||||||
|
|
||||||
mailserver = {
|
mailserver = {
|
||||||
|
|
|
@ -13,9 +13,6 @@ in
|
||||||
virtualHosts.${cfg.settings.server.DOMAIN} = {
|
virtualHosts.${cfg.settings.server.DOMAIN} = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
extraConfig = ''
|
|
||||||
client_max_body_size 512M;
|
|
||||||
'';
|
|
||||||
locations."/".proxyPass = "http://localhost:${toString srv.HTTP_PORT}";
|
locations."/".proxyPass = "http://localhost:${toString srv.HTTP_PORT}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -37,7 +34,7 @@ in
|
||||||
};
|
};
|
||||||
mailer = {
|
mailer = {
|
||||||
ENABLED = true;
|
ENABLED = true;
|
||||||
SMTP_ADDR = "mail.lelgenio.com";
|
SMTP_ADDR = "lelgenio.com";
|
||||||
FROM = "noreply@git.lelgenio.com";
|
FROM = "noreply@git.lelgenio.com";
|
||||||
USER = "noreply@git.lelgenio.com";
|
USER = "noreply@git.lelgenio.com";
|
||||||
};
|
};
|
||||||
|
|
12
hosts/phantom/invidious.nix
Normal file
12
hosts/phantom/invidious.nix
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
services.invidious = {
|
||||||
|
enable = true;
|
||||||
|
domain = "invidious.lelgenio.com";
|
||||||
|
nginx.enable = true;
|
||||||
|
port = 10601;
|
||||||
|
settings.db = {
|
||||||
|
user = "invidious";
|
||||||
|
dbname = "invidious";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -18,7 +18,7 @@
|
||||||
};
|
};
|
||||||
streamingProcesses = 2;
|
streamingProcesses = 2;
|
||||||
extraConfig.SINGLE_USER_MODE = "true";
|
extraConfig.SINGLE_USER_MODE = "true";
|
||||||
mediaAutoRemove.olderThanDays = 10;
|
mediaAutoRemove.olderThanDays = 5;
|
||||||
};
|
};
|
||||||
|
|
||||||
age.secrets.phantom-mastodon-mailer-password = {
|
age.secrets.phantom-mastodon-mailer-password = {
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
{
|
{
|
||||||
services.nextcloud = {
|
services.nextcloud = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nextcloud27;
|
package = pkgs.nextcloud29;
|
||||||
hostName = "cloud.lelgenio.com";
|
hostName = "cloud.lelgenio.com";
|
||||||
https = true;
|
https = true;
|
||||||
config = {
|
config = {
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
recommendedTlsSettings = true;
|
recommendedTlsSettings = true;
|
||||||
recommendedOptimisation = true;
|
recommendedOptimisation = true;
|
||||||
recommendedGzipSettings = true;
|
recommendedGzipSettings = true;
|
||||||
|
clientMaxBodySize = "512M";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Redirect *lelgenio.xyz -> *lelgenio.com
|
# Redirect *lelgenio.xyz -> *lelgenio.com
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
];
|
];
|
||||||
initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3";
|
initialHashedPassword = "$y$j9T$E3aBBSSq0Gma8hZD9L7ov0$iCGDW4fqrXWfHO0qodBYYgMFA9CpIraoklHcPbJJrM3";
|
||||||
};
|
};
|
||||||
|
|
||||||
security.sudo.wheelNeedsPassword = false;
|
security.sudo.wheelNeedsPassword = false;
|
||||||
|
|
||||||
programs.fish.enable = true;
|
programs.fish.enable = true;
|
||||||
|
|
19
hosts/phantom/warthunder-leak-counter.nix
Normal file
19
hosts/phantom/warthunder-leak-counter.nix
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
config,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
imports = [ inputs.warthunder-leak-counter.nixosModules.default ];
|
||||||
|
|
||||||
|
services.warthunder-leak-counter.enable = true;
|
||||||
|
|
||||||
|
services.nginx.virtualHosts."warthunder-leak-counter.lelgenio.com" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://127.0.0.1:${toString config.services.warthunder-leak-counter.port}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -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"
|
|
|
@ -2,26 +2,17 @@
|
||||||
rec {
|
rec {
|
||||||
all = [
|
all = [
|
||||||
scripts
|
scripts
|
||||||
sway
|
|
||||||
themes
|
themes
|
||||||
new-packages
|
new-packages
|
||||||
patches
|
patches
|
||||||
lib_extended
|
lib_extended
|
||||||
|
disko
|
||||||
];
|
];
|
||||||
|
|
||||||
scripts = (import ../scripts);
|
scripts = (import ../scripts);
|
||||||
|
|
||||||
sway = (import ./sway.nix);
|
|
||||||
|
|
||||||
themes = (
|
themes = (
|
||||||
final: prev: {
|
final: prev: {
|
||||||
material-wifi-icons = final.stdenv.mkDerivation rec {
|
|
||||||
name = "material-wifi-icons";
|
|
||||||
src = inputs.material-wifi-icons;
|
|
||||||
installPhase = ''
|
|
||||||
install -D material-wifi.ttf $out/share/fonts/${name}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
papirus_red = (final.papirus-icon-theme.override { color = "red"; });
|
papirus_red = (final.papirus-icon-theme.override { color = "red"; });
|
||||||
orchis_theme_compact = (
|
orchis_theme_compact = (
|
||||||
final.orchis-theme.override {
|
final.orchis-theme.override {
|
||||||
|
@ -50,32 +41,19 @@ rec {
|
||||||
dhist = inputs.dhist.packages.${prev.system}.dhist;
|
dhist = inputs.dhist.packages.${prev.system}.dhist;
|
||||||
demoji = inputs.demoji.packages.${prev.system}.default;
|
demoji = inputs.demoji.packages.${prev.system}.default;
|
||||||
tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
|
tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher;
|
||||||
maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default;
|
|
||||||
wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
|
wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
patches = (
|
patches = (
|
||||||
final: prev: {
|
final: prev: {
|
||||||
bemenu = prev.bemenu.overrideAttrs (o: {
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace lib/renderers/wayland/window.c \
|
|
||||||
--replace ZWLR_LAYER_SHELL_V1_LAYER_TOP ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
mySway = prev.sway.override {
|
mySway = prev.sway.override {
|
||||||
|
withBaseWrapper = true;
|
||||||
|
withGtkWrapper = true;
|
||||||
sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
|
sway-unwrapped = prev.sway-unwrapped.overrideAttrs (old: {
|
||||||
patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
|
patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
mangohud = prev.mangohud.overrideAttrs (o: {
|
|
||||||
patches = o.patches ++ [
|
|
||||||
(prev.fetchpatch {
|
|
||||||
url = "https://github.com/flightlessmango/MangoHud/commit/95141de657e02577f1d3fab0ca12122bfb68bc56.patch";
|
|
||||||
hash = "sha256-a2tESliGBkfF7uYQn8TDgeFt07A9FOioI4VcTT7DC7A=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -94,4 +72,13 @@ rec {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
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,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 DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway SWAYSOCK
|
|
||||||
# systemctl --user stop pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr
|
|
||||||
# systemctl --user start pipewire wireplumber xdg-desktop-portal xdg-desktop-portal-wlr
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
})
|
|
|
@ -2,9 +2,12 @@
|
||||||
# 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 }:
|
||||||
{
|
rec {
|
||||||
blade-formatter = pkgs.callPackage ./blade-formatter { };
|
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 { };
|
||||||
emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
|
emmet-cli = pkgs.callPackage ./emmet-cli.nix { };
|
||||||
|
material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { };
|
||||||
|
gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { };
|
||||||
|
kak-tree-sitter = pkgs.callPackage ./kak-tree-sitter.nix { };
|
||||||
}
|
}
|
||||||
|
|
64
pkgs/gnome-pass-search-provider.nix
Normal file
64
pkgs/gnome-pass-search-provider.nix
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
{
|
||||||
|
stdenv,
|
||||||
|
fetchFromGitHub,
|
||||||
|
python3Packages,
|
||||||
|
wrapGAppsHook,
|
||||||
|
gtk3,
|
||||||
|
gobject-introspection,
|
||||||
|
gnome,
|
||||||
|
}:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (python3Packages)
|
||||||
|
dbus-python
|
||||||
|
pygobject3
|
||||||
|
fuzzywuzzy
|
||||||
|
levenshtein
|
||||||
|
;
|
||||||
|
in
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "gnome-pass-search-provider";
|
||||||
|
version = "1.4.0";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "jle64";
|
||||||
|
repo = "gnome-pass-search-provider";
|
||||||
|
rev = version;
|
||||||
|
hash = "sha256-PDR8fbDoT8IkHiTopQp0zd4DQg7JlacA6NdKYKYmrWw=";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
python3Packages.wrapPython
|
||||||
|
wrapGAppsHook
|
||||||
|
];
|
||||||
|
|
||||||
|
propagatedBuildInputs = [
|
||||||
|
dbus-python
|
||||||
|
pygobject3
|
||||||
|
fuzzywuzzy
|
||||||
|
levenshtein
|
||||||
|
|
||||||
|
gtk3
|
||||||
|
gobject-introspection
|
||||||
|
];
|
||||||
|
|
||||||
|
env = {
|
||||||
|
LIBDIR = builtins.placeholder "out" + "/lib";
|
||||||
|
DATADIR = builtins.placeholder "out" + "/share";
|
||||||
|
};
|
||||||
|
|
||||||
|
postPatch = ''
|
||||||
|
substituteInPlace conf/org.gnome.Pass.SearchProvider.service.{dbus,systemd} \
|
||||||
|
--replace-fail "/usr/lib" "$LIBDIR"
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
bash ./install.sh
|
||||||
|
'';
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
makeWrapperArgs=( "''${gappsWrapperArgs[@]}" )
|
||||||
|
wrapPythonProgramsIn "$out/lib" "$out $propagatedBuildInputs"
|
||||||
|
'';
|
||||||
|
}
|
34
pkgs/kak-tree-sitter.nix
Normal file
34
pkgs/kak-tree-sitter.nix
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
stdenv,
|
||||||
|
rustPlatform,
|
||||||
|
fetchFromSourcehut,
|
||||||
|
makeWrapper,
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "kak-tree-sitter";
|
||||||
|
version = "1.1.2";
|
||||||
|
|
||||||
|
src = fetchFromSourcehut {
|
||||||
|
owner = "~hadronized";
|
||||||
|
repo = "kak-tree-sitter";
|
||||||
|
rev = "kak-tree-sitter-v${version}";
|
||||||
|
hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
cargoSha256 = "sha256-OQPUWqJAts8DbFNSsC/CmMCbuZ9TVxRTR05O7oiodKI=";
|
||||||
|
|
||||||
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
postFixup = ''
|
||||||
|
wrapProgram "$out/bin/ktsctl" \
|
||||||
|
--suffix PATH : ${stdenv.cc}
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Server that interfaces tree-sitter with kakoune";
|
||||||
|
homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter";
|
||||||
|
license = with licenses; [ mit ];
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,11 +1,22 @@
|
||||||
{ 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=";
|
||||||
|
};
|
||||||
|
|
||||||
nativeBuildInputs = with pkgs; [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
vala
|
vala
|
||||||
wrapGAppsHook
|
wrapGAppsHook
|
||||||
|
|
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}
|
||||||
|
'';
|
||||||
|
}
|
0
scripts/_diffr
Normal file → Executable file
0
scripts/_diffr
Normal file → Executable file
0
scripts/_sway_idle_toggle
Normal file → Executable file
0
scripts/_sway_idle_toggle
Normal file → Executable file
|
@ -1,26 +0,0 @@
|
||||||
#!/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
|
|
0
scripts/bmenu
Normal file → Executable file
0
scripts/bmenu
Normal file → Executable file
0
scripts/br
Normal file → Executable file
0
scripts/br
Normal file → Executable file
|
@ -1,34 +1,32 @@
|
||||||
(
|
(
|
||||||
final: prev:
|
final: prev:
|
||||||
with prev;
|
|
||||||
let
|
let
|
||||||
import_script = (_: path: import (path) { inherit pkgs lib; });
|
lib = prev.lib;
|
||||||
create_script = (
|
|
||||||
name: text: runtimeInputs:
|
|
||||||
let
|
|
||||||
script_body = pkgs.writeTextFile {
|
|
||||||
inherit name;
|
|
||||||
executable = true;
|
|
||||||
text = ''
|
|
||||||
${builtins.readFile text}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in
|
|
||||||
(pkgs.writeShellApplication {
|
|
||||||
inherit name runtimeInputs;
|
|
||||||
text = ''exec ${script_body} "$@"'';
|
|
||||||
checkPhase = "";
|
|
||||||
})
|
|
||||||
);
|
|
||||||
create_scripts = lib.mapAttrs (name: deps: create_script name ./${name} deps);
|
|
||||||
|
|
||||||
pass = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
importScript = (_: path: import (path) { inherit (final) pkgs lib; });
|
||||||
|
wrapScript =
|
||||||
|
name: text: runtimeInputs:
|
||||||
|
final.runCommand name
|
||||||
|
{
|
||||||
|
nativeBuildInputs = [ final.makeWrapper ];
|
||||||
|
meta.mainProgram = name;
|
||||||
|
}
|
||||||
|
''
|
||||||
|
mkdir -p $out/bin
|
||||||
|
cp ${text} $out/bin/${name}
|
||||||
|
wrapProgram $out/bin/${name} \
|
||||||
|
--suffix PATH : ${lib.makeBinPath runtimeInputs}
|
||||||
|
'';
|
||||||
|
createScripts = lib.mapAttrs (name: deps: wrapScript name ./${name} deps);
|
||||||
|
|
||||||
|
myPass = final.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
||||||
in
|
in
|
||||||
create_scripts {
|
with final;
|
||||||
|
createScripts {
|
||||||
br = [ ];
|
br = [ ];
|
||||||
bmenu = [
|
bmenu = [
|
||||||
final.bemenu
|
bemenu
|
||||||
final.dhist
|
dhist
|
||||||
fish
|
fish
|
||||||
j4-dmenu-desktop
|
j4-dmenu-desktop
|
||||||
jq
|
jq
|
||||||
|
@ -44,21 +42,21 @@
|
||||||
fish
|
fish
|
||||||
];
|
];
|
||||||
_diffr = [ diffr ];
|
_diffr = [ diffr ];
|
||||||
_thunar-terminal = [ final.terminal ];
|
_thunar-terminal = [ terminal ];
|
||||||
_sway_idle_toggle = [ final.swayidle ];
|
_sway_idle_toggle = [ swayidle ];
|
||||||
kak-pager = [
|
kak-pager = [
|
||||||
fish
|
fish
|
||||||
final._diffr
|
_diffr
|
||||||
];
|
];
|
||||||
kak-man-pager = [ final.kak-pager ];
|
kak-man-pager = [ kak-pager ];
|
||||||
helix-pager = [
|
helix-pager = [
|
||||||
fish
|
fish
|
||||||
final._diffr
|
_diffr
|
||||||
];
|
];
|
||||||
helix-man-pager = [ final.helix-pager ];
|
helix-man-pager = [ helix-pager ];
|
||||||
musmenu = [
|
musmenu = [
|
||||||
mpc-cli
|
mpc-cli
|
||||||
final.wdmenu
|
wdmenu
|
||||||
trash-cli
|
trash-cli
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
libnotify
|
libnotify
|
||||||
|
@ -71,11 +69,12 @@
|
||||||
pass-export = [
|
pass-export = [
|
||||||
pass2csv
|
pass2csv
|
||||||
gnupg
|
gnupg
|
||||||
|
sd
|
||||||
];
|
];
|
||||||
wpass = [
|
wpass = [
|
||||||
final.wdmenu
|
wdmenu
|
||||||
fd
|
fd
|
||||||
pass
|
myPass
|
||||||
sd
|
sd
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
wtype
|
wtype
|
||||||
|
@ -96,7 +95,7 @@
|
||||||
pulse_sink = [
|
pulse_sink = [
|
||||||
pulseaudio
|
pulseaudio
|
||||||
pamixer
|
pamixer
|
||||||
final.wdmenu
|
wdmenu
|
||||||
];
|
];
|
||||||
color_picker = [
|
color_picker = [
|
||||||
grim
|
grim
|
||||||
|
@ -108,13 +107,13 @@
|
||||||
dzadd = [
|
dzadd = [
|
||||||
procps
|
procps
|
||||||
libnotify
|
libnotify
|
||||||
final.wdmenu
|
wdmenu
|
||||||
jq
|
jq
|
||||||
mpv
|
mpv
|
||||||
pqiv
|
pqiv
|
||||||
python3Packages.deemix
|
python3Packages.deemix
|
||||||
mpc-cli
|
mpc-cli
|
||||||
final.mpdDup
|
mpdDup
|
||||||
];
|
];
|
||||||
mpdDup = [
|
mpdDup = [
|
||||||
mpc-cli
|
mpc-cli
|
||||||
|
@ -125,10 +124,13 @@
|
||||||
zbar
|
zbar
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
];
|
];
|
||||||
auto_connect_gamepad = [ bluez ];
|
powerplay-led-idle = [
|
||||||
vrr-fullscreen = [ ];
|
bash
|
||||||
|
libinput
|
||||||
|
libratbag
|
||||||
|
];
|
||||||
}
|
}
|
||||||
// lib.mapAttrs import_script {
|
// lib.mapAttrs importScript {
|
||||||
wdmenu = ./wdmenu.nix;
|
wdmenu = ./wdmenu.nix;
|
||||||
wlauncher = ./wlauncher.nix;
|
wlauncher = ./wlauncher.nix;
|
||||||
_gpg-unlock = ./_gpg-unlock.nix;
|
_gpg-unlock = ./_gpg-unlock.nix;
|
||||||
|
|
0
scripts/helix-pager
Normal file → Executable file
0
scripts/helix-pager
Normal file → Executable file
0
scripts/kak-pager
Normal file → Executable file
0
scripts/kak-pager
Normal file → Executable file
|
@ -8,3 +8,6 @@ pass2csv "$PASSWORD_STORE_DIR" "$HOME/passwords.csv" \
|
||||||
-f User '(user|login)(:\s*)?' \
|
-f User '(user|login)(:\s*)?' \
|
||||||
-f TOTP 'otpauth(:)?' \
|
-f TOTP 'otpauth(:)?' \
|
||||||
-f URL 'url(:\s*)?'
|
-f URL 'url(:\s*)?'
|
||||||
|
|
||||||
|
# Fix TOTP format for keepass
|
||||||
|
sd '"//totp/.*?secret=(.*?)(&.*?)?"' '"$1"' "$HOME/passwords.csv"
|
0
scripts/playerctl-status
Normal file → Executable file
0
scripts/playerctl-status
Normal file → Executable file
79
scripts/powerplay-led-idle
Executable file
79
scripts/powerplay-led-idle
Executable file
|
@ -0,0 +1,79 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Constants
|
||||||
|
SECONDS_UNTIL_FADE=$(( 1 * 60))
|
||||||
|
SECONDS_UNTIL_OFF=$(( 6 * 60))
|
||||||
|
|
||||||
|
COLOR_ON=ff0000
|
||||||
|
COLOR_FADE=880000
|
||||||
|
COLOR_OFF=000000
|
||||||
|
|
||||||
|
# Logging
|
||||||
|
|
||||||
|
if [[ "$1" = "debug" ]]; then
|
||||||
|
echo "Running with debugging" >&2
|
||||||
|
DEBUG="true"
|
||||||
|
|
||||||
|
SECONDS_UNTIL_FADE=$(( 3 ))
|
||||||
|
SECONDS_UNTIL_OFF=$(( 5 ))
|
||||||
|
fi
|
||||||
|
|
||||||
|
log() {
|
||||||
|
if [[ "$DEBUG" = "true" ]]; then
|
||||||
|
echo "$@" >&2
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Implementation
|
||||||
|
|
||||||
|
main() {
|
||||||
|
CURRENT_STATE="UNKNOWN"
|
||||||
|
LAST_POINTER_MOTION="$(date +%s)"
|
||||||
|
|
||||||
|
if [ "$(ratbagctl list | wc -l)" -ne 1 ]; then
|
||||||
|
echo "Not exactly one device found, exiting..."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
DEVICE="$(ratbagctl list | cut -d: -f1)"
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
while read line; do
|
||||||
|
LAST_POINTER_MOTION="$(date +%s)"
|
||||||
|
break
|
||||||
|
done < <(
|
||||||
|
timeout 5s \
|
||||||
|
libinput debug-events \
|
||||||
|
| grep POINTER_MOTION
|
||||||
|
)
|
||||||
|
TIME_SINCE_LAST=$(( "$(date +%s)" - "$LAST_POINTER_MOTION" ))
|
||||||
|
log "Last pointer motion was $TIME_SINCE_LAST seconds ago"
|
||||||
|
if [ "$TIME_SINCE_LAST" -gt "$SECONDS_UNTIL_OFF" ]; then
|
||||||
|
setState OFF "$COLOR_OFF"
|
||||||
|
elif [ "$TIME_SINCE_LAST" -gt "$SECONDS_UNTIL_FADE" ]; then
|
||||||
|
setState FADE "$COLOR_FADE"
|
||||||
|
else
|
||||||
|
setState ON "$COLOR_ON"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
setState() {
|
||||||
|
STATE="$1"
|
||||||
|
COLOR="$2"
|
||||||
|
MODE="$3"
|
||||||
|
|
||||||
|
if [[ "$STATE" = "$CURRENT_STATE" ]]; then
|
||||||
|
log "Already in $STATE state"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
log "Changing state to $STATE"
|
||||||
|
CURRENT_STATE="$STATE"
|
||||||
|
|
||||||
|
ratbagctl "$DEVICE" led 0 set mode on
|
||||||
|
ratbagctl "$DEVICE" led 0 set color "$COLOR"
|
||||||
|
}
|
||||||
|
|
||||||
|
main
|
0
scripts/pulse_sink
Normal file → Executable file
0
scripts/pulse_sink
Normal file → Executable file
0
scripts/screenshotsh
Normal file → Executable file
0
scripts/screenshotsh
Normal file → Executable file
0
scripts/showkeys
Normal file → Executable file
0
scripts/showkeys
Normal file → Executable file
0
scripts/terminal
Normal file → Executable file
0
scripts/terminal
Normal file → Executable file
|
@ -1,28 +0,0 @@
|
||||||
#!/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
|
|
0
scripts/wl-copy-file
Normal file → Executable file
0
scripts/wl-copy-file
Normal file → Executable file
0
scripts/wpass
Normal file → Executable file
0
scripts/wpass
Normal file → Executable file
Binary file not shown.
Binary file not shown.
|
@ -6,7 +6,7 @@
|
||||||
settings = {
|
settings = {
|
||||||
General = {
|
General = {
|
||||||
DiscoverableTimeout = 0;
|
DiscoverableTimeout = 0;
|
||||||
# Discoverable = true;
|
Discoverable = true;
|
||||||
AlwaysPairable = true;
|
AlwaysPairable = true;
|
||||||
};
|
};
|
||||||
Policy = {
|
Policy = {
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
./fonts.nix
|
./fonts.nix
|
||||||
./sound.nix
|
./sound.nix
|
||||||
./bluetooth.nix
|
./bluetooth.nix
|
||||||
|
./mouse.nix
|
||||||
./locale.nix
|
./locale.nix
|
||||||
./users.nix
|
./users.nix
|
||||||
./containers.nix
|
./containers.nix
|
||||||
|
|
|
@ -1,10 +1,18 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
virtualisation.docker.enable = true;
|
|
||||||
virtualisation.docker.autoPrune.enable = true;
|
virtualisation.docker = {
|
||||||
virtualisation.docker.autoPrune.dates = "monthly";
|
enable = true;
|
||||||
virtualisation.docker.autoPrune.flags = [ "--all --volumes" ];
|
autoPrune = {
|
||||||
|
enable = true;
|
||||||
|
dates = "monthly";
|
||||||
|
flags = [
|
||||||
|
"--all"
|
||||||
|
"--volumes"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
programs.extra-container.enable = true;
|
programs.extra-container.enable = true;
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
mkNixRunner =
|
mkNixRunner =
|
||||||
registrationConfigFile: with lib; rec {
|
authenticationTokenConfigFile: with lib; rec {
|
||||||
# File should contain at least these two variables:
|
# File should contain at least these two variables:
|
||||||
# `CI_SERVER_URL`
|
# `CI_SERVER_URL`
|
||||||
# `REGISTRATION_TOKEN`
|
# `REGISTRATION_TOKEN`
|
||||||
inherit registrationConfigFile; # 2
|
inherit authenticationTokenConfigFile; # 2
|
||||||
dockerImage = "alpine:3.18.2";
|
dockerImage = "alpine:3.18.2";
|
||||||
dockerAllowedImages = [ dockerImage ];
|
dockerAllowedImages = [ dockerImage ];
|
||||||
dockerVolumes = [
|
dockerVolumes = [
|
||||||
|
@ -47,6 +47,5 @@
|
||||||
PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin";
|
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";
|
NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt";
|
||||||
};
|
};
|
||||||
tagList = [ "nix" ];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,6 +30,8 @@
|
||||||
|
|
||||||
hardware.opentabletdriver.enable = lib.mkForce false;
|
hardware.opentabletdriver.enable = lib.mkForce false;
|
||||||
|
|
||||||
|
programs.gpaste.enable = true;
|
||||||
|
|
||||||
# services.xserver.displayManager.autologin.user = "lelgenio";
|
# services.xserver.displayManager.autologin.user = "lelgenio";
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
with pkgs;
|
with pkgs;
|
||||||
|
@ -40,5 +42,6 @@
|
||||||
|
|
||||||
chrome-gnome-shell
|
chrome-gnome-shell
|
||||||
gnomeExtensions.quick-settings-audio-devices-hider
|
gnomeExtensions.quick-settings-audio-devices-hider
|
||||||
|
gnome-pass-search-provider
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,6 @@ in
|
||||||
services.greetd =
|
services.greetd =
|
||||||
let
|
let
|
||||||
greetd_main_script = pkgs.writeShellScriptBin "main" ''
|
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}"
|
export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}"
|
||||||
${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop}
|
${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c ${desktop}
|
||||||
swaymsg exit
|
swaymsg exit
|
||||||
|
|
|
@ -23,6 +23,7 @@ in
|
||||||
gimp
|
gimp
|
||||||
inkscape
|
inkscape
|
||||||
krita
|
krita
|
||||||
|
kdePackages.breeze
|
||||||
kdePackages.kdenlive
|
kdePackages.kdenlive
|
||||||
pitivi
|
pitivi
|
||||||
blender-hip
|
blender-hip
|
||||||
|
|
|
@ -14,18 +14,6 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.concurrent = 4;
|
settings.concurrent = 4;
|
||||||
services = {
|
services = {
|
||||||
# ci_test = {
|
|
||||||
# registrationConfigFile = "/srv/gitlab-runner/env/ci_test";
|
|
||||||
# dockerImage = "debian";
|
|
||||||
# dockerPrivileged = true;
|
|
||||||
# };
|
|
||||||
thoreb_builder = {
|
|
||||||
registrationConfigFile =
|
|
||||||
config.age.secrets.monolith-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
|
||||||
dockerImage = "debian";
|
|
||||||
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
|
||||||
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
|
thoreb-telemetria-nix = mkNixRunner config.age.secrets.gitlab-runner-thoreb-telemetria-registrationConfigFile.path;
|
||||||
|
|
15
system/mouse.nix
Normal file
15
system/mouse.nix
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
{
|
||||||
|
# Allow configuring Logitech Peripherals
|
||||||
|
services.ratbagd.enable = true;
|
||||||
|
|
||||||
|
# Sway does not undersand high resolution scroll wheels
|
||||||
|
# I don't need this, so I disable it
|
||||||
|
environment.etc."libinput/local-overrides.quirks".text = ''
|
||||||
|
[Logitech G502 X PLUS]
|
||||||
|
MatchUdevType=mouse
|
||||||
|
MatchBus=usb
|
||||||
|
MatchVendor=0x046D
|
||||||
|
MatchProduct=0x4099
|
||||||
|
AttrEventCode=-REL_WHEEL_HI_RES
|
||||||
|
'';
|
||||||
|
}
|
|
@ -9,6 +9,11 @@
|
||||||
# Open kde connect ports
|
# Open kde connect ports
|
||||||
programs.kdeconnect.enable = true;
|
programs.kdeconnect.enable = true;
|
||||||
|
|
||||||
|
networking.firewall = {
|
||||||
|
enable = true;
|
||||||
|
logRefusedConnections = false;
|
||||||
|
};
|
||||||
|
|
||||||
# Enable CUPS to print documents.
|
# Enable CUPS to print documents.
|
||||||
# services.printing.enable = true;
|
# services.printing.enable = true;
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,6 @@ in
|
||||||
"https://cache.nixos.org"
|
"https://cache.nixos.org"
|
||||||
"https://nix-community.cachix.org"
|
"https://nix-community.cachix.org"
|
||||||
# "http://nixcache.lelgenio.1337.cx:5000"
|
# "http://nixcache.lelgenio.1337.cx:5000"
|
||||||
"https://hyprland.cachix.org"
|
|
||||||
"https://lelgenio.cachix.org"
|
"https://lelgenio.cachix.org"
|
||||||
"https://wegank.cachix.org"
|
"https://wegank.cachix.org"
|
||||||
"https://snowflakeos.cachix.org/"
|
"https://snowflakeos.cachix.org/"
|
||||||
|
@ -39,7 +38,6 @@ in
|
||||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
# "nixcache.lelgenio.1337.cx:zxCfx7S658llDgAUG0JVyNrlAdFVvPniSdDOkvfTPS8="
|
# "nixcache.lelgenio.1337.cx:zxCfx7S658llDgAUG0JVyNrlAdFVvPniSdDOkvfTPS8="
|
||||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
|
||||||
"lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc="
|
"lelgenio.cachix.org-1:W8tMlmDFLU/V+6DlChXjekxoHZpjgVHZpmusC4cueBc="
|
||||||
"wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs="
|
"wegank.cachix.org-1:xHignps7GtkPP/gYK5LvA/6UFyz98+sgaxBSy7qK0Vs="
|
||||||
"snowflakeos.cachix.org-1:gXb32BL86r9bw1kBiw9AJuIkqN49xBvPd1ZW8YlqO70="
|
"snowflakeos.cachix.org-1:gXb32BL86r9bw1kBiw9AJuIkqN49xBvPd1ZW8YlqO70="
|
||||||
|
|
|
@ -1,21 +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
|
|
||||||
'')
|
|
||||||
];
|
|
||||||
}
|
|
|
@ -6,23 +6,28 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
programs.steam.package = pkgs.steam.override {
|
programs.steam.extraPackages =
|
||||||
extraLibraries =
|
config.fonts.packages
|
||||||
pkgs:
|
++ (with pkgs; [
|
||||||
with config.hardware.opengl;
|
|
||||||
if pkgs.hostPlatform.is64bit then
|
|
||||||
[ package ] ++ extraPackages
|
|
||||||
else
|
|
||||||
[ package32 ] ++ extraPackages32;
|
|
||||||
|
|
||||||
extraPkgs =
|
|
||||||
pkgs: with pkgs; [
|
|
||||||
capitaine-cursors
|
capitaine-cursors
|
||||||
bibata-cursors
|
bibata-cursors
|
||||||
mangohud
|
mangohud
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
];
|
gamescope
|
||||||
};
|
|
||||||
|
# gamescope compatibility??
|
||||||
|
xorg.libXcursor
|
||||||
|
xorg.libXi
|
||||||
|
xorg.libXinerama
|
||||||
|
xorg.libXScrnSaver
|
||||||
|
libpng
|
||||||
|
libpulseaudio
|
||||||
|
libvorbis
|
||||||
|
stdenv.cc.cc.lib
|
||||||
|
libkrb5
|
||||||
|
keyutils
|
||||||
|
]);
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
protontricks
|
protontricks
|
||||||
bottles
|
bottles
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
"bluetooth"
|
"bluetooth"
|
||||||
"corectrl"
|
"corectrl"
|
||||||
"vboxusers"
|
"vboxusers"
|
||||||
|
"input"
|
||||||
];
|
];
|
||||||
shell = pkgs.fish;
|
shell = pkgs.fish;
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
|
|
|
@ -116,6 +116,12 @@ in
|
||||||
mode = "Vi|~Search";
|
mode = "Vi|~Search";
|
||||||
action = "SearchNext";
|
action = "SearchNext";
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
key = lib.toUpper key.next;
|
||||||
|
mods = "Shift";
|
||||||
|
mode = "Vi|~Search";
|
||||||
|
action = "SearchPrevious";
|
||||||
|
}
|
||||||
{
|
{
|
||||||
key = "Up";
|
key = "Up";
|
||||||
mods = "Control|Shift";
|
mods = "Control|Shift";
|
||||||
|
|
|
@ -9,14 +9,14 @@
|
||||||
wayland.windowManager.sway = {
|
wayland.windowManager.sway = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
exec thunderbird
|
exec thunderbird
|
||||||
exec webcord
|
exec vesktop
|
||||||
exec telegram-desktop
|
exec telegram-desktop
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
tdesktop
|
tdesktop
|
||||||
webcord
|
vesktop
|
||||||
thunderbird
|
thunderbird
|
||||||
element-desktop-wayland
|
element-desktop-wayland
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
{ pkgs, lib, ... }:
|
|
||||||
{
|
|
||||||
systemd.user.services = {
|
|
||||||
autoconnect-gamepad = {
|
|
||||||
Unit = {
|
|
||||||
Description = "Attempt to connect to game controllers";
|
|
||||||
PartOf = [ "graphical-session.target" ];
|
|
||||||
After = [ "graphical-session.target" ];
|
|
||||||
};
|
|
||||||
Service = {
|
|
||||||
ExecStart = lib.getExe pkgs.auto_connect_gamepad;
|
|
||||||
};
|
|
||||||
Install = {
|
|
||||||
WantedBy = [ "sway-session.target" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
xdg.desktopEntries = {
|
|
||||||
disconnect-controller = {
|
|
||||||
name = "Disconnect Controller";
|
|
||||||
exec = "bluetoothctl disconnect 84:30:95:97:1A:79";
|
|
||||||
terminal = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -41,24 +41,6 @@
|
||||||
TryExec = "kak";
|
TryExec = "kak";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
neomutt = {
|
|
||||||
name = "Neomutt";
|
|
||||||
genericName = "Email Client";
|
|
||||||
comment = "View and Send Emails";
|
|
||||||
exec = "neomutt %U";
|
|
||||||
terminal = true;
|
|
||||||
type = "Application";
|
|
||||||
icon = "mutt";
|
|
||||||
categories = [
|
|
||||||
"Network"
|
|
||||||
"Email"
|
|
||||||
];
|
|
||||||
startupNotify = false;
|
|
||||||
mimeType = [ "x-scheme-handler/mailto" ];
|
|
||||||
settings = {
|
|
||||||
Keywords = "Mail;E-mail;";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
down_meme = {
|
down_meme = {
|
||||||
name = "DownMeme";
|
name = "DownMeme";
|
||||||
genericName = "Download memes";
|
genericName = "Download memes";
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (config.my) desktop browser;
|
inherit (config.my) desktop browser;
|
||||||
bugfixedFirefox = pkgs.firefox-esr-unwrapped // {
|
bugfixedFirefox = pkgs.firefox-devedition-unwrapped // {
|
||||||
requireSigning = false;
|
requireSigning = false;
|
||||||
allowAddonSideload = true;
|
allowAddonSideload = true;
|
||||||
};
|
};
|
||||||
|
@ -35,9 +35,15 @@ in
|
||||||
})
|
})
|
||||||
(pkgs.fetchFirefoxAddon {
|
(pkgs.fetchFirefoxAddon {
|
||||||
name = "ublock-origin";
|
name = "ublock-origin";
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi";
|
url = "https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi";
|
||||||
hash = "sha256-l5cWCQgZFxD/CFhTa6bcKeytmSPDCyrW0+XjcddZ5E0=";
|
hash = "sha256-RwxWmUpxdNshV4rc5ZixWKXcCXDIfFz+iJrGMr0wheo=";
|
||||||
})
|
})
|
||||||
|
(pkgs.fetchFirefoxAddon {
|
||||||
|
name = "user_agent_string_switcher";
|
||||||
|
url = "https://addons.mozilla.org/firefox/downloads/file/4098688/user_agent_string_switcher-0.5.0.xpi";
|
||||||
|
hash = "sha256-ncjaPIxG1PBNEv14nGNQH6ai9QL4WbKGk5oJDbY+rjM=";
|
||||||
|
})
|
||||||
|
|
||||||
(pkgs.fetchFirefoxAddon {
|
(pkgs.fetchFirefoxAddon {
|
||||||
name = "i-still-dont-care-about-cookies";
|
name = "i-still-dont-care-about-cookies";
|
||||||
url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi";
|
url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi";
|
||||||
|
@ -50,10 +56,11 @@ in
|
||||||
hash = "sha256-lKLX6IWWtliRdH1Ig33rVEB4DVfbeuMw0dfUPV/mSSI=";
|
hash = "sha256-lKLX6IWWtliRdH1Ig33rVEB4DVfbeuMw0dfUPV/mSSI=";
|
||||||
})
|
})
|
||||||
(pkgs.fetchFirefoxAddon {
|
(pkgs.fetchFirefoxAddon {
|
||||||
name = "unhook";
|
name = "invidious_redirect";
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/file/4050795/youtube_recommended_videos-1.6.2.xpi";
|
url = "https://addons.mozilla.org/firefox/downloads/file/4292924/invidious_redirect_2-1.16.xpi";
|
||||||
hash = "sha256-xMuglNassZb9WqjfEGg6WeuhMACRuYqQor+iX1dEdsE=";
|
hash = "sha256-ApCc+MNmW9Wd/5seV6npePQVEaszT/rhD9EB7HGiUb8=";
|
||||||
})
|
})
|
||||||
|
|
||||||
(pkgs.fetchFirefoxAddon {
|
(pkgs.fetchFirefoxAddon {
|
||||||
name = "mastodon_simplified_federation";
|
name = "mastodon_simplified_federation";
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/file/4215691/mastodon_simplified_federation-2.2.xpi";
|
url = "https://addons.mozilla.org/firefox/downloads/file/4215691/mastodon_simplified_federation-2.2.xpi";
|
||||||
|
@ -79,7 +86,7 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
profiles = {
|
profiles = {
|
||||||
main = {
|
dev-edition-default = {
|
||||||
isDefault = true;
|
isDefault = true;
|
||||||
search.force = true;
|
search.force = true;
|
||||||
search.default = "DuckDuckGo";
|
search.default = "DuckDuckGo";
|
||||||
|
@ -87,6 +94,7 @@ in
|
||||||
"devtools.theme" = "auto";
|
"devtools.theme" = "auto";
|
||||||
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
||||||
"browser.tabs.inTitlebar" = if desktop == "sway" then 0 else 1;
|
"browser.tabs.inTitlebar" = if desktop == "sway" then 0 else 1;
|
||||||
|
"sidebar.position_start" = false; # Move sidebar to the right
|
||||||
|
|
||||||
# enable media RDD to allow gpu acceleration
|
# enable media RDD to allow gpu acceleration
|
||||||
"media.rdd-ffmpeg.enabled" = true;
|
"media.rdd-ffmpeg.enabled" = true;
|
||||||
|
@ -99,7 +107,7 @@ in
|
||||||
"media.rdd-vpx.enabled" = true;
|
"media.rdd-vpx.enabled" = true;
|
||||||
"media.rdd-wav.enabled" = true;
|
"media.rdd-wav.enabled" = true;
|
||||||
|
|
||||||
"media.av1.enabled" = false;
|
"media.av1.enabled" = true;
|
||||||
"media.ffmpeg.vaapi-drm-display.enabled" = true;
|
"media.ffmpeg.vaapi-drm-display.enabled" = true;
|
||||||
"media.ffmpeg.vaapi.enabled" = true;
|
"media.ffmpeg.vaapi.enabled" = true;
|
||||||
"media.ffvpx.enabled" = true;
|
"media.ffvpx.enabled" = true;
|
||||||
|
@ -116,9 +124,52 @@ in
|
||||||
"devtools.chrome.enabled" = true;
|
"devtools.chrome.enabled" = true;
|
||||||
"devtools.debugger.remote-enabled" = true;
|
"devtools.debugger.remote-enabled" = true;
|
||||||
};
|
};
|
||||||
userChrome = lib.mkIf (desktop == "sway") ''
|
userChrome =
|
||||||
|
if desktop == "sway" then
|
||||||
|
''
|
||||||
#titlebar { display: none !important; }
|
#titlebar { display: none !important; }
|
||||||
#sidebar-header { display: none !important; }
|
#sidebar-header { display: none !important; }
|
||||||
|
''
|
||||||
|
else
|
||||||
|
''
|
||||||
|
/* Element | chrome://browser/content/browser.xhtml */
|
||||||
|
|
||||||
|
#navigator-toolbox {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 1fr 50px;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Element | chrome://browser/content/browser.xhtml */
|
||||||
|
|
||||||
|
#nav-bar {
|
||||||
|
flex: 1;
|
||||||
|
width: 100%;
|
||||||
|
grid-column: 1 / 3;
|
||||||
|
grid-row: 1;
|
||||||
|
z-index: 0;
|
||||||
|
padding-right: 29px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Element | chrome://browser/content/browser.xhtml */
|
||||||
|
|
||||||
|
.toolbar-items {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Element | chrome://browser/content/browser.xhtml */
|
||||||
|
|
||||||
|
#TabsToolbar {
|
||||||
|
max-width: 50px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Element | chrome://browser/content/browser.xhtml */
|
||||||
|
|
||||||
|
#titlebar {
|
||||||
|
max-width: 50px;
|
||||||
|
grid-area: 1 / 2;
|
||||||
|
z-index: 10;
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,124 +0,0 @@
|
||||||
set __fish_complete_todoman_subcomands cancel copy delete done edit flush list move new show
|
|
||||||
function __fish_complete_todoman_not_subcomand
|
|
||||||
not __fish_seen_subcommand_from $__fish_complete_todoman_subcomands
|
|
||||||
end
|
|
||||||
|
|
||||||
function __fish_complete_todoman_list_todos
|
|
||||||
todo list |
|
|
||||||
string replace -r '^\[.\] ' "" |
|
|
||||||
string replace -r ' ' '\t' |
|
|
||||||
string replace -r '\t!*' '\t' |
|
|
||||||
string replace -r '\(.*?\)' ""
|
|
||||||
end
|
|
||||||
|
|
||||||
function __fish_complete_todoman_config_path
|
|
||||||
set -q XDG_CONFIG_DIR
|
|
||||||
or set -l XDG_CONFIG_DIR "$HOME/.config"
|
|
||||||
|
|
||||||
set -l config_path "$XDG_CONFIG_DIR/todoman/config.py"
|
|
||||||
|
|
||||||
test -f "$config_path"
|
|
||||||
and echo "$config_path"
|
|
||||||
end
|
|
||||||
|
|
||||||
function __fish_complete_todoman_lists_dir
|
|
||||||
set -l config_path (__fish_complete_todoman_config_path)
|
|
||||||
or return
|
|
||||||
|
|
||||||
# looks something like "~/.local/share/calendars/*"
|
|
||||||
string replace -fr 'path\s*=\s*"(.*)"\s*$' '$1' < $config_path |
|
|
||||||
string replace -r '^~' "$HOME" |
|
|
||||||
string replace -r '\*$' ''
|
|
||||||
end
|
|
||||||
|
|
||||||
function __fish_complete_todoman_list_lists
|
|
||||||
set -l lists_path (__fish_complete_todoman_lists_dir)
|
|
||||||
string replace -r '.*/(.*?)$' '$1' $lists_path/*
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
#### Initial command definition ####
|
|
||||||
complete --erase todo
|
|
||||||
complete -c todo -f
|
|
||||||
|
|
||||||
#### Base command flags ####
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -s v -l verbosity -a "CRITICAL ERROR WARNING INFO DEBUG"
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -l colour -l color -a "always auto never"
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -l porcelain -a "Use a stable JSON format"
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -s h -l humanize -a "Format all dates and times in a human friendly way"
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -s c -l config -a "The config file to use."
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -l version -d "Show the version and exit."
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -l help -d "Show this message and exit."
|
|
||||||
|
|
||||||
#### Subcommands ####
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -a cancel -d 'Cancel one or more tasks'
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -a copy -d 'Copy tasks to another list'
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -a delete -d 'Delete tasks'
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -a done -d 'Mark one or more tasks as done'
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -a edit -d 'Edit the task with id ID'
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -a flush -d 'Delete done tasks'
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -a list -d 'List tasks'
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -a move -d 'Move tasks to another list'
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -a new -d 'Create a new task with SUMMARY'
|
|
||||||
complete -c todo -n __fish_complete_todoman_not_subcomand -a show -d 'Show details about a task'
|
|
||||||
|
|
||||||
#### Subcommand flags ####
|
|
||||||
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from cancel" -a "(__fish_complete_todoman_list_todos)" -d 'Cancel one or more tasks.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from cancel" -l help -d 'Show this message and exit.'
|
|
||||||
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from copy" -a "(__fish_complete_todoman_list_todos)" -d 'Cancel one or more tasks.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from copy" -s l -l list -d 'The list to copy the tasks to.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from copy" -l help -d 'Show this message and exit.'
|
|
||||||
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from delete" -a "(__fish_complete_todoman_list_todos)" -d 'Delete tasks.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from delete" -l yes -d 'Confirm the action without prompting.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from delete" -l help -d 'Show this message and exit.'
|
|
||||||
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from done" -a "(__fish_complete_todoman_list_todos)" -d 'Mark one or more tasks as done.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from done" -l help -d 'Show this message and exit.'
|
|
||||||
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from edit" -a "(__fish_complete_todoman_list_todos)" -d 'Edit the task with id ID.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from edit" -l raw -d 'Open the raw file for editing in $EDITOR. Only use this'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from edit" -s s -l start -r -d 'When the task starts.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from edit" -s d -l due -r -d 'Due date of the task, in the format specified in the configuration.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from edit" -l location -r -d 'The location where this todo takes place.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from edit" -l priority -r -d 'Priority for this task'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from edit" -s i -l interactive -r -d 'Go into interactive mode before saving the task.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from edit" -l help -d 'Show this message and exit.'
|
|
||||||
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from flush" -d 'Delete done tasks. This will also clear the cache to reset task IDs.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from flush" -l yes -d 'Confirm the action without prompting.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from flush" -l help -d 'Show this message and exit.'
|
|
||||||
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from flush" -d 'Delete done tasks. This will also clear the cache to reset task IDs.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from flush" -l yes -d 'Confirm the action without prompting.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from flush" -l help -d 'Show this message and exit.'
|
|
||||||
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from list" -a "(__fish_complete_todoman_list_lists)" -d 'List tasks by list name'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from list" -l location -r -d 'Only show tasks with location containg TEXT'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from list" -l category -d "Only show tasks with category containg"
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from list" -l grep -d "Only show tasks with message containg"
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from list" -l sort -d "Sort tasks by field" -a "description location status summary uid rrule percent_complete priority sequence categories completed_at created_at dtstamp start due last_modified"
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from list" -l reverse -l no-reverse -d 'Sort tasks in reverse order (see --sort)'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from list" -l due -d 'Only show tasks due in INTEGER hours'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from list" -l priority -r -d 'Only show tasks with priority at least as high as' -a "low medium high"
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from list" -l start -r -d "Only shows tasks before/after given DATE"
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from list" -l startable -d "Show only todos which should can be started today"
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from list" -s s -l status -r -d "Show only todos with the provided comma-separated" -a "NEEDS-ACTION CANCELLED COMPLETED IN-PROCESS ANY"
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from list" -l help -d "Show this message and exit."
|
|
||||||
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from move" -a "(__fish_complete_todoman_list_todos)" -d 'Move tasks to another list.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from move" -s l -l list -a "(__fish_complete_todoman_list_lists)" -d 'The list to move the tasks to.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from move" -l help -d 'Show this message and exit.'
|
|
||||||
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from new" -d 'Create a new task with SUMMARY.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from new" -s l -l list -a "(__fish_complete_todoman_list_lists)" -d 'List in which the task will be saved.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from new" -s r -l read-description -d 'Read task description from stdin.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from new" -s s -l start -d 'When the task starts.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from new" -s d -l due -d 'Due date of the task, in the format specified in the configuration.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from new" -l location -d 'The location where this todo takes place.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from new" -s i -l interactive -d 'Go into interactive mode before saving the task.'
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from new" -l help -d 'Show this message and exit.'
|
|
||||||
|
|
||||||
complete -c todo -n "__fish_seen_subcommand_from show" -a "(__fish_complete_todoman_list_todos)" -d 'Show details about a task.'
|
|
|
@ -32,12 +32,11 @@ in
|
||||||
set_color normal
|
set_color normal
|
||||||
|
|
||||||
bind \cy 'commandline | wl-copy -n'
|
bind \cy 'commandline | wl-copy -n'
|
||||||
|
|
||||||
${pkgs.todoman}/bin/todo list
|
|
||||||
'';
|
'';
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
rm = "trash";
|
rm = "trash";
|
||||||
tree = "eza -T";
|
tree = "eza -T";
|
||||||
|
kill_yourself = "shutdown now";
|
||||||
};
|
};
|
||||||
shellAbbrs = {
|
shellAbbrs = {
|
||||||
off = "shutdown now";
|
off = "shutdown now";
|
||||||
|
@ -85,10 +84,6 @@ in
|
||||||
};
|
};
|
||||||
xdg.configFile = {
|
xdg.configFile = {
|
||||||
"fish/conf.d/prompt.fish".source = ./fish_prompt.fish;
|
"fish/conf.d/prompt.fish".source = ./fish_prompt.fish;
|
||||||
"fish/completions/" = {
|
|
||||||
recursive = true;
|
|
||||||
source = ./completions;
|
|
||||||
};
|
|
||||||
"fish/conf.d/" = {
|
"fish/conf.d/" = {
|
||||||
recursive = true;
|
recursive = true;
|
||||||
source = ./conf.d;
|
source = ./conf.d;
|
||||||
|
|
|
@ -103,9 +103,8 @@ function fish_git_prompt
|
||||||
_fish_prompt_warn "init"
|
_fish_prompt_warn "init"
|
||||||
end
|
end
|
||||||
|
|
||||||
git rev-parse HEAD -- &>/dev/null
|
# if we have at least one commit
|
||||||
or return
|
if git rev-parse HEAD -- &>/dev/null
|
||||||
|
|
||||||
# print a "↑" if ahead of origin
|
# print a "↑" if ahead of origin
|
||||||
test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
|
test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
|
||||||
and set -f _git_sync_ahead '↑'
|
and set -f _git_sync_ahead '↑'
|
||||||
|
@ -127,6 +126,7 @@ function fish_git_prompt
|
||||||
_fish_prompt_normal '↻'
|
_fish_prompt_normal '↻'
|
||||||
_fish_prompt_warn $git_log_unpushed[1]
|
_fish_prompt_warn $git_log_unpushed[1]
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
# Right side represents WorkTree/Staged
|
# Right side represents WorkTree/Staged
|
||||||
|
|
|
@ -28,16 +28,13 @@ lib.mkIf (config.my.desktop == "gnome") {
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
inputs.nixos-conf-editor.packages.${pkgs.system}.nixos-conf-editor
|
|
||||||
inputs.nix-software-center.packages.${pkgs.system}.nix-software-center
|
|
||||||
|
|
||||||
adw-gtk3
|
adw-gtk3
|
||||||
|
|
||||||
newsflash
|
newsflash
|
||||||
foliate
|
foliate
|
||||||
amberol
|
amberol
|
||||||
pitivi
|
pitivi
|
||||||
gnome-passwordsafe
|
keepassxc
|
||||||
|
|
||||||
libsForQt5.qt5ct
|
libsForQt5.qt5ct
|
||||||
libsForQt5.qtstyleplugin-kvantum
|
libsForQt5.qtstyleplugin-kvantum
|
||||||
|
@ -45,9 +42,7 @@ lib.mkIf (config.my.desktop == "gnome") {
|
||||||
qt6Packages.qtstyleplugin-kvantum
|
qt6Packages.qtstyleplugin-kvantum
|
||||||
];
|
];
|
||||||
|
|
||||||
home.sessionVariables = {
|
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
|
||||||
QT_QPA_PLATFORMTHEME = "qt5ct";
|
|
||||||
};
|
|
||||||
|
|
||||||
xdg.defaultApplications = {
|
xdg.defaultApplications = {
|
||||||
enable = lib.mkForce false;
|
enable = lib.mkForce false;
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultCacheTtl = 604800;
|
defaultCacheTtl = 604800;
|
||||||
maxCacheTtl = 604800;
|
maxCacheTtl = 604800;
|
||||||
pinentryPackage = pkgs.pinentry-curses;
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
allow-preset-passphrase
|
allow-preset-passphrase
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -8,14 +8,12 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./controller.nix
|
|
||||||
./waybar
|
./waybar
|
||||||
./helix.nix
|
./helix.nix
|
||||||
./kakoune
|
./kakoune
|
||||||
./vscode
|
./vscode
|
||||||
./fish
|
./fish
|
||||||
./firefox.nix
|
./firefox.nix
|
||||||
./hyprland.nix
|
|
||||||
./alacritty.nix
|
./alacritty.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
./ssh.nix
|
./ssh.nix
|
||||||
|
@ -28,7 +26,6 @@
|
||||||
./desktop-entries.nix
|
./desktop-entries.nix
|
||||||
./chat.nix
|
./chat.nix
|
||||||
./syncthing.nix
|
./syncthing.nix
|
||||||
./vdir.nix
|
|
||||||
./bmenu.nix
|
./bmenu.nix
|
||||||
./fzf.nix
|
./fzf.nix
|
||||||
./ranger
|
./ranger
|
||||||
|
@ -42,9 +39,9 @@
|
||||||
./gnome.nix
|
./gnome.nix
|
||||||
./thunar.nix
|
./thunar.nix
|
||||||
./xdg-dirs.nix
|
./xdg-dirs.nix
|
||||||
inputs.hyprland.homeManagerModules.default
|
|
||||||
inputs.nix-index-database.hmModules.nix-index
|
inputs.nix-index-database.hmModules.nix-index
|
||||||
../settings
|
../settings
|
||||||
|
./powerplay-led-idle.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
my = import ./variables.nix;
|
my = import ./variables.nix;
|
||||||
|
@ -55,7 +52,7 @@
|
||||||
home.homeDirectory = "/home/lelgenio";
|
home.homeDirectory = "/home/lelgenio";
|
||||||
|
|
||||||
# Let Home Manager install and manage itself.
|
# Let Home Manager install and manage itself.
|
||||||
# programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
# home-manager
|
# home-manager
|
||||||
|
|
||||||
|
|
|
@ -1,136 +0,0 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
config = lib.mkIf (config.my.desktop == "hyprland") {
|
|
||||||
wayland.windowManager.hyprland = {
|
|
||||||
enable = false;
|
|
||||||
extraConfig = ''
|
|
||||||
monitor=,preferred,auto,1
|
|
||||||
|
|
||||||
input {
|
|
||||||
kb_file=
|
|
||||||
kb_layout=us(colemak)
|
|
||||||
kb_variant=
|
|
||||||
kb_model=
|
|
||||||
kb_options=
|
|
||||||
kb_rules=
|
|
||||||
|
|
||||||
follow_mouse=1
|
|
||||||
|
|
||||||
touchpad {
|
|
||||||
natural_scroll=no
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
general {
|
|
||||||
sensitivity=1.0 # for mouse cursor
|
|
||||||
main_mod=SUPER
|
|
||||||
|
|
||||||
gaps_in=5
|
|
||||||
gaps_out=10
|
|
||||||
border_size=2
|
|
||||||
col.active_border=0xffF44336
|
|
||||||
col.inactive_border=0x66333333
|
|
||||||
|
|
||||||
apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse)
|
|
||||||
|
|
||||||
damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer
|
|
||||||
}
|
|
||||||
|
|
||||||
decoration {
|
|
||||||
rounding=5
|
|
||||||
blur=1
|
|
||||||
blur_size=3 # minimum 1
|
|
||||||
blur_passes=1 # minimum 1, more passes = more resource intensive.
|
|
||||||
# Your blur "amount" is blur_size * blur_passes, but high blur_size (over around 5-ish) will produce artifacts.
|
|
||||||
# if you want heavy blur, you need to up the blur_passes.
|
|
||||||
# the more passes, the more you can up the blur_size without noticing artifacts.
|
|
||||||
}
|
|
||||||
|
|
||||||
animations {
|
|
||||||
enabled=1
|
|
||||||
animation=windows,1,7,default
|
|
||||||
animation=border,1,10,default
|
|
||||||
animation=fade,1,10,default
|
|
||||||
animation=workspaces,1,6,default
|
|
||||||
}
|
|
||||||
|
|
||||||
dwindle {
|
|
||||||
pseudotile=0 # enable pseudotiling on dwindle
|
|
||||||
}
|
|
||||||
|
|
||||||
gestures {
|
|
||||||
workspace_swipe=no
|
|
||||||
}
|
|
||||||
|
|
||||||
# example window rules
|
|
||||||
# for windows named/classed as abc and xyz
|
|
||||||
#windowrule=move 69 420,abc
|
|
||||||
#windowrule=size 420 69,abc
|
|
||||||
#windowrule=tile,xyz
|
|
||||||
#windowrule=float,abc
|
|
||||||
#windowrule=pseudo,abc
|
|
||||||
#windowrule=monitor 0,xyz
|
|
||||||
|
|
||||||
# example binds
|
|
||||||
bind=SUPER,Q,exec,kitty
|
|
||||||
bind=SUPER,RETURN,exec,alacritty
|
|
||||||
bind=SUPER,x,killactive,
|
|
||||||
bind=SUPER,M,exit,
|
|
||||||
# bind=SUPER,E,exec,dolphin
|
|
||||||
bind=SUPER,V,togglefloating,
|
|
||||||
bind=SUPER,s,exec,wlauncher
|
|
||||||
bind=SUPER,P,pseudo,
|
|
||||||
|
|
||||||
bind=SUPER,f,fullscreen
|
|
||||||
|
|
||||||
bind=SUPER,n,movefocus,l
|
|
||||||
bind=SUPER,o,movefocus,r
|
|
||||||
bind=SUPER,i,movefocus,u
|
|
||||||
bind=SUPER,e,movefocus,d
|
|
||||||
|
|
||||||
bind=SUPER,left,movefocus,l
|
|
||||||
bind=SUPER,right,movefocus,r
|
|
||||||
bind=SUPER,up,movefocus,u
|
|
||||||
bind=SUPER,down,movefocus,d
|
|
||||||
|
|
||||||
bind=SUPER,1,workspace,1
|
|
||||||
bind=SUPER,2,workspace,2
|
|
||||||
bind=SUPER,3,workspace,3
|
|
||||||
bind=SUPER,4,workspace,4
|
|
||||||
bind=SUPER,5,workspace,5
|
|
||||||
bind=SUPER,6,workspace,6
|
|
||||||
bind=SUPER,7,workspace,7
|
|
||||||
bind=SUPER,8,workspace,8
|
|
||||||
bind=SUPER,9,workspace,9
|
|
||||||
bind=SUPER,0,workspace,10
|
|
||||||
|
|
||||||
bind=ALT,1,movetoworkspace,1
|
|
||||||
bind=ALT,2,movetoworkspace,2
|
|
||||||
bind=ALT,3,movetoworkspace,3
|
|
||||||
bind=ALT,4,movetoworkspace,4
|
|
||||||
bind=ALT,5,movetoworkspace,5
|
|
||||||
bind=ALT,6,movetoworkspace,6
|
|
||||||
bind=ALT,7,movetoworkspace,7
|
|
||||||
bind=ALT,8,movetoworkspace,8
|
|
||||||
bind=ALT,9,movetoworkspace,9
|
|
||||||
bind=ALT,0,movetoworkspace,10
|
|
||||||
|
|
||||||
bind=SUPER,u,workspace,e-1
|
|
||||||
bind=SUPER,y,workspace,e+1
|
|
||||||
|
|
||||||
bind=SUPER,mouse_down,workspace,e-1
|
|
||||||
bind=SUPER,mouse_up,workspace,e+1
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
home.file.".config/eww".source = ./eww;
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
eww-wayland
|
|
||||||
jq
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -114,3 +114,112 @@ with colors;
|
||||||
Hint = "blue";
|
Hint = "blue";
|
||||||
}
|
}
|
||||||
))
|
))
|
||||||
|
+ ''
|
||||||
|
# Color palette
|
||||||
|
declare-option str red "red"
|
||||||
|
declare-option str mauve "magenta"
|
||||||
|
declare-option str maroon "rgb:ee99a0"
|
||||||
|
declare-option str pink "rgb:f5bde6"
|
||||||
|
declare-option str cyan "cyan"
|
||||||
|
declare-option str yellow "yellow"
|
||||||
|
declare-option str green "green"
|
||||||
|
declare-option str white "white"
|
||||||
|
declare-option str blue "blue"
|
||||||
|
declare-option str sky "rgb:91d7e3"
|
||||||
|
declare-option str lavender "rgb:b7bdf8"
|
||||||
|
declare-option str black1 "rgb:202020"
|
||||||
|
declare-option str black2 "rgb:272727"
|
||||||
|
declare-option str black3 "rgb:3a3a3a"
|
||||||
|
declare-option str orange ${orange}
|
||||||
|
declare-option str teal "rgb:8bd5ca"
|
||||||
|
declare-option str flamingo "rgb:f0c6c6"
|
||||||
|
declare-option str gray0 "rgb:606060"
|
||||||
|
declare-option str gray1 "rgb:737373"
|
||||||
|
declare-option str bright_red "%opt{red}+b"
|
||||||
|
declare-option str bright_green "%opt{green}+b"
|
||||||
|
declare-option str bright_yellow "%opt{yellow}+b"
|
||||||
|
declare-option str bright_blue "%opt{blue}+b"
|
||||||
|
declare-option str bright_cyan "%opt{cyan}+b"
|
||||||
|
declare-option str foreground %opt{white}
|
||||||
|
declare-option str background %opt{black2}
|
||||||
|
declare-option str overlay0 "rgb:878787"
|
||||||
|
declare-option str overlay1 "rgb:9a9a9a"
|
||||||
|
|
||||||
|
# Tree-sitter (<https://git.sr.ht/~hadronized/kak-tree-sitter>)
|
||||||
|
set-face global ts_attribute "%opt{cyan}"
|
||||||
|
set-face global ts_comment "%opt{overlay0}+i"
|
||||||
|
set-face global ts_conceal "%opt{mauve}+i"
|
||||||
|
set-face global ts_constant "%opt{orange}"
|
||||||
|
set-face global ts_constant_builtin_boolean "%opt{sky}"
|
||||||
|
set-face global ts_constant_character "%opt{yellow}"
|
||||||
|
set-face global ts_constant_macro "%opt{mauve}"
|
||||||
|
set-face global ts_constructor "%opt{cyan}"
|
||||||
|
set-face global ts_diff_plus "%opt{green}"
|
||||||
|
set-face global ts_diff_minus "%opt{red}"
|
||||||
|
set-face global ts_diff_delta "%opt{blue}"
|
||||||
|
set-face global ts_diff_delta_moved "%opt{mauve}"
|
||||||
|
set-face global ts_error "%opt{red}+b"
|
||||||
|
set-face global ts_function "%opt{blue}"
|
||||||
|
set-face global ts_function_builtin "%opt{blue}+i"
|
||||||
|
set-face global ts_function_macro "%opt{mauve}"
|
||||||
|
set-face global ts_hint "%opt{blue}+b"
|
||||||
|
set-face global ts_info "%opt{green}+b"
|
||||||
|
set-face global ts_keyword "%opt{mauve}"
|
||||||
|
set-face global ts_keyword_conditional "%opt{mauve}+i"
|
||||||
|
set-face global ts_keyword_control_conditional "%opt{mauve}+i"
|
||||||
|
set-face global ts_keyword_control_directive "%opt{mauve}+i"
|
||||||
|
set-face global ts_keyword_control_import "%opt{mauve}+i"
|
||||||
|
set-face global ts_keyword_directive "%opt{mauve}+i"
|
||||||
|
set-face global ts_keyword_storage "%opt{mauve}"
|
||||||
|
set-face global ts_keyword_storage_modifier "%opt{mauve}"
|
||||||
|
set-face global ts_keyword_storage_modifier_mut "%opt{mauve}"
|
||||||
|
set-face global ts_keyword_storage_modifier_ref "%opt{teal}"
|
||||||
|
set-face global ts_label "%opt{cyan}+i"
|
||||||
|
set-face global ts_markup_bold "%opt{orange}+b"
|
||||||
|
set-face global ts_markup_heading "%opt{red}"
|
||||||
|
set-face global ts_markup_heading_1 "%opt{red}"
|
||||||
|
set-face global ts_markup_heading_2 "%opt{mauve}"
|
||||||
|
set-face global ts_markup_heading_3 "%opt{green}"
|
||||||
|
set-face global ts_markup_heading_4 "%opt{yellow}"
|
||||||
|
set-face global ts_markup_heading_5 "%opt{pink}"
|
||||||
|
set-face global ts_markup_heading_6 "%opt{teal}"
|
||||||
|
set-face global ts_markup_heading_marker "%opt{orange}+b"
|
||||||
|
set-face global ts_markup_italic "%opt{pink}+i"
|
||||||
|
set-face global ts_markup_list_checked "%opt{green}"
|
||||||
|
set-face global ts_markup_list_numbered "%opt{blue}+i"
|
||||||
|
set-face global ts_markup_list_unchecked "%opt{teal}"
|
||||||
|
set-face global ts_markup_list_unnumbered "%opt{mauve}"
|
||||||
|
set-face global ts_markup_link_label "%opt{blue}"
|
||||||
|
set-face global ts_markup_link_url "%opt{teal}+u"
|
||||||
|
set-face global ts_markup_link_uri "%opt{teal}+u"
|
||||||
|
set-face global ts_markup_link_text "%opt{blue}"
|
||||||
|
set-face global ts_markup_quote "%opt{gray1}"
|
||||||
|
set-face global ts_markup_raw "%opt{green}"
|
||||||
|
set-face global ts_markup_strikethrough "%opt{gray1}+s"
|
||||||
|
set-face global ts_namespace "%opt{blue}+i"
|
||||||
|
set-face global ts_operator "%opt{sky}"
|
||||||
|
set-face global ts_property "%opt{sky}"
|
||||||
|
set-face global ts_punctuation "%opt{overlay1}"
|
||||||
|
set-face global ts_punctuation_special "%opt{sky}"
|
||||||
|
set-face global ts_special "%opt{blue}"
|
||||||
|
set-face global ts_spell "%opt{mauve}"
|
||||||
|
set-face global ts_string "%opt{green}"
|
||||||
|
set-face global ts_string_regex "%opt{orange}"
|
||||||
|
set-face global ts_string_regexp "%opt{orange}"
|
||||||
|
set-face global ts_string_escape "%opt{mauve}"
|
||||||
|
set-face global ts_string_special "%opt{blue}"
|
||||||
|
set-face global ts_string_special_path "%opt{orange}"
|
||||||
|
set-face global ts_string_special_symbol "%opt{mauve}"
|
||||||
|
set-face global ts_string_symbol "%opt{red}"
|
||||||
|
set-face global ts_tag "%opt{mauve}"
|
||||||
|
set-face global ts_tag_error "%opt{red}"
|
||||||
|
set-face global ts_text "%opt{white}"
|
||||||
|
set-face global ts_text_title "%opt{mauve}"
|
||||||
|
set-face global ts_type "%opt{yellow}"
|
||||||
|
set-face global ts_type_enum_variant "%opt{flamingo}"
|
||||||
|
set-face global ts_variable "%opt{blue}"
|
||||||
|
set-face global ts_variable_builtin "%opt{red}"
|
||||||
|
set-face global ts_variable_other_member "%opt{teal}"
|
||||||
|
set-face global ts_variable_parameter "%opt{maroon}+i"
|
||||||
|
set-face global ts_warning "%opt{orange}+b"
|
||||||
|
''
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (config.my)
|
inherit (config.my)
|
||||||
key
|
|
||||||
dmenu
|
dmenu
|
||||||
editor
|
editor
|
||||||
theme
|
theme
|
||||||
|
@ -17,6 +16,7 @@ let
|
||||||
inherit (pkgs.kakouneUtils) buildKakounePlugin;
|
inherit (pkgs.kakouneUtils) buildKakounePlugin;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
imports = [ ./kak-tree-sitter.nix ];
|
||||||
config = {
|
config = {
|
||||||
programs.kakoune = {
|
programs.kakoune = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -100,6 +100,9 @@ in
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
+ ''
|
+ ''
|
||||||
|
try %{
|
||||||
|
eval %sh{ kak-tree-sitter -vvvv -dks --init $kak_session }
|
||||||
|
}
|
||||||
|
|
||||||
set global scrolloff 10,20
|
set global scrolloff 10,20
|
||||||
set global autoreload yes
|
set global autoreload yes
|
||||||
|
@ -118,11 +121,13 @@ in
|
||||||
home.file = {
|
home.file = {
|
||||||
".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml;
|
".config/kak-lsp/kak-lsp.toml".source = ./kak-lsp.toml;
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
terminal
|
terminal
|
||||||
ranger
|
ranger
|
||||||
bmenu
|
bmenu
|
||||||
kak-lsp
|
kak-lsp
|
||||||
|
kak-tree-sitter
|
||||||
kak-pager
|
kak-pager
|
||||||
kak-man-pager
|
kak-man-pager
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@ map global git 'N' ': git-next-merge-conflict <ret>' -docstring 'next git me
|
||||||
map global git 'P' ': git-prev-merge-conflict <ret>' -docstring 'previous git merge conflict'
|
map global git 'P' ': git-prev-merge-conflict <ret>' -docstring 'previous git merge conflict'
|
||||||
map global git 'm' ': git-merge-head <ret>' -docstring 'merge using head'
|
map global git 'm' ': git-merge-head <ret>' -docstring 'merge using head'
|
||||||
map global git 'M' ': git-merge-new <ret>' -docstring 'merge using new'
|
map global git 'M' ': git-merge-new <ret>' -docstring 'merge using new'
|
||||||
|
map global git '<c-m>' ': git-merge-head-and-new <ret>' -docstring 'merge using both head and new'
|
||||||
map global git '<a-m>' ': git-merge-original <ret>' -docstring 'merge using original'
|
map global git '<a-m>' ': git-merge-original <ret>' -docstring 'merge using original'
|
||||||
|
|
||||||
define-command -override git-next-merge-conflict %{
|
define-command -override git-next-merge-conflict %{
|
||||||
|
@ -92,6 +93,19 @@ define-command -override git-merge-new %{
|
||||||
}
|
}
|
||||||
} -docstring "merge using new"
|
} -docstring "merge using new"
|
||||||
|
|
||||||
|
define-command -override git-merge-head-and-new %{
|
||||||
|
evaluate-commands -draft %{
|
||||||
|
# delete head marker
|
||||||
|
execute-keys <a-/>^<lt>{4,}<ret>xd
|
||||||
|
# select middle of conflict
|
||||||
|
execute-keys /^[|]{4,}<ret>x
|
||||||
|
# extendo to theirs marker
|
||||||
|
execute-keys ?^={4,}<ret>xd
|
||||||
|
# delete end marker
|
||||||
|
execute-keys /^<gt>{4,}<ret>xd
|
||||||
|
}
|
||||||
|
} -docstring "merge using head and new"
|
||||||
|
|
||||||
define-command -override git-graph %{
|
define-command -override git-graph %{
|
||||||
try %{ delete-buffer '*git-graph*' }
|
try %{ delete-buffer '*git-graph*' }
|
||||||
edit -scratch '*git-graph*'
|
edit -scratch '*git-graph*'
|
||||||
|
|
64
user/kakoune/kak-tree-sitter.nix
Normal file
64
user/kakoune/kak-tree-sitter.nix
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
{ pkgs, lib, ... }:
|
||||||
|
let
|
||||||
|
hx-src = pkgs.helix.src;
|
||||||
|
kts-src = pkgs.kak-tree-sitter.src;
|
||||||
|
inherit (pkgs) fetchFromGitHub;
|
||||||
|
in
|
||||||
|
with pkgs.tree-sitter-grammars;
|
||||||
|
{
|
||||||
|
xdg.configFile."kak-tree-sitter/config.toml".text =
|
||||||
|
lib.foldlAttrs
|
||||||
|
(
|
||||||
|
acc: name: vals:
|
||||||
|
acc
|
||||||
|
+ ''
|
||||||
|
[language.${name}.grammar.source.local]
|
||||||
|
path = "${vals.parser}"
|
||||||
|
[language.${name}.grammar]
|
||||||
|
compile = "cc"
|
||||||
|
compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."]
|
||||||
|
compile_flags = ["-O3"]
|
||||||
|
link = "cc"
|
||||||
|
link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "typescript.so"]
|
||||||
|
link_flags = ["-O3"]
|
||||||
|
[language.${name}.queries.source.local]
|
||||||
|
path = "${vals.queries}"
|
||||||
|
[language.${name}.queries]
|
||||||
|
path = "${vals.queries}"
|
||||||
|
''
|
||||||
|
)
|
||||||
|
""
|
||||||
|
{
|
||||||
|
nix = {
|
||||||
|
parser = tree-sitter-nix + "/parser";
|
||||||
|
queries = tree-sitter-nix + "/queries";
|
||||||
|
};
|
||||||
|
|
||||||
|
scss = {
|
||||||
|
parser = tree-sitter-scss + "/parser";
|
||||||
|
queries = tree-sitter-scss + "/queries";
|
||||||
|
};
|
||||||
|
css = {
|
||||||
|
parser = tree-sitter-css + "/parser";
|
||||||
|
queries = tree-sitter-css + "/queries";
|
||||||
|
};
|
||||||
|
|
||||||
|
javascript = {
|
||||||
|
parser = tree-sitter-javascript + "/parser";
|
||||||
|
queries = tree-sitter-javascript + "/queries";
|
||||||
|
};
|
||||||
|
typescript = {
|
||||||
|
parser =
|
||||||
|
tree-sitter-typescript.overrideAttrs (old: {
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "tree-sitter";
|
||||||
|
repo = "tree-sitter-typescript";
|
||||||
|
rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf";
|
||||||
|
hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ=";
|
||||||
|
};
|
||||||
|
})
|
||||||
|
+ "/parser";
|
||||||
|
queries = kts-src + "/runtime/queries/typescript";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -492,6 +492,7 @@ in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultApplications = mimes;
|
defaultApplications = mimes;
|
||||||
|
associations.added = mimes;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,12 @@
|
||||||
config = {
|
config = {
|
||||||
programs.password-store = {
|
programs.password-store = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
package = pkgs.pass.withExtensions (
|
||||||
|
ex: with ex; [
|
||||||
|
pass-otp
|
||||||
|
pass-import
|
||||||
|
]
|
||||||
|
);
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
pass-secret-service.enable = true;
|
pass-secret-service.enable = true;
|
||||||
|
@ -26,6 +31,7 @@
|
||||||
_gpg-unlock
|
_gpg-unlock
|
||||||
qtpass
|
qtpass
|
||||||
readQrCode
|
readQrCode
|
||||||
|
pass-export
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
17
user/powerplay-led-idle.nix
Normal file
17
user/powerplay-led-idle.nix
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
{ pkgs, lib, ... }:
|
||||||
|
{
|
||||||
|
systemd.user.services.powerplay-led-idle = {
|
||||||
|
Unit = {
|
||||||
|
Description = "Autosuspend Powerplay mousepad led";
|
||||||
|
PartOf = [ "graphical-session.target" ];
|
||||||
|
After = [ "graphical-session.target" ];
|
||||||
|
};
|
||||||
|
Service = {
|
||||||
|
ExecStart = lib.getExe pkgs.powerplay-led-idle;
|
||||||
|
Restart = "on-failure";
|
||||||
|
};
|
||||||
|
Install = {
|
||||||
|
WantedBy = [ "graphical-session.target" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -32,7 +32,6 @@ let
|
||||||
);
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# My bemenu wrapper
|
|
||||||
xdg.configFile = {
|
xdg.configFile = {
|
||||||
"pqivrc".text = ''
|
"pqivrc".text = ''
|
||||||
[options]
|
[options]
|
||||||
|
|
|
@ -69,9 +69,9 @@ in
|
||||||
};
|
};
|
||||||
output = {
|
output = {
|
||||||
"*" = {
|
"*" = {
|
||||||
adaptive_sync = "off";
|
|
||||||
bg = "${theme.background} fill";
|
bg = "${theme.background} fill";
|
||||||
mode = "1920x1080@144.000Hz";
|
mode = "1920x1080@144.000Hz";
|
||||||
|
adaptive_sync = "on";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
fonts = {
|
fonts = {
|
||||||
|
@ -80,6 +80,12 @@ in
|
||||||
};
|
};
|
||||||
# Ignore PS4 controller touchpad events
|
# Ignore PS4 controller touchpad events
|
||||||
input."1356:2508:Wireless_Controller_Touchpad".events = "disabled";
|
input."1356:2508:Wireless_Controller_Touchpad".events = "disabled";
|
||||||
|
|
||||||
|
input."1133:16537:Logitech_G502_X_PLUS" = {
|
||||||
|
accel_profile = "flat";
|
||||||
|
pointer_accel = "0";
|
||||||
|
};
|
||||||
|
|
||||||
input."type:touchpad" = {
|
input."type:touchpad" = {
|
||||||
# Disable While Typing
|
# Disable While Typing
|
||||||
dwt = "enabled";
|
dwt = "enabled";
|
||||||
|
@ -101,9 +107,9 @@ in
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
for_window [title=.*] inhibit_idle fullscreen
|
for_window [title=.*] inhibit_idle fullscreen
|
||||||
exec ${pkgs.dbus-sway-environment}/bin/dbus-sway-environment
|
|
||||||
exec swaymsg workspace 2
|
exec swaymsg workspace 2
|
||||||
exec_always systemctl --user restart waybar.service
|
exec_always systemctl --user restart waybar.service
|
||||||
|
exec corectrl --minimize-systray
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
services.gammastep = {
|
services.gammastep = {
|
||||||
|
@ -116,20 +122,7 @@ in
|
||||||
indicator = true;
|
indicator = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.services.vrr-fullscreen = {
|
services.gpg-agent.pinentryPackage = pkgs.pinentry-all;
|
||||||
Unit = {
|
|
||||||
Description = "Enable VRR for fullscreen windows";
|
|
||||||
PartOf = [ "graphical-session.target" ];
|
|
||||||
After = [ "graphical-session.target" ];
|
|
||||||
};
|
|
||||||
Service = {
|
|
||||||
ExecStart = "${lib.getExe pkgs.vrr-fullscreen}";
|
|
||||||
Restart = "on-failure";
|
|
||||||
};
|
|
||||||
Install = {
|
|
||||||
WantedBy = [ "sway-session.target" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json;
|
xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json;
|
||||||
|
|
||||||
|
@ -146,6 +139,7 @@ in
|
||||||
wdmenu
|
wdmenu
|
||||||
wlauncher
|
wlauncher
|
||||||
volumesh
|
volumesh
|
||||||
|
brightnessctl
|
||||||
showkeys
|
showkeys
|
||||||
pamixer
|
pamixer
|
||||||
libnotify
|
libnotify
|
||||||
|
@ -158,7 +152,8 @@ in
|
||||||
wl-crosshair
|
wl-crosshair
|
||||||
|
|
||||||
grim
|
grim
|
||||||
swappy
|
satty
|
||||||
|
xdg-user-dirs
|
||||||
(tesseract5.override {
|
(tesseract5.override {
|
||||||
enableLanguages = [
|
enableLanguages = [
|
||||||
"eng"
|
"eng"
|
||||||
|
|
|
@ -44,6 +44,8 @@ in
|
||||||
{ title = "Discord"; }
|
{ title = "Discord"; }
|
||||||
{ class = "WebCord"; }
|
{ class = "WebCord"; }
|
||||||
{ app_id = "WebCord"; }
|
{ app_id = "WebCord"; }
|
||||||
|
{ class = "vesktop"; }
|
||||||
|
{ app_id = "vesktop"; }
|
||||||
{ class = "Element"; }
|
{ class = "Element"; }
|
||||||
{ app_id = "Element"; }
|
{ app_id = "Element"; }
|
||||||
];
|
];
|
||||||
|
|
|
@ -16,7 +16,6 @@ let
|
||||||
_lock = pkgs.writeShellScriptBin "_lock" ''
|
_lock = pkgs.writeShellScriptBin "_lock" ''
|
||||||
${pkgs.sway}/bin/swaymsg mode default
|
${pkgs.sway}/bin/swaymsg mode default
|
||||||
${pkgs.swaylock}/bin/swaylock -f
|
${pkgs.swaylock}/bin/swaylock -f
|
||||||
systemctl --user start swayidle.service
|
|
||||||
'';
|
'';
|
||||||
_suspend = pkgs.writeShellScriptBin "_suspend" ''
|
_suspend = pkgs.writeShellScriptBin "_suspend" ''
|
||||||
${pkgs.sway}/bin/swaymsg mode default
|
${pkgs.sway}/bin/swaymsg mode default
|
||||||
|
@ -158,6 +157,12 @@ let
|
||||||
"Control+Print" = "exec ${pkgs.screenshotsh}/bin/screenshotsh clip";
|
"Control+Print" = "exec ${pkgs.screenshotsh}/bin/screenshotsh clip";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
screen_binds = {
|
||||||
|
"XF86MonBrightnessDown" = "exec brightnessctl --min-value=1 set 5%-";
|
||||||
|
"XF86MonBrightnessUp" = "exec brightnessctl --min-value=1 set 5%+";
|
||||||
|
"${mod}+l" = lib.getExe _lock;
|
||||||
|
};
|
||||||
|
|
||||||
other_binds = {
|
other_binds = {
|
||||||
"${mod}+p" = "exec ${pkgs.wpass}/bin/wpass";
|
"${mod}+p" = "exec ${pkgs.wpass}/bin/wpass";
|
||||||
"${mod}+s" = "exec ${menu}";
|
"${mod}+s" = "exec ${menu}";
|
||||||
|
@ -165,7 +170,9 @@ let
|
||||||
"${mod}+c" = "exec ${pkgs.color_picker}/bin/color_picker";
|
"${mod}+c" = "exec ${pkgs.color_picker}/bin/color_picker";
|
||||||
"${mod}+Return" = "exec ${terminal}";
|
"${mod}+Return" = "exec ${terminal}";
|
||||||
"${mod}+Ctrl+Return" = "exec thunar";
|
"${mod}+Ctrl+Return" = "exec thunar";
|
||||||
"${mod}+Shift+s" = "exec grim - | swappy -f -";
|
"${mod}+Shift+s" = ''
|
||||||
|
exec grim - | satty --filename - --fullscreen --output-filename "$(xdg-user-dir PICTURES)"/Screenshots/satty-$(date '+%Y%m%d-%H:%M:%S').png
|
||||||
|
'';
|
||||||
"${mod}+Ctrl+v" = "exec wl-paste | tesseract -l por - - | wl-copy";
|
"${mod}+Ctrl+v" = "exec wl-paste | tesseract -l por - - | wl-copy";
|
||||||
"${mod}+k" = "exec showkeys";
|
"${mod}+k" = "exec showkeys";
|
||||||
"${mod}+Alt+x" = "exec pkill wl-crosshair || exec wl-crosshair";
|
"${mod}+Alt+x" = "exec pkill wl-crosshair || exec wl-crosshair";
|
||||||
|
@ -196,5 +203,6 @@ in
|
||||||
system_binds
|
system_binds
|
||||||
parenting_binds
|
parenting_binds
|
||||||
screenshot_binds
|
screenshot_binds
|
||||||
|
screen_binds
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,9 +48,14 @@ lib.mkIf (desktop == "sway") {
|
||||||
gtk3 = shared;
|
gtk3 = shared;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
xdg.configFile."gtk-3.0/settings.ini".force = true;
|
||||||
|
xdg.configFile."gtk-4.0/settings.ini".force = true;
|
||||||
|
|
||||||
qt = {
|
qt = {
|
||||||
enable = true;
|
enable = true;
|
||||||
platformTheme.name = "qtct";
|
platformTheme.name = "gtk3";
|
||||||
|
style.name = "qt5ct";
|
||||||
};
|
};
|
||||||
|
|
||||||
dconf.settings = {
|
dconf.settings = {
|
||||||
|
@ -79,6 +84,13 @@ lib.mkIf (desktop == "sway") {
|
||||||
# fixed=@Variant(\0\0\0@\0\0\0\x1c\0H\0\x61\0\x63\0k\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
|
# fixed=@Variant(\0\0\0@\0\0\0\x1c\0H\0\x61\0\x63\0k\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
|
||||||
# general=@Variant(\0\0\0@\0\0\0\x1e\0L\0i\0\x62\0\x65\0r\0\x61\0t\0i\0o\0n\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
|
# general=@Variant(\0\0\0@\0\0\0\x1e\0L\0i\0\x62\0\x65\0r\0\x61\0t\0i\0o\0n\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
|
||||||
'';
|
'';
|
||||||
|
"kdedefaults/kdeglobals".text = ''
|
||||||
|
[General]
|
||||||
|
ColorScheme=BreezeDark
|
||||||
|
|
||||||
|
[Icons]
|
||||||
|
Theme=${icon_theme}
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
services.xsettingsd = {
|
services.xsettingsd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -10,6 +10,12 @@
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
wayland.windowManager.sway = {
|
||||||
|
extraConfig = ''
|
||||||
|
exec_always systemctl --user import-environment PATH
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
xdg.configFile = {
|
xdg.configFile = {
|
||||||
"Thunar/".source = ./thunar;
|
"Thunar/".source = ./thunar;
|
||||||
};
|
};
|
||||||
|
|
|
@ -108,24 +108,8 @@ rec {
|
||||||
mail = {
|
mail = {
|
||||||
personal = {
|
personal = {
|
||||||
from = "Leonardo Eugênio";
|
from = "Leonardo Eugênio";
|
||||||
user = "lelgenio@disroot.org";
|
user = "lelgenio@lelgenio.com";
|
||||||
imap = "disroot.org";
|
|
||||||
smtp = "disroot.org";
|
|
||||||
pass = "disroot.org";
|
|
||||||
};
|
};
|
||||||
work = {
|
|
||||||
from = "Leonardo Eugênio";
|
|
||||||
user = "leonardo@wopus.com.br";
|
|
||||||
imap = "imap.hostinger.com";
|
|
||||||
smtp = "smtp.hostinger.com";
|
|
||||||
pass = "Work/wopus_email";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
nextcloud = {
|
|
||||||
name = "disroot";
|
|
||||||
user = "lelgenio";
|
|
||||||
host = "cloud.disroot.org";
|
|
||||||
pass = "disroot.org";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
dmenu = "bmenu";
|
dmenu = "bmenu";
|
||||||
|
|
|
@ -1,92 +0,0 @@
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
inherit (config.my) nextcloud;
|
|
||||||
pass_cmd = (
|
|
||||||
pkgs.writeShellScript "get_pass" ''
|
|
||||||
pass "${nextcloud.pass}" | head -n1
|
|
||||||
''
|
|
||||||
);
|
|
||||||
in
|
|
||||||
{
|
|
||||||
systemd.user.services.vdirsyncer = {
|
|
||||||
Unit.Description = "vdirsyncer calendar and contacts synchronization";
|
|
||||||
Service = {
|
|
||||||
Type = "oneshot";
|
|
||||||
ExecStart = toString (
|
|
||||||
pkgs.writeShellScript "run-vdirsyncer" ''
|
|
||||||
${pkgs.coreutils}/bin/yes | ${pkgs.vdirsyncer}/bin/vdirsyncer discover
|
|
||||||
${pkgs.coreutils}/bin/yes | ${pkgs.vdirsyncer}/bin/vdirsyncer sync
|
|
||||||
''
|
|
||||||
);
|
|
||||||
};
|
|
||||||
};
|
|
||||||
systemd.user.timers.vdirsyncer = {
|
|
||||||
Unit.Description = "vdirsyncer calendar and contacts synchronization";
|
|
||||||
Timer = {
|
|
||||||
OnCalendar = "*:0/30";
|
|
||||||
Unit = "vdirsyncer.service";
|
|
||||||
};
|
|
||||||
Install.WantedBy = [ "timers.target" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
xdg.configFile = {
|
|
||||||
"vdirsyncer/config".text = ''
|
|
||||||
[general]
|
|
||||||
status_path = "~/.vdirsyncer/status/"
|
|
||||||
|
|
||||||
[pair contacts]
|
|
||||||
a = "contacts_local"
|
|
||||||
b = "contacts_remote"
|
|
||||||
|
|
||||||
collections = ["from a", "from b"]
|
|
||||||
|
|
||||||
metadata = ["displayname"]
|
|
||||||
|
|
||||||
[storage contacts_local]
|
|
||||||
type = "filesystem"
|
|
||||||
path = "~/.local/share/contacts/"
|
|
||||||
fileext = ".vcf"
|
|
||||||
|
|
||||||
[storage contacts_remote]
|
|
||||||
type = "carddav"
|
|
||||||
url = "https://${nextcloud.host}/remote.php/dav/addressbooks/users/${nextcloud.user}/"
|
|
||||||
username = "${nextcloud.user}"
|
|
||||||
password.fetch = [ "command", "${pass_cmd}" ]
|
|
||||||
|
|
||||||
[pair calendar]
|
|
||||||
a = "calendar_local"
|
|
||||||
b = "calendar_remote"
|
|
||||||
collections = ["from a", "from b"]
|
|
||||||
metadata = ["displayname", "color"]
|
|
||||||
conflict_resolution = "b wins"
|
|
||||||
|
|
||||||
[storage calendar_local]
|
|
||||||
type = "filesystem"
|
|
||||||
path = "~/.local/share/calendars/"
|
|
||||||
fileext = ".ics"
|
|
||||||
|
|
||||||
[storage calendar_remote]
|
|
||||||
type = "caldav"
|
|
||||||
url = "https://${nextcloud.host}/remote.php/dav/calendars/${nextcloud.user}/"
|
|
||||||
username = "${nextcloud.user}"
|
|
||||||
password.fetch = [ "command", "${pass_cmd}" ]
|
|
||||||
'';
|
|
||||||
"todoman/config.py".text = ''
|
|
||||||
path = "~/.local/share/calendars/*"
|
|
||||||
date_format = "%Y-%m-%d"
|
|
||||||
time_format = "%H:%M"
|
|
||||||
default_list = "Personal"
|
|
||||||
default_due = 48
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
vdirsyncer
|
|
||||||
todoman
|
|
||||||
];
|
|
||||||
}
|
|
|
@ -106,7 +106,7 @@ in
|
||||||
};
|
};
|
||||||
clock = {
|
clock = {
|
||||||
interval = 60;
|
interval = 60;
|
||||||
format = "<b>{:%H:%M %a %d/%m}</b>";
|
format = "<b>{:L%H:%M %a %d/%m}</b>";
|
||||||
tooltip-format = "<tt><small>{calendar}</small></tt>";
|
tooltip-format = "<tt><small>{calendar}</small></tt>";
|
||||||
calendar = {
|
calendar = {
|
||||||
mode = "year";
|
mode = "year";
|
||||||
|
@ -137,9 +137,8 @@ in
|
||||||
{
|
{
|
||||||
format = "{stateIcon} {title} - {artist}";
|
format = "{stateIcon} {title} - {artist}";
|
||||||
format-paused = "{stateIcon}";
|
format-paused = "{stateIcon}";
|
||||||
format-stopped = "{stateIcon}";
|
format-stopped = "";
|
||||||
state-icons = {
|
state-icons = {
|
||||||
stopped = "";
|
|
||||||
paused = "";
|
paused = "";
|
||||||
playing = "";
|
playing = "";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue