Compare commits
80 commits
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 |
290
flake.lock
290
flake.lock
|
@ -28,11 +28,11 @@
|
||||||
"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": {
|
||||||
|
@ -81,6 +81,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"crane_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"warthunder-leak-counter",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1718730147,
|
||||||
|
"narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=",
|
||||||
|
"owner": "ipetkov",
|
||||||
|
"repo": "crane",
|
||||||
|
"rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "ipetkov",
|
||||||
|
"repo": "crane",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"darwin": {
|
"darwin": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -155,11 +176,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718242063,
|
"lastModified": 1726590912,
|
||||||
"narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=",
|
"narHash": "sha256-5bxY85siOIqOcQ8TOMAWLkMUZvLUADS2i5TsZhzUIZY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2",
|
"rev": "d32d1504c77d7f6ba7e033357dcf638baceab9b7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -168,22 +189,40 @@
|
||||||
"type": "github"
|
"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": {
|
"dzgui-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"dzgui": "dzgui",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718144257,
|
"lastModified": 1702850463,
|
||||||
"narHash": "sha256-rgRnU05sgqdDpxF3n6oaGUOGbW0xehijrBNr3DJnN3U=",
|
"narHash": "sha256-qR/c/GjsLUzrCyHN/Q9nnClduf6OqTg26S1AFYKPzxA=",
|
||||||
"owner": "lelgenio",
|
"owner": "lelgenio",
|
||||||
"repo": "dzgui-nix",
|
"repo": "dzgui-nix",
|
||||||
"rev": "c0aa386e8c08946dc2b8713e59a77cb6079a0b62",
|
"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"
|
||||||
}
|
}
|
||||||
|
@ -227,36 +266,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_2": {
|
"flake-compat_2": {
|
||||||
"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_3": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1650374568,
|
|
||||||
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat_4": {
|
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696426674,
|
"lastModified": 1696426674,
|
||||||
|
@ -290,24 +299,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils-plus": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils_4"
|
|
||||||
},
|
|
||||||
"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"
|
||||||
|
@ -346,11 +337,11 @@
|
||||||
"systems": "systems_5"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694529238,
|
"lastModified": 1681202837,
|
||||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -361,7 +352,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_5": {
|
"flake-utils_5": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_7"
|
"systems": "systems_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681202837,
|
"lastModified": 1681202837,
|
||||||
|
@ -379,7 +370,7 @@
|
||||||
},
|
},
|
||||||
"flake-utils_6": {
|
"flake-utils_6": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_8"
|
"systems": "systems_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1710146030,
|
||||||
|
@ -402,11 +393,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717527182,
|
"lastModified": 1726592409,
|
||||||
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
|
"narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "845a5c4c073f74105022533907703441e0464bc3",
|
"rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -423,11 +414,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718011381,
|
"lastModified": 1726449931,
|
||||||
"narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=",
|
"narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "88ad3d7501e22b2401dd72734b032b7baa794434",
|
"rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -436,87 +427,17 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix-software-center": {
|
|
||||||
"inputs": {
|
|
||||||
"nixos-appstream-data": "nixos-appstream-data",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"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_2",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"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_4",
|
"flake-compat": "flake-compat_2",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"nixpkgs-24_05": [
|
"nixpkgs-24_05": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"utils": "utils_2"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718084203,
|
"lastModified": 1718084203,
|
||||||
|
@ -535,11 +456,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718086528,
|
"lastModified": 1726447378,
|
||||||
"narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=",
|
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "47b604b07d1e8146d5398b42d3306fdebd343986",
|
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -589,13 +510,12 @@
|
||||||
"dzgui-nix": "dzgui-nix",
|
"dzgui-nix": "dzgui-nix",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"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",
|
"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"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -643,29 +563,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"snowfall-lib": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": "flake-compat_3",
|
|
||||||
"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,
|
||||||
|
@ -771,24 +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"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tlauncher": {
|
"tlauncher": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_5",
|
"flake-utils": "flake-utils_4",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
|
@ -811,24 +693,6 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_4"
|
"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_6"
|
|
||||||
},
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1709126324,
|
"lastModified": 1709126324,
|
||||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||||
|
@ -843,6 +707,28 @@
|
||||||
"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_6",
|
"flake-utils": "flake-utils_6",
|
||||||
|
|
12
flake.nix
12
flake.nix
|
@ -29,7 +29,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
dzgui-nix = {
|
dzgui-nix = {
|
||||||
url = "github:lelgenio/dzgui-nix";
|
url = "github:lelgenio/dzgui-nix/dzgui-4.1.0";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -54,14 +54,8 @@
|
||||||
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";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,6 +23,7 @@ in
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
./partition.nix
|
./partition.nix
|
||||||
|
./undervolt.nix
|
||||||
];
|
];
|
||||||
boot.initrd.availableKernelModules = [
|
boot.initrd.availableKernelModules = [
|
||||||
"nvme"
|
"nvme"
|
||||||
|
@ -45,9 +46,6 @@ in
|
||||||
boot.kernelParams = [
|
boot.kernelParams = [
|
||||||
"amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
|
"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
|
||||||
|
@ -67,36 +65,26 @@ in
|
||||||
rocmPackages.rocm-smi
|
rocmPackages.rocm-smi
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_6_1;
|
fileSystems."/mnt/old" = {
|
||||||
|
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
programs.corectrl = {
|
fsType = "btrfs";
|
||||||
enable = true;
|
options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
gpuOverclock = {
|
|
||||||
enable = true;
|
|
||||||
ppfeaturemask = "0xffffffff";
|
|
||||||
};
|
};
|
||||||
|
# boot.initrd.luks.reusePassphrases = true;
|
||||||
|
boot.initrd.luks.devices = {
|
||||||
|
"old" = {
|
||||||
|
bypassWorkqueues = true;
|
||||||
|
device = "/dev/disk/by-label/CRYPT_ROOT";
|
||||||
|
};
|
||||||
|
"data" = {
|
||||||
|
bypassWorkqueues = true;
|
||||||
|
device = "/dev/disk/by-label/CRYPT_DATA";
|
||||||
};
|
};
|
||||||
|
|
||||||
# fileSystems."/" = {
|
|
||||||
# device = "/dev/disk/by-label/BTRFS_ROOT";
|
|
||||||
# fsType = "btrfs";
|
|
||||||
# options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd;
|
|
||||||
# };
|
|
||||||
# # boot.initrd.luks.reusePassphrases = true;
|
|
||||||
# boot.initrd.luks.devices = {
|
|
||||||
# "main" = {
|
|
||||||
# bypassWorkqueues = true;
|
|
||||||
# device = "/dev/disk/by-label/CRYPT_ROOT";
|
|
||||||
# };
|
|
||||||
# "data" = {
|
|
||||||
# bypassWorkqueues = true;
|
|
||||||
# device = "/dev/disk/by-label/CRYPT_DATA";
|
|
||||||
# };
|
|
||||||
# "bigboy" = {
|
# "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";
|
# boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||||
# fileSystems."/boot/efi" = {
|
# fileSystems."/boot/efi" = {
|
||||||
# device = "/dev/disk/by-label/NIXBOOT";
|
# device = "/dev/disk/by-label/NIXBOOT";
|
||||||
|
@ -107,43 +95,43 @@ in
|
||||||
# fsType = "btrfs";
|
# fsType = "btrfs";
|
||||||
# options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd;
|
# 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";
|
||||||
# options = [
|
options = [
|
||||||
# "subvol=@games"
|
"subvol=@games"
|
||||||
# "nofail"
|
"nofail"
|
||||||
# ] ++ btrfs_options;
|
] ++ btrfs_options;
|
||||||
# };
|
};
|
||||||
# fileSystems."/home/lelgenio/Downloads/Torrents" = {
|
fileSystems."/home/lelgenio/Downloads/Torrents" = {
|
||||||
# device = "/dev/disk/by-label/BTRFS_DATA";
|
device = "/dev/disk/by-label/BTRFS_DATA";
|
||||||
# fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
# options = [
|
options = [
|
||||||
# "subvol=@torrents"
|
"subvol=@torrents"
|
||||||
# "nofail"
|
"nofail"
|
||||||
# ] ++ btrfs_options;
|
] ++ btrfs_options;
|
||||||
# };
|
};
|
||||||
# fileSystems."/home/lelgenio/Música" = {
|
fileSystems."/home/lelgenio/Música" = {
|
||||||
# device = "/dev/disk/by-label/BTRFS_DATA";
|
device = "/dev/disk/by-label/BTRFS_DATA";
|
||||||
# fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
# options = [
|
options = [
|
||||||
# "subvol=@music"
|
"subvol=@music"
|
||||||
# "nofail"
|
"nofail"
|
||||||
# ] ++ btrfs_options;
|
] ++ btrfs_options;
|
||||||
# };
|
};
|
||||||
# fileSystems."/home/lelgenio/.local/mount/data" = {
|
fileSystems."/home/lelgenio/.local/mount/data" = {
|
||||||
# device = "/dev/disk/by-label/BTRFS_DATA";
|
device = "/dev/disk/by-label/BTRFS_DATA";
|
||||||
# fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
# options = [
|
options = [
|
||||||
# "subvol=@data"
|
"subvol=@data"
|
||||||
# "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;
|
||||||
# };
|
};
|
||||||
|
|
||||||
# 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
|
||||||
|
@ -155,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"
|
||||||
|
@ -164,6 +154,11 @@ 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"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
boot.tmp = {
|
||||||
|
cleanOnBoot = true;
|
||||||
|
useTmpfs = true;
|
||||||
|
};
|
||||||
|
|
||||||
# swap
|
# swap
|
||||||
# fileSystems."/swap" = {
|
# fileSystems."/swap" = {
|
||||||
# device = "/dev/disk/by-label/BTRFS_ROOT";
|
# device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
|
|
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,6 +18,9 @@
|
||||||
./writefreely.nix
|
./writefreely.nix
|
||||||
./email.nix
|
./email.nix
|
||||||
./forgejo.nix
|
./forgejo.nix
|
||||||
|
./warthunder-leak-counter.nix
|
||||||
|
./invidious.nix
|
||||||
|
./davi.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "phantom";
|
networking.hostName = "phantom";
|
||||||
|
@ -53,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";
|
||||||
|
@ -61,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";
|
||||||
};
|
};
|
||||||
|
|
|
@ -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 = {
|
||||||
|
|
|
@ -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}";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -48,6 +48,8 @@ rec {
|
||||||
patches = (
|
patches = (
|
||||||
final: prev: {
|
final: prev: {
|
||||||
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 ];
|
||||||
});
|
});
|
||||||
|
|
|
@ -2,10 +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 { };
|
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 { };
|
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 ];
|
||||||
|
};
|
||||||
|
}
|
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,14 +124,13 @@
|
||||||
zbar
|
zbar
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
];
|
];
|
||||||
auto_connect_gamepad = [
|
powerplay-led-idle = [
|
||||||
bluez
|
bash
|
||||||
coreutils
|
libinput
|
||||||
gnugrep
|
libratbag
|
||||||
];
|
];
|
||||||
vrr-fullscreen = [ ];
|
|
||||||
}
|
}
|
||||||
// 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,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
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
|
|
||||||
|
|
|
@ -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;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -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,14 +56,9 @@ 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 {
|
|
||||||
name = "return_youtube_dislikes";
|
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/file/4208483/return_youtube_dislikes-3.0.0.14.xpi";
|
|
||||||
hash = "sha256-oxqyNUmEa36rkqCU6S34NJBHtIu9gH8GnRKAg8Oyf2E=";
|
|
||||||
})
|
})
|
||||||
|
|
||||||
(pkgs.fetchFirefoxAddon {
|
(pkgs.fetchFirefoxAddon {
|
||||||
|
@ -85,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";
|
||||||
|
@ -106,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;
|
||||||
|
@ -123,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;
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -36,6 +36,7 @@ in
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
rm = "trash";
|
rm = "trash";
|
||||||
tree = "eza -T";
|
tree = "eza -T";
|
||||||
|
kill_yourself = "shutdown now";
|
||||||
};
|
};
|
||||||
shellAbbrs = {
|
shellAbbrs = {
|
||||||
off = "shutdown now";
|
off = "shutdown now";
|
||||||
|
|
|
@ -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,7 +8,6 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./controller.nix
|
|
||||||
./waybar
|
./waybar
|
||||||
./helix.nix
|
./helix.nix
|
||||||
./kakoune
|
./kakoune
|
||||||
|
@ -42,6 +41,7 @@
|
||||||
./xdg-dirs.nix
|
./xdg-dirs.nix
|
||||||
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;
|
||||||
|
@ -52,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
|
||||||
|
|
||||||
|
|
|
@ -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" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -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";
|
||||||
|
@ -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;
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.vscodium-fhs;
|
package = pkgs.vscodium;
|
||||||
extensions = with pkgs.vscode-extensions; [
|
extensions = with pkgs.vscode-extensions; [
|
||||||
jnoortheen.nix-ide
|
jnoortheen.nix-ide
|
||||||
github.github-vscode-theme
|
github.github-vscode-theme
|
||||||
|
|
|
@ -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