Compare commits
No commits in common. "main" and "disko" have entirely different histories.
423
flake.lock
423
flake.lock
|
|
@ -28,11 +28,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723293904,
|
"lastModified": 1716561646,
|
||||||
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
|
"narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
|
"rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -57,22 +57,6 @@
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"catboy-spinner": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728098748,
|
|
||||||
"narHash": "sha256-FHM/a+wqctmg1LXf/XB6TcXowL0Wzbq1kSCGVnxGgL8=",
|
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "c6fc11b0900826508f6a766c65cf92e0c7c4eab9",
|
|
||||||
"revCount": 4,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lelgenio.com/lelgenio/catboy-spinner"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lelgenio.com/lelgenio/catboy-spinner"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"crane": {
|
"crane": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
|
|
@ -97,48 +81,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"crane_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"made-you-look",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1718730147,
|
|
||||||
"narHash": "sha256-QmD6B6FYpuoCqu6ZuPJH896ItNquDkn0ulQlOn4ykN8=",
|
|
||||||
"owner": "ipetkov",
|
|
||||||
"repo": "crane",
|
|
||||||
"rev": "32c21c29b034d0a93fdb2379d6fabc40fc3d0e6c",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "ipetkov",
|
|
||||||
"repo": "crane",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"crane_3": {
|
|
||||||
"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": [
|
||||||
|
|
@ -213,11 +155,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730190761,
|
"lastModified": 1718242063,
|
||||||
"narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=",
|
"narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "3979285062d6781525cded0f6c4ff92e71376b55",
|
"rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -233,11 +175,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727831626,
|
"lastModified": 1718144257,
|
||||||
"narHash": "sha256-Gvt5lapgNRRTL95gFH8vm48f8gjsk7GYM4Qo5aUOzzo=",
|
"narHash": "sha256-rgRnU05sgqdDpxF3n6oaGUOGbW0xehijrBNr3DJnN3U=",
|
||||||
"owner": "lelgenio",
|
"owner": "lelgenio",
|
||||||
"repo": "dzgui-nix",
|
"repo": "dzgui-nix",
|
||||||
"rev": "38cf2b507d75cc36ec127b21fc5a4144fc821525",
|
"rev": "c0aa386e8c08946dc2b8713e59a77cb6079a0b62",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -285,6 +227,36 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"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,
|
||||||
|
|
@ -318,6 +290,24 @@
|
||||||
"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"
|
||||||
|
|
@ -353,14 +343,14 @@
|
||||||
},
|
},
|
||||||
"flake-utils_4": {
|
"flake-utils_4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_4"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681202837,
|
"lastModified": 1694529238,
|
||||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -370,24 +360,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_5": {
|
"flake-utils_5": {
|
||||||
"inputs": {
|
|
||||||
"systems": "systems_6"
|
|
||||||
},
|
|
||||||
"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_6": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_7"
|
"systems": "systems_7"
|
||||||
},
|
},
|
||||||
|
|
@ -405,7 +377,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_7": {
|
"flake-utils_6": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_8"
|
"systems": "systems_8"
|
||||||
},
|
},
|
||||||
|
|
@ -423,22 +395,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"hello-fonts": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728232065,
|
|
||||||
"narHash": "sha256-1DUW1YqZALPFxBM7HYcNZiCZQvMqUiJ1m04NU4IIe3I=",
|
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "10f7485fea930bb45e97fbda0cd68f199a7e8f59",
|
|
||||||
"revCount": 1,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lelgenio.com/lelgenio/hello-fonts"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lelgenio.com/lelgenio/hello-fonts"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -446,11 +402,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726989464,
|
"lastModified": 1717527182,
|
||||||
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
"narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
|
"rev": "845a5c4c073f74105022533907703441e0464bc3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -460,28 +416,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"made-you-look": {
|
|
||||||
"inputs": {
|
|
||||||
"crane": "crane_2",
|
|
||||||
"flake-utils": "flake-utils_4",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728159958,
|
|
||||||
"narHash": "sha256-r/h/ch70KfOQ8moftDhHagu3WajglaqU+hrEzUtTM1Y=",
|
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "96e978aa2f414d4b92b78e7ae975d7ff7db95a91",
|
|
||||||
"revCount": 3,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lelgenio.com/lelgenio/made-you-look"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lelgenio.com/lelgenio/made-you-look"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-index-database": {
|
"nix-index-database": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -489,11 +423,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729999765,
|
"lastModified": 1718011381,
|
||||||
"narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=",
|
"narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f",
|
"rev": "88ad3d7501e22b2401dd72734b032b7baa794434",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -502,17 +436,87 @@
|
||||||
"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_2",
|
"flake-compat": "flake-compat_4",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"nixpkgs-24_05": [
|
"nixpkgs-24_05": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"utils": "utils"
|
"utils": "utils_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718084203,
|
"lastModified": 1718084203,
|
||||||
|
|
@ -531,11 +535,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1730137625,
|
"lastModified": 1718086528,
|
||||||
"narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
|
"narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
|
"rev": "47b604b07d1e8146d5398b42d3306fdebd343986",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -544,21 +548,6 @@
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1729880355,
|
|
||||||
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"plymouth-themes": {
|
"plymouth-themes": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -594,26 +583,20 @@
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
"catboy-spinner": "catboy-spinner",
|
|
||||||
"demoji": "demoji",
|
"demoji": "demoji",
|
||||||
"dhist": "dhist",
|
"dhist": "dhist",
|
||||||
"disko": "disko",
|
"disko": "disko",
|
||||||
"dzgui-nix": "dzgui-nix",
|
"dzgui-nix": "dzgui-nix",
|
||||||
"hello-fonts": "hello-fonts",
|
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"made-you-look": "made-you-look",
|
|
||||||
"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",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
|
||||||
"plymouth-themes": "plymouth-themes",
|
"plymouth-themes": "plymouth-themes",
|
||||||
"ranger-icons": "ranger-icons",
|
"ranger-icons": "ranger-icons",
|
||||||
"tlauncher": "tlauncher",
|
"tlauncher": "tlauncher",
|
||||||
"tomater": "tomater",
|
"wl-crosshair": "wl-crosshair"
|
||||||
"vpsadminos": "vpsadminos",
|
|
||||||
"warthunder-leak-counter": "warthunder-leak-counter",
|
|
||||||
"wl-crosshair": "wl-crosshair",
|
|
||||||
"youre-wrong": "youre-wrong"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-analyzer-src": {
|
"rust-analyzer-src": {
|
||||||
|
|
@ -660,6 +643,29 @@
|
||||||
"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,
|
||||||
|
|
@ -801,25 +807,27 @@
|
||||||
"url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix"
|
"url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"tomater": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728089744,
|
|
||||||
"narHash": "sha256-WOz/qUKyao7lM2qcwqqcJDw4jI8mUJL6kNUNm0sxPKk=",
|
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "efff561c745514a7874e3f5de95307a74efc7df9",
|
|
||||||
"revCount": 1,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lelgenio.com/lelgenio/tomater"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lelgenio.com/lelgenio/tomater"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"utils": {
|
"utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_5"
|
"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,
|
||||||
|
|
@ -835,46 +843,9 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"vpsadminos": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1730290190,
|
|
||||||
"narHash": "sha256-a+op2lnWrCytuEhLOE24SKR/irRfjwDEHkpLyAL5P90=",
|
|
||||||
"owner": "vpsfreecz",
|
|
||||||
"repo": "vpsadminos",
|
|
||||||
"rev": "63ac771b9667b45ab2ea87363f69ca7f85668e9b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "vpsfreecz",
|
|
||||||
"repo": "vpsadminos",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"warthunder-leak-counter": {
|
|
||||||
"inputs": {
|
|
||||||
"crane": "crane_3",
|
|
||||||
"flake-utils": "flake-utils_6",
|
|
||||||
"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_7",
|
"flake-utils": "flake-utils_6",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
|
|
@ -892,22 +863,6 @@
|
||||||
"repo": "wl-crosshair",
|
"repo": "wl-crosshair",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"youre-wrong": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1728228087,
|
|
||||||
"narHash": "sha256-W40rQbQAo3lGrKlfenSA8JaGwZMSx/X4lP71enQtK7Y=",
|
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "64e7876233e99ad7223cae29688374a1c1ff569a",
|
|
||||||
"revCount": 2,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lelgenio.com/lelgenio/youre-wrong"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lelgenio.com/lelgenio/youre-wrong"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
||||||
42
flake.nix
42
flake.nix
|
|
@ -2,13 +2,9 @@
|
||||||
description = "My system config";
|
description = "My system config";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-24.05";
|
nixpkgs.url = "nixpkgs/nixos-24.05";
|
||||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
|
||||||
|
|
||||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
vpsadminos.url = "github:vpsfreecz/vpsadminos";
|
|
||||||
|
|
||||||
nix-index-database = {
|
nix-index-database = {
|
||||||
url = "github:Mic92/nix-index-database";
|
url = "github:Mic92/nix-index-database";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
@ -58,30 +54,16 @@
|
||||||
url = "github:lelgenio/wl-crosshair";
|
url = "github:lelgenio/wl-crosshair";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
warthunder-leak-counter = {
|
|
||||||
url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter";
|
# gnome stuff
|
||||||
|
nixos-conf-editor = {
|
||||||
|
url = "github:vlinkz/nixos-conf-editor";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
made-you-look = {
|
nix-software-center = {
|
||||||
url = "git+https://git.lelgenio.com/lelgenio/made-you-look";
|
url = "github:vlinkz/nix-software-center";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
catboy-spinner = {
|
|
||||||
url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
tomater = {
|
|
||||||
url = "git+https://git.lelgenio.com/lelgenio/tomater";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
youre-wrong = {
|
|
||||||
url = "git+https://git.lelgenio.com/lelgenio/youre-wrong";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
hello-fonts = {
|
|
||||||
url = "git+https://git.lelgenio.com/lelgenio/hello-fonts";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
outputs =
|
outputs =
|
||||||
inputs:
|
inputs:
|
||||||
|
|
@ -152,6 +134,13 @@
|
||||||
./system/steam.nix
|
./system/steam.nix
|
||||||
] ++ common_modules;
|
] ++ common_modules;
|
||||||
};
|
};
|
||||||
|
rainbow = lib.nixosSystem {
|
||||||
|
inherit system specialArgs;
|
||||||
|
modules = [
|
||||||
|
./hosts/rainbow
|
||||||
|
./system/rainbow-gitlab-runner.nix
|
||||||
|
] ++ common_modules;
|
||||||
|
};
|
||||||
double-rainbow = lib.nixosSystem {
|
double-rainbow = lib.nixosSystem {
|
||||||
inherit system specialArgs;
|
inherit system specialArgs;
|
||||||
modules = [
|
modules = [
|
||||||
|
|
@ -174,10 +163,7 @@
|
||||||
};
|
};
|
||||||
phantom = lib.nixosSystem {
|
phantom = lib.nixosSystem {
|
||||||
inherit system specialArgs;
|
inherit system specialArgs;
|
||||||
modules = [
|
modules = [ ./hosts/phantom ];
|
||||||
{ nixpkgs.pkgs = pkgs; }
|
|
||||||
./hosts/phantom
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ in
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [ { device = "/swapfile"; } ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
services.udev.extraRules = ''
|
services.udev.extraRules = ''
|
||||||
# Force all disks to use mq-deadline scheduler
|
# Force all disks to use mq-deadline scheduler
|
||||||
|
|
|
||||||
|
|
@ -1,44 +0,0 @@
|
||||||
{ pkgs, lib, ... }:
|
|
||||||
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 -120" > pp_od_clk_voltage
|
|
||||||
echo "c" > pp_od_clk_voltage
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
|
||||||
boot.kernelParams = [
|
|
||||||
"amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
|
|
||||||
"video=DP-1:1920x1080@144"
|
|
||||||
"amdgpu.ppfeaturemask=0xfffd7fff" # enable undervolting
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.services.amd-fan-control = {
|
|
||||||
script = ''
|
|
||||||
${lib.getExe pkgs.amd-fan-control} /sys/class/drm/card1/device 60 85
|
|
||||||
'';
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
hardware.opengl.driSupport = true;
|
|
||||||
# # For 32 bit applications
|
|
||||||
hardware.opengl.driSupport32Bit = true;
|
|
||||||
|
|
||||||
hardware.opengl.extraPackages = with pkgs; [
|
|
||||||
libva
|
|
||||||
libvdpau
|
|
||||||
vaapiVdpau
|
|
||||||
rocm-opencl-icd
|
|
||||||
rocm-opencl-runtime
|
|
||||||
rocmPackages.rocm-smi
|
|
||||||
];
|
|
||||||
|
|
||||||
services.udev.extraRules = ''
|
|
||||||
ACTION=="add", SUBSYSTEM=="hwmon", ATTR{name}=="amdgpu", ATTR{power1_cap}="186000000", RUN+="${undervoltGpu} %S%p/device"
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
|
|
@ -23,8 +23,6 @@ in
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
./partition.nix
|
./partition.nix
|
||||||
./amdgpu.nix
|
|
||||||
./factorio-server.nix
|
|
||||||
];
|
];
|
||||||
boot.initrd.availableKernelModules = [
|
boot.initrd.availableKernelModules = [
|
||||||
"nvme"
|
"nvme"
|
||||||
|
|
@ -37,42 +35,68 @@ in
|
||||||
|
|
||||||
hardware.opentabletdriver.enable = true;
|
hardware.opentabletdriver.enable = true;
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
|
||||||
|
|
||||||
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
|
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
|
||||||
|
|
||||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||||
boot.kernelModules = [
|
boot.kernelModules = [
|
||||||
"kvm-amd"
|
"kvm-amd"
|
||||||
"amdgpu"
|
"amdgpu"
|
||||||
"zenpower"
|
"zenpower"
|
||||||
];
|
];
|
||||||
|
boot.kernelParams = [
|
||||||
|
"amdgpu.dcdebugmask=0x10" # amdgpu undervolting bug
|
||||||
|
"video=DP-1:1920x1080@144"
|
||||||
|
# hibernation
|
||||||
|
# "resume=LABEL=BTRFS_ROOT" # findmnt -o LABEL --noheadings /swap/
|
||||||
|
# "resume_offset=36709632" # btrfs inspect-internal map-swapfile -r /swap/swapfile
|
||||||
|
];
|
||||||
systemd.sleep.extraConfig = ''
|
systemd.sleep.extraConfig = ''
|
||||||
HibernateDelaySec=30s
|
HibernateDelaySec=30s
|
||||||
SuspendState=mem
|
SuspendState=mem
|
||||||
'';
|
'';
|
||||||
|
|
||||||
fileSystems."/mnt/old" = {
|
hardware.opengl.driSupport = true;
|
||||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
# # For 32 bit applications
|
||||||
fsType = "btrfs";
|
hardware.opengl.driSupport32Bit = true;
|
||||||
options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd;
|
|
||||||
};
|
hardware.opengl.extraPackages = with pkgs; [
|
||||||
# boot.initrd.luks.reusePassphrases = true;
|
libva
|
||||||
boot.initrd.luks.devices = {
|
libvdpau
|
||||||
"old" = {
|
vaapiVdpau
|
||||||
bypassWorkqueues = true;
|
rocm-opencl-icd
|
||||||
device = "/dev/disk/by-label/CRYPT_ROOT";
|
rocm-opencl-runtime
|
||||||
|
rocmPackages.rocm-smi
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_6_1;
|
||||||
|
|
||||||
|
programs.corectrl = {
|
||||||
|
enable = true;
|
||||||
|
gpuOverclock = {
|
||||||
|
enable = true;
|
||||||
|
ppfeaturemask = "0xffffffff";
|
||||||
};
|
};
|
||||||
"data" = {
|
|
||||||
bypassWorkqueues = true;
|
|
||||||
device = "/dev/disk/by-label/CRYPT_DATA";
|
|
||||||
};
|
|
||||||
# "bigboy" = {
|
|
||||||
# bypassWorkqueues = true;
|
|
||||||
# device = "/dev/disk/by-label/CRYPT_BIGBOY";
|
|
||||||
# };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# fileSystems."/" = {
|
||||||
|
# device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
|
# fsType = "btrfs";
|
||||||
|
# options = [ "subvol=nixos" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
|
# };
|
||||||
|
# # boot.initrd.luks.reusePassphrases = true;
|
||||||
|
# boot.initrd.luks.devices = {
|
||||||
|
# "main" = {
|
||||||
|
# bypassWorkqueues = true;
|
||||||
|
# device = "/dev/disk/by-label/CRYPT_ROOT";
|
||||||
|
# };
|
||||||
|
# "data" = {
|
||||||
|
# bypassWorkqueues = true;
|
||||||
|
# device = "/dev/disk/by-label/CRYPT_DATA";
|
||||||
|
# };
|
||||||
|
# "bigboy" = {
|
||||||
|
# bypassWorkqueues = true;
|
||||||
|
# device = "/dev/disk/by-label/CRYPT_BIGBOY";
|
||||||
|
# };
|
||||||
|
# };
|
||||||
# boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
# boot.loader.efi.efiSysMountPoint = "/boot/efi";
|
||||||
# fileSystems."/boot/efi" = {
|
# fileSystems."/boot/efi" = {
|
||||||
# device = "/dev/disk/by-label/NIXBOOT";
|
# device = "/dev/disk/by-label/NIXBOOT";
|
||||||
|
|
@ -83,43 +107,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/old" = {
|
# fileSystems."/home/lelgenio/.local/mount/bigboy" = {
|
||||||
device = "/dev/disk/by-label/BTRFS_ROOT";
|
# device = "/dev/disk/by-label/BTRFS_BIGBOY";
|
||||||
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
|
||||||
|
|
@ -131,8 +155,6 @@ 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"
|
||||||
|
|
@ -142,11 +164,6 @@ 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";
|
||||||
|
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
{
|
|
||||||
services.factorio = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.factorio-headless; # I override this in ./pkgs
|
|
||||||
public = true;
|
|
||||||
lan = true;
|
|
||||||
openFirewall = true;
|
|
||||||
admins = [ "lelgenio" ];
|
|
||||||
extraSettingsFile = config.age.secrets.factorio-settings.path;
|
|
||||||
};
|
|
||||||
|
|
||||||
age.secrets.factorio-settings = {
|
|
||||||
file = ../../secrets/factorio-settings.age;
|
|
||||||
mode = "777";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
{ 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";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
inputs.vpsadminos.nixosConfigurations.container
|
./vpsadminos.nix
|
||||||
inputs.agenix.nixosModules.default
|
inputs.agenix.nixosModules.default
|
||||||
../../system/nix.nix
|
../../system/nix.nix
|
||||||
./hardware-config.nix
|
./hardware-config.nix
|
||||||
|
|
@ -18,9 +18,6 @@
|
||||||
./writefreely.nix
|
./writefreely.nix
|
||||||
./email.nix
|
./email.nix
|
||||||
./forgejo.nix
|
./forgejo.nix
|
||||||
./invidious.nix
|
|
||||||
./davi.nix
|
|
||||||
./goofs.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "phantom";
|
networking.hostName = "phantom";
|
||||||
|
|
@ -56,23 +53,6 @@
|
||||||
identityPaths = [ "/root/.ssh/id_rsa" ];
|
identityPaths = [ "/root/.ssh/id_rsa" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
virtualisation.docker = {
|
|
||||||
enable = true;
|
|
||||||
daemon.settings = {
|
|
||||||
# needed by bitbucket runner ???
|
|
||||||
log-driver = "json-file";
|
|
||||||
log-opts = {
|
|
||||||
max-size = "10m";
|
|
||||||
max-file = "3";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
nix.settings = {
|
|
||||||
cores = 1;
|
|
||||||
max-jobs = 1;
|
|
||||||
};
|
|
||||||
|
|
||||||
system.autoUpgrade = {
|
system.autoUpgrade = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dates = "04:40";
|
dates = "04:40";
|
||||||
|
|
@ -81,7 +61,7 @@
|
||||||
"--update-input"
|
"--update-input"
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
"--no-write-lock-file"
|
"--no-write-lock-file"
|
||||||
"--print-build-logs"
|
"-L"
|
||||||
];
|
];
|
||||||
flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
|
flake = "git+https://git.lelgenio.com/lelgenio/nixos-config#phantom";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,9 @@ 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}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -27,9 +30,6 @@ in
|
||||||
ENABLED = true;
|
ENABLED = true;
|
||||||
DEFAULT_ACTIONS_URL = "github";
|
DEFAULT_ACTIONS_URL = "github";
|
||||||
};
|
};
|
||||||
repository = {
|
|
||||||
ENABLE_PUSH_CREATE_USER = true;
|
|
||||||
};
|
|
||||||
server = {
|
server = {
|
||||||
DOMAIN = "git.lelgenio.com";
|
DOMAIN = "git.lelgenio.com";
|
||||||
HTTP_PORT = 3000;
|
HTTP_PORT = 3000;
|
||||||
|
|
@ -37,7 +37,7 @@ in
|
||||||
};
|
};
|
||||||
mailer = {
|
mailer = {
|
||||||
ENABLED = true;
|
ENABLED = true;
|
||||||
SMTP_ADDR = "lelgenio.com";
|
SMTP_ADDR = "mail.lelgenio.com";
|
||||||
FROM = "noreply@git.lelgenio.com";
|
FROM = "noreply@git.lelgenio.com";
|
||||||
USER = "noreply@git.lelgenio.com";
|
USER = "noreply@git.lelgenio.com";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
{ inputs, config, ... }:
|
|
||||||
{
|
|
||||||
imports = [
|
|
||||||
inputs.warthunder-leak-counter.nixosModules.default
|
|
||||||
inputs.made-you-look.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}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.made-you-look.enable = true;
|
|
||||||
services.nginx.virtualHosts."coolest-thing-ever.lelgenio.com" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
locations."/" = {
|
|
||||||
proxyPass = "http://127.0.0.1:${toString config.services.made-you-look.port}";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nginx.virtualHosts."catboy-spinner.lelgenio.com" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
root = inputs.catboy-spinner;
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."tomater.lelgenio.com" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
root = inputs.tomater;
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."youre-wrong.lelgenio.com" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
root = inputs.youre-wrong;
|
|
||||||
};
|
|
||||||
services.nginx.virtualHosts."hello-fonts.lelgenio.com" = {
|
|
||||||
enableACME = true;
|
|
||||||
forceSSL = true;
|
|
||||||
root = inputs.hello-fonts;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -5,12 +5,6 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
fileSystems."/var/lib/syncthing-data" = {
|
|
||||||
device = "172.16.130.7:/nas/5749/syncthinng_data";
|
|
||||||
fsType = "nfs";
|
|
||||||
options = [ "nofail" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [
|
swapDevices = [
|
||||||
{
|
{
|
||||||
device = "/swap/swapfile";
|
device = "/swap/swapfile";
|
||||||
|
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
{
|
|
||||||
inputs,
|
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
# Replace with unstable, since 24.05 does not have sig-helper
|
|
||||||
disabledModules = [ "services/web-apps/invidious.nix" ];
|
|
||||||
imports = [ (inputs.nixpkgs-unstable + "/nixos/modules/services/web-apps/invidious.nix") ];
|
|
||||||
|
|
||||||
services.invidious = {
|
|
||||||
enable = true;
|
|
||||||
domain = "invidious.lelgenio.com";
|
|
||||||
nginx.enable = true;
|
|
||||||
port = 10601;
|
|
||||||
http3-ytproxy.enable = true;
|
|
||||||
sig-helper = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.unstable.inv-sig-helper;
|
|
||||||
};
|
|
||||||
# {
|
|
||||||
# "visitor_data": "...",
|
|
||||||
# "po_token": "..."
|
|
||||||
# }
|
|
||||||
extraSettingsFile = config.age.secrets.phantom-invidious-settings.path;
|
|
||||||
settings = {
|
|
||||||
force_resolve = "ipv6";
|
|
||||||
db = {
|
|
||||||
user = "invidious";
|
|
||||||
dbname = "invidious";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
age.secrets.phantom-invidious-settings = {
|
|
||||||
file = ../../secrets/phantom-invidious-settings.age;
|
|
||||||
mode = "666";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
};
|
};
|
||||||
streamingProcesses = 2;
|
streamingProcesses = 2;
|
||||||
extraConfig.SINGLE_USER_MODE = "true";
|
extraConfig.SINGLE_USER_MODE = "true";
|
||||||
mediaAutoRemove.olderThanDays = 5;
|
mediaAutoRemove.olderThanDays = 10;
|
||||||
};
|
};
|
||||||
|
|
||||||
age.secrets.phantom-mastodon-mailer-password = {
|
age.secrets.phantom-mastodon-mailer-password = {
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,6 @@
|
||||||
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,7 +40,6 @@
|
||||||
];
|
];
|
||||||
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;
|
||||||
|
|
|
||||||
76
hosts/phantom/vpsadminos.nix
Normal file
76
hosts/phantom/vpsadminos.nix
Normal file
|
|
@ -0,0 +1,76 @@
|
||||||
|
# This file provides compatibility for NixOS to run in a container on vpsAdminOS
|
||||||
|
# hosts.
|
||||||
|
#
|
||||||
|
# If you're experiencing issues, try updating this file to the latest version
|
||||||
|
# from vpsAdminOS repository:
|
||||||
|
#
|
||||||
|
# https://github.com/vpsfreecz/vpsadminos/blob/staging/os/lib/nixos-container/vpsadminos.nix
|
||||||
|
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib;
|
||||||
|
let
|
||||||
|
nameservers = [
|
||||||
|
"1.1.1.1"
|
||||||
|
"2606:4700:4700::1111"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
{
|
||||||
|
networking.nameservers = mkDefault nameservers;
|
||||||
|
services.resolved = mkDefault { fallbackDns = nameservers; };
|
||||||
|
networking.dhcpcd.extraConfig = "noipv4ll";
|
||||||
|
|
||||||
|
systemd.services.systemd-sysctl.enable = false;
|
||||||
|
systemd.services.systemd-oomd.enable = false;
|
||||||
|
systemd.sockets."systemd-journald-audit".enable = false;
|
||||||
|
systemd.mounts = [
|
||||||
|
{
|
||||||
|
where = "/sys/kernel/debug";
|
||||||
|
enable = false;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
systemd.services.rpc-gssd.enable = false;
|
||||||
|
|
||||||
|
# Due to our restrictions in /sys, the default systemd-udev-trigger fails
|
||||||
|
# on accessing PCI devices, etc. Override it to match only network devices.
|
||||||
|
# In addition, boot.isContainer prevents systemd-udev-trigger.service from
|
||||||
|
# being enabled at all, so add it explicitly.
|
||||||
|
systemd.additionalUpstreamSystemUnits = [ "systemd-udev-trigger.service" ];
|
||||||
|
systemd.services.systemd-udev-trigger.serviceConfig.ExecStart = [
|
||||||
|
""
|
||||||
|
"-udevadm trigger --subsystem-match=net --action=add"
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.isContainer = true;
|
||||||
|
boot.enableContainers = mkDefault true;
|
||||||
|
boot.loader.initScript.enable = true;
|
||||||
|
boot.specialFileSystems."/run/keys".fsType = mkForce "tmpfs";
|
||||||
|
boot.systemdExecutable = mkDefault "/run/current-system/systemd/lib/systemd/systemd systemd.unified_cgroup_hierarchy=0";
|
||||||
|
|
||||||
|
# Overrides for <nixpkgs/nixos/modules/virtualisation/container-config.nix>
|
||||||
|
documentation.enable = mkOverride 500 true;
|
||||||
|
documentation.nixos.enable = mkOverride 500 true;
|
||||||
|
networking.useHostResolvConf = mkOverride 500 false;
|
||||||
|
services.openssh.startWhenNeeded = mkOverride 500 false;
|
||||||
|
|
||||||
|
# Bring up the network, /ifcfg.{add,del} are supplied by the vpsAdminOS host
|
||||||
|
systemd.services.networking-setup = {
|
||||||
|
description = "Load network configuration provided by the vpsAdminOS host";
|
||||||
|
before = [ "network.target" ];
|
||||||
|
wantedBy = [ "network.target" ];
|
||||||
|
after = [ "network-pre.target" ];
|
||||||
|
path = [ pkgs.iproute2 ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
RemainAfterExit = true;
|
||||||
|
ExecStart = "${pkgs.bash}/bin/bash /ifcfg.add";
|
||||||
|
ExecStop = "${pkgs.bash}/bin/bash /ifcfg.del";
|
||||||
|
};
|
||||||
|
unitConfig.ConditionPathExists = "/ifcfg.add";
|
||||||
|
restartIfChanged = false;
|
||||||
|
};
|
||||||
|
}
|
||||||
85
hosts/rainbow/default.nix
Normal file
85
hosts/rainbow/default.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
||||||
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
|
# and may be overwritten by future invocations. Please make changes
|
||||||
|
# to /etc/nixos/configuration.nix instead.
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
btrfs_options = [
|
||||||
|
"compress=zstd:3"
|
||||||
|
"noatime"
|
||||||
|
"x-systemd.device-timeout=0"
|
||||||
|
];
|
||||||
|
btrfs_ssd = [
|
||||||
|
"ssd"
|
||||||
|
"discard=async"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
{
|
||||||
|
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [
|
||||||
|
"xhci_pci"
|
||||||
|
"ahci"
|
||||||
|
"usb_storage"
|
||||||
|
"usbhid"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
|
boot.initrd.kernelModules = [ "i915" ];
|
||||||
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=@nixos" ] ++ btrfs_options ++ btrfs_ssd;
|
||||||
|
};
|
||||||
|
|
||||||
|
boot.initrd.luks.devices = {
|
||||||
|
"main" = {
|
||||||
|
bypassWorkqueues = true;
|
||||||
|
device = "/dev/disk/by-label/CRYPT_ROOT";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
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-uuid/DC3B-5753";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/swap" = {
|
||||||
|
device = "/dev/disk/by-label/BTRFS_ROOT";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = [ "subvol=@swap" ] ++ btrfs_ssd;
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{
|
||||||
|
device = "/swap/swapfile";
|
||||||
|
size = (1024 * 8);
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
||||||
|
networking.hostName = "rainbow"; # Define your hostname.
|
||||||
|
}
|
||||||
|
|
@ -2,7 +2,6 @@
|
||||||
rec {
|
rec {
|
||||||
all = [
|
all = [
|
||||||
scripts
|
scripts
|
||||||
unstable
|
|
||||||
themes
|
themes
|
||||||
new-packages
|
new-packages
|
||||||
patches
|
patches
|
||||||
|
|
@ -12,10 +11,6 @@ rec {
|
||||||
|
|
||||||
scripts = (import ../scripts);
|
scripts = (import ../scripts);
|
||||||
|
|
||||||
unstable = final: prev: {
|
|
||||||
unstable = import inputs.nixpkgs-unstable { inherit (final) system config; };
|
|
||||||
};
|
|
||||||
|
|
||||||
themes = (
|
themes = (
|
||||||
final: prev: {
|
final: prev: {
|
||||||
papirus_red = (final.papirus-icon-theme.override { color = "red"; });
|
papirus_red = (final.papirus-icon-theme.override { color = "red"; });
|
||||||
|
|
@ -53,8 +48,6 @@ 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 ];
|
||||||
});
|
});
|
||||||
|
|
|
||||||
64
pkgs/blade-formatter/default.nix
Normal file
64
pkgs/blade-formatter/default.nix
Normal file
|
|
@ -0,0 +1,64 @@
|
||||||
|
{
|
||||||
|
lib,
|
||||||
|
mkYarnPackage,
|
||||||
|
fetchFromGitHub,
|
||||||
|
fetchYarnDeps,
|
||||||
|
testers,
|
||||||
|
writeText,
|
||||||
|
runCommand,
|
||||||
|
blade-formatter,
|
||||||
|
}:
|
||||||
|
|
||||||
|
mkYarnPackage rec {
|
||||||
|
pname = "blade-formatter";
|
||||||
|
version = "1.38.2";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "shufo";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
hash = "sha256-JvILLw7Yp4g/dSsYtZ2ylmlXfS9t+2KADlBrYOJWTpg=";
|
||||||
|
};
|
||||||
|
|
||||||
|
packageJSON = ./package.json;
|
||||||
|
offlineCache = fetchYarnDeps {
|
||||||
|
yarnLock = "${src}/yarn.lock";
|
||||||
|
hash = "sha256-UFDxw3fYMzSUhZw+TCEh/dN7OioKI75LzKSnEwGPKDA=";
|
||||||
|
};
|
||||||
|
|
||||||
|
postBuild = "yarn build";
|
||||||
|
|
||||||
|
passthru.tests = {
|
||||||
|
version = testers.testVersion {
|
||||||
|
package = blade-formatter;
|
||||||
|
command = "blade-formatter --version";
|
||||||
|
};
|
||||||
|
|
||||||
|
simple = testers.testEqualContents {
|
||||||
|
assertion = "blade-formatter formats a basic blade file";
|
||||||
|
expected = writeText "expected" ''
|
||||||
|
@if (true)
|
||||||
|
Hello world!
|
||||||
|
@endif
|
||||||
|
'';
|
||||||
|
actual =
|
||||||
|
runCommand "actual"
|
||||||
|
{
|
||||||
|
nativeBuildInputs = [ blade-formatter ];
|
||||||
|
base = writeText "base" ''
|
||||||
|
@if( true ) Hello world! @endif
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
''
|
||||||
|
blade-formatter $base > $out
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Laravel Blade template formatter";
|
||||||
|
homepage = "https://github.com/shufo/blade-formatter";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ lelgenio ];
|
||||||
|
};
|
||||||
|
}
|
||||||
120
pkgs/blade-formatter/package.json
Executable file
120
pkgs/blade-formatter/package.json
Executable file
|
|
@ -0,0 +1,120 @@
|
||||||
|
{
|
||||||
|
"name": "blade-formatter",
|
||||||
|
"engines": {
|
||||||
|
"node": ">= 14.0.0"
|
||||||
|
},
|
||||||
|
"keywords": [
|
||||||
|
"php",
|
||||||
|
"formatter",
|
||||||
|
"laravel"
|
||||||
|
],
|
||||||
|
"version": "1.38.2",
|
||||||
|
"description": "An opinionated blade template formatter for Laravel",
|
||||||
|
"main": "./dist/bundle.cjs",
|
||||||
|
"types": "./dist/types/main.d.ts",
|
||||||
|
"type": "module",
|
||||||
|
"exports": {
|
||||||
|
".": {
|
||||||
|
"import": "./dist/bundle.js",
|
||||||
|
"require": "./dist/bundle.cjs",
|
||||||
|
"default": "./dist/bundle.js"
|
||||||
|
},
|
||||||
|
"./*": "./*"
|
||||||
|
},
|
||||||
|
"scripts": {
|
||||||
|
"build": "cross-env NODE_ENV=production node esbuild.js && cross-env NODE_ENV=production ESM_BUILD=true node esbuild.js",
|
||||||
|
"prepublish": "tsc src/main.ts --declaration --emitDeclarationOnly --outDir ./dist/types || true",
|
||||||
|
"watch": "node esbuild.js",
|
||||||
|
"test": "yarn run build && node --experimental-vm-modules node_modules/.bin/jest",
|
||||||
|
"lint": "eslint src -c .eslintrc.json --ext ts",
|
||||||
|
"fix": "prettier {src,__tests__}/**/*.ts --write",
|
||||||
|
"check_formatted": "prettier **/*.ts -c",
|
||||||
|
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
|
||||||
|
"prepare": "husky install",
|
||||||
|
"bin": "cross-env ./bin/blade-formatter.cjs"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"blade-formatter": "bin/blade-formatter.cjs"
|
||||||
|
},
|
||||||
|
"author": "Shuhei Hayashibara",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@prettier/plugin-php": "^0.19.7",
|
||||||
|
"@shufo/tailwindcss-class-sorter": "3.0.1",
|
||||||
|
"aigle": "^1.14.1",
|
||||||
|
"ajv": "^8.9.0",
|
||||||
|
"chalk": "^4.1.0",
|
||||||
|
"concat-stream": "^2.0.0",
|
||||||
|
"detect-indent": "^6.0.0",
|
||||||
|
"find-config": "^1.0.0",
|
||||||
|
"glob": "^8.0.1",
|
||||||
|
"html-attribute-sorter": "^0.4.3",
|
||||||
|
"ignore": "^5.1.8",
|
||||||
|
"js-beautify": "^1.14.8",
|
||||||
|
"lodash": "^4.17.19",
|
||||||
|
"php-parser": "3.1.5",
|
||||||
|
"prettier": "^2.2.0",
|
||||||
|
"tailwindcss": "^3.1.8",
|
||||||
|
"vscode-oniguruma": "1.7.0",
|
||||||
|
"vscode-textmate": "^7.0.1",
|
||||||
|
"xregexp": "^5.0.1",
|
||||||
|
"yargs": "^17.3.1"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@babel/core": "^7.6.4",
|
||||||
|
"@babel/plugin-transform-modules-commonjs": "^7.16.5",
|
||||||
|
"@babel/preset-env": "^7.13.12",
|
||||||
|
"@babel/preset-typescript": "^7.16.5",
|
||||||
|
"@types/concat-stream": "^2.0.0",
|
||||||
|
"@types/find-config": "^1.0.1",
|
||||||
|
"@types/fs-extra": "^11.0.0",
|
||||||
|
"@types/glob": "^8.0.0",
|
||||||
|
"@types/jest": "^29.0.0",
|
||||||
|
"@types/js-beautify": "^1.13.3",
|
||||||
|
"@types/lodash": "^4.14.178",
|
||||||
|
"@types/mocha": "^10.0.0",
|
||||||
|
"@types/node": "^18.0.0",
|
||||||
|
"@types/xregexp": "^4.4.0",
|
||||||
|
"@typescript-eslint/eslint-plugin": "^5.8.1",
|
||||||
|
"@typescript-eslint/parser": "^5.8.1",
|
||||||
|
"app-root-path": "^3.0.0",
|
||||||
|
"babel-jest": "^29.0.0",
|
||||||
|
"codecov": "^3.8.3",
|
||||||
|
"cross-env": "^7.0.3",
|
||||||
|
"esbuild": "^0.19.0",
|
||||||
|
"esbuild-node-externals": "^1.4.1",
|
||||||
|
"eslint": "^8.5.0",
|
||||||
|
"eslint-config-airbnb-base": "^15.0.0",
|
||||||
|
"eslint-config-airbnb-typescript": "^17.0.0",
|
||||||
|
"eslint-config-prettier": "^9.0.0",
|
||||||
|
"eslint-import-resolver-typescript": "^3.0.0",
|
||||||
|
"eslint-plugin-import": "^2.25.3",
|
||||||
|
"eslint-plugin-jest": "^26.0.0",
|
||||||
|
"eslint-plugin-prettier": "^5.0.0",
|
||||||
|
"fs-extra": "^11.0.0",
|
||||||
|
"husky": "^8.0.0",
|
||||||
|
"jest": "^29.0.0",
|
||||||
|
"lint-staged": ">=10",
|
||||||
|
"source-map-loader": "^4.0.0",
|
||||||
|
"ts-jest": "^29.0.0",
|
||||||
|
"ts-loader": "^9.2.6",
|
||||||
|
"ts-migrate": "^0.1.27",
|
||||||
|
"ts-node": "^10.4.0",
|
||||||
|
"typescript": "^5.0.0"
|
||||||
|
},
|
||||||
|
"repository": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/shufo/blade-formatter.git"
|
||||||
|
},
|
||||||
|
"files": [
|
||||||
|
"dist",
|
||||||
|
"src",
|
||||||
|
"bin",
|
||||||
|
"wasm",
|
||||||
|
"syntaxes",
|
||||||
|
"CHANGELOG.md"
|
||||||
|
],
|
||||||
|
"lint-staged": {
|
||||||
|
"*.ts": "yarn run fix"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -2,13 +2,10 @@
|
||||||
# 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 { };
|
||||||
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 { };
|
|
||||||
factorio-headless = pkgs.callPackage ./factorio-headless {
|
|
||||||
inherit (pkgs.unstable) factorio-headless;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
{ factorio-headless, pkgs }:
|
|
||||||
|
|
||||||
factorio-headless.overrideAttrs (_: rec {
|
|
||||||
version = "2.0.13";
|
|
||||||
src = pkgs.fetchurl {
|
|
||||||
name = "factorio_headless_x64-${version}.tar.xz";
|
|
||||||
url = "https://www.factorio.com/get-download/${version}/headless/linux64";
|
|
||||||
hash = "sha256-J7NpAaOeWTrfKEGMAoYULGx6n4PRVpY8c2m9QFolx9E=";
|
|
||||||
};
|
|
||||||
})
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -xe
|
|
||||||
|
|
||||||
cd "$(dirname $0)"
|
|
||||||
|
|
||||||
current_version="$(rg '^.*?version\s*=\s*"(.+)".*?$' --replace '$1' ./default.nix)"
|
|
||||||
current_hash="$(rg '^.*?hash\s*=\s*"(.+)".*?$' --replace '$1' ./default.nix)"
|
|
||||||
|
|
||||||
new_version="$(curl https://factorio.com/api/latest-releases | jq -r .stable.headless)"
|
|
||||||
new_hash="$(nix-hash --to-sri --type sha256 $(nix-prefetch-url --type sha256 https://www.factorio.com/get-download/${new_version}/headless/linux64))"
|
|
||||||
|
|
||||||
sd "$current_version" "$new_version" ./default.nix
|
|
||||||
sd "$current_hash" "$new_hash" ./default.nix
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
{
|
|
||||||
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"
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
0
scripts/_diffr
Executable file → Normal file
0
scripts/_diffr
Executable file → Normal file
0
scripts/_sway_idle_toggle
Executable file → Normal file
0
scripts/_sway_idle_toggle
Executable file → Normal file
|
|
@ -1,50 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
DEVICE="$1" # eg: /sys/class/drm/card1/device
|
|
||||||
HWMON=$(echo "$DEVICE"/hwmon/hwmon*)
|
|
||||||
|
|
||||||
exit() {
|
|
||||||
echo "Setting controll to auto" >&2
|
|
||||||
echo 2 > "$HWMON/pwm1_enable"
|
|
||||||
}
|
|
||||||
|
|
||||||
trap exit EXIT INT
|
|
||||||
|
|
||||||
bail() {
|
|
||||||
echo "Error: $@" >&2
|
|
||||||
echo "Exiting..." >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
if ! [ -d $HWMON ]; then
|
|
||||||
bail "Invalid HWMON"
|
|
||||||
fi
|
|
||||||
|
|
||||||
TEMP_INPUT="$HWMON/temp2_input"
|
|
||||||
|
|
||||||
if ! [ -f $TEMP_INPUT ]; then
|
|
||||||
bail "Invalid TEMP_INPUT"
|
|
||||||
fi
|
|
||||||
|
|
||||||
MIN="$2"
|
|
||||||
MAX="$3"
|
|
||||||
|
|
||||||
echo "Running..." >&2
|
|
||||||
while true; do
|
|
||||||
TEMPERATURE_RAW=$(cat "$TEMP_INPUT")
|
|
||||||
TEMPERATURE="$(( $TEMPERATURE_RAW / 1000 ))"
|
|
||||||
# Remap from a number between 60_000..90_000 to 0..255
|
|
||||||
PWM=$(( ($TEMPERATURE - $MIN) * 255 / ($MAX - $MIN) ))
|
|
||||||
|
|
||||||
if [ "$PWM" -gt 255 ]; then
|
|
||||||
PWM=255
|
|
||||||
elif [ "$PWM" -lt 0 ]; then
|
|
||||||
PWM=0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo 1 > "$HWMON/pwm1_enable"
|
|
||||||
echo "$PWM" > "$HWMON/pwm1"
|
|
||||||
sleep .1s
|
|
||||||
done
|
|
||||||
26
scripts/auto_connect_gamepad
Executable file
26
scripts/auto_connect_gamepad
Executable file
|
|
@ -0,0 +1,26 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
list_paired_controllers() {
|
||||||
|
bluetoothctl devices Paired | grep -i 'controller' | cut -d' ' -f2
|
||||||
|
}
|
||||||
|
|
||||||
|
count_connected_controllers() {
|
||||||
|
bluetoothctl devices Connected | grep -i 'controller' | wc -l
|
||||||
|
}
|
||||||
|
|
||||||
|
try_to_connect_to_all_controllers() {
|
||||||
|
list_paired_controllers | while read paired_controller; do
|
||||||
|
echo "Trying to connect to controller $paired_controller"
|
||||||
|
bluetoothctl connect "$paired_controller"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
while true; do
|
||||||
|
echo "looping"
|
||||||
|
if test "$(count_connected_controllers)" -ne 0 ; then
|
||||||
|
echo "there is a controller connected, not attempting to connect to any other"
|
||||||
|
sleep 10s
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
try_to_connect_to_all_controllers
|
||||||
|
done
|
||||||
0
scripts/bmenu
Executable file → Normal file
0
scripts/bmenu
Executable file → Normal file
0
scripts/br
Executable file → Normal file
0
scripts/br
Executable file → Normal file
|
|
@ -1,38 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
CONTROLLER=$(find /sys/class/power_supply -maxdepth 1 -name '*controller*' || true)
|
|
||||||
|
|
||||||
if test -z "$CONTROLLER"; then
|
|
||||||
echo
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
CAPACITY=$(cat "$CONTROLLER/capacity")
|
|
||||||
|
|
||||||
echo -n ''
|
|
||||||
|
|
||||||
if test "$CAPACITY" -ge 90; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 90; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 80; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 70; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 60; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 50; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 40; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 30; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 20; then
|
|
||||||
echo ''
|
|
||||||
elif test "$CAPACITY" -ge 10; then
|
|
||||||
echo ''
|
|
||||||
else
|
|
||||||
echo ''
|
|
||||||
fi
|
|
||||||
|
|
@ -1,33 +1,34 @@
|
||||||
(
|
(
|
||||||
final: prev:
|
final: prev:
|
||||||
|
with prev;
|
||||||
let
|
let
|
||||||
lib = prev.lib;
|
import_script = (_: path: import (path) { inherit pkgs lib; });
|
||||||
|
create_script = (
|
||||||
importScript = (_: path: import (path) { inherit (final) pkgs lib; });
|
|
||||||
wrapScript =
|
|
||||||
name: text: runtimeInputs:
|
name: text: runtimeInputs:
|
||||||
final.runCommand name
|
let
|
||||||
{
|
script_body = pkgs.writeTextFile {
|
||||||
nativeBuildInputs = [ final.makeWrapper ];
|
inherit name;
|
||||||
meta.mainProgram = name;
|
executable = true;
|
||||||
}
|
text = ''
|
||||||
''
|
${builtins.readFile text}
|
||||||
mkdir -p $out/bin
|
'';
|
||||||
cp ${text} $out/bin/${name}
|
};
|
||||||
wrapProgram $out/bin/${name} \
|
in
|
||||||
--suffix PATH : ${lib.makeBinPath runtimeInputs}
|
(pkgs.writeShellApplication {
|
||||||
'';
|
inherit name runtimeInputs;
|
||||||
createScripts = lib.mapAttrs (name: deps: wrapScript name ./${name} deps);
|
text = ''exec ${script_body} "$@"'';
|
||||||
|
checkPhase = "";
|
||||||
|
})
|
||||||
|
);
|
||||||
|
create_scripts = lib.mapAttrs (name: deps: create_script name ./${name} deps);
|
||||||
|
|
||||||
myPass = final.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
pass = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
||||||
in
|
in
|
||||||
with final;
|
create_scripts {
|
||||||
createScripts {
|
|
||||||
amd-fan-control = [ bash ];
|
|
||||||
br = [ ];
|
br = [ ];
|
||||||
bmenu = [
|
bmenu = [
|
||||||
bemenu
|
final.bemenu
|
||||||
dhist
|
final.dhist
|
||||||
fish
|
fish
|
||||||
j4-dmenu-desktop
|
j4-dmenu-desktop
|
||||||
jq
|
jq
|
||||||
|
|
@ -43,21 +44,21 @@
|
||||||
fish
|
fish
|
||||||
];
|
];
|
||||||
_diffr = [ diffr ];
|
_diffr = [ diffr ];
|
||||||
_thunar-terminal = [ terminal ];
|
_thunar-terminal = [ final.terminal ];
|
||||||
_sway_idle_toggle = [ swayidle ];
|
_sway_idle_toggle = [ final.swayidle ];
|
||||||
kak-pager = [
|
kak-pager = [
|
||||||
fish
|
fish
|
||||||
_diffr
|
final._diffr
|
||||||
];
|
];
|
||||||
kak-man-pager = [ kak-pager ];
|
kak-man-pager = [ final.kak-pager ];
|
||||||
helix-pager = [
|
helix-pager = [
|
||||||
fish
|
fish
|
||||||
_diffr
|
final._diffr
|
||||||
];
|
];
|
||||||
helix-man-pager = [ helix-pager ];
|
helix-man-pager = [ final.helix-pager ];
|
||||||
musmenu = [
|
musmenu = [
|
||||||
mpc-cli
|
mpc-cli
|
||||||
wdmenu
|
final.wdmenu
|
||||||
trash-cli
|
trash-cli
|
||||||
xdg-user-dirs
|
xdg-user-dirs
|
||||||
libnotify
|
libnotify
|
||||||
|
|
@ -70,12 +71,11 @@
|
||||||
pass-export = [
|
pass-export = [
|
||||||
pass2csv
|
pass2csv
|
||||||
gnupg
|
gnupg
|
||||||
sd
|
|
||||||
];
|
];
|
||||||
wpass = [
|
wpass = [
|
||||||
wdmenu
|
final.wdmenu
|
||||||
fd
|
fd
|
||||||
myPass
|
pass
|
||||||
sd
|
sd
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
wtype
|
wtype
|
||||||
|
|
@ -96,7 +96,7 @@
|
||||||
pulse_sink = [
|
pulse_sink = [
|
||||||
pulseaudio
|
pulseaudio
|
||||||
pamixer
|
pamixer
|
||||||
wdmenu
|
final.wdmenu
|
||||||
];
|
];
|
||||||
color_picker = [
|
color_picker = [
|
||||||
grim
|
grim
|
||||||
|
|
@ -108,13 +108,13 @@
|
||||||
dzadd = [
|
dzadd = [
|
||||||
procps
|
procps
|
||||||
libnotify
|
libnotify
|
||||||
wdmenu
|
final.wdmenu
|
||||||
jq
|
jq
|
||||||
mpv
|
mpv
|
||||||
pqiv
|
pqiv
|
||||||
python3Packages.deemix
|
python3Packages.deemix
|
||||||
mpc-cli
|
mpc-cli
|
||||||
mpdDup
|
final.mpdDup
|
||||||
];
|
];
|
||||||
mpdDup = [
|
mpdDup = [
|
||||||
mpc-cli
|
mpc-cli
|
||||||
|
|
@ -125,16 +125,14 @@
|
||||||
zbar
|
zbar
|
||||||
wl-clipboard
|
wl-clipboard
|
||||||
];
|
];
|
||||||
pint-fmt = [ ];
|
auto_connect_gamepad = [
|
||||||
powerplay-led-idle = [
|
bluez
|
||||||
bash
|
coreutils
|
||||||
libinput
|
gnugrep
|
||||||
libratbag
|
|
||||||
];
|
];
|
||||||
vrr-fullscreen = [ ];
|
vrr-fullscreen = [ ];
|
||||||
controller-battery = [ ];
|
|
||||||
}
|
}
|
||||||
// lib.mapAttrs importScript {
|
// lib.mapAttrs import_script {
|
||||||
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
Executable file → Normal file
0
scripts/helix-pager
Executable file → Normal file
0
scripts/kak-pager
Executable file → Normal file
0
scripts/kak-pager
Executable file → Normal file
|
|
@ -8,6 +8,3 @@ 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"
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
file="$(mktemp)"
|
|
||||||
cat - >"$file"
|
|
||||||
./vendor/bin/pint --quiet "$file"
|
|
||||||
cat "$file"
|
|
||||||
rm "$file"
|
|
||||||
0
scripts/playerctl-status
Executable file → Normal file
0
scripts/playerctl-status
Executable file → Normal file
|
|
@ -1,79 +0,0 @@
|
||||||
#!/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
Executable file → Normal file
0
scripts/pulse_sink
Executable file → Normal file
0
scripts/screenshotsh
Executable file → Normal file
0
scripts/screenshotsh
Executable file → Normal file
0
scripts/showkeys
Executable file → Normal file
0
scripts/showkeys
Executable file → Normal file
0
scripts/terminal
Executable file → Normal file
0
scripts/terminal
Executable file → Normal file
0
scripts/wl-copy-file
Executable file → Normal file
0
scripts/wl-copy-file
Executable file → Normal file
0
scripts/wpass
Executable file → Normal file
0
scripts/wpass
Executable file → Normal file
Binary file not shown.
Binary file not shown.
|
|
@ -1,16 +0,0 @@
|
||||||
age-encryption.org/v1
|
|
||||||
-> ssh-rsa BwwxHg
|
|
||||||
iTcgtxF1IxopbtF+aw7V8IQfH7tWiMk9lE/eWlVHVjeaRvER5W6Y3xZNOFCjtbqY
|
|
||||||
VwEyV6ibfZ4GJt1jRu2icEH/AnLUJFFGQnxu/K/rtoZ3tqSIk9WCBv3aPo4oZRiU
|
|
||||||
uaaxi2gD8qo1RLyl/Ij7Djw4i/isUOO1EON5sgx1d39k6qUD4Mak0DSU4EtGdTsr
|
|
||||||
OaxDAc0kAxhxZQOUH/QlKa0HLonaFcy1LHqvttOcw3UZuZnaYfZiPlcqe3USS9cm
|
|
||||||
96aIC5cS9pHr4JFrqRYvfpla2TY5jlCB/xBGw3KjGEIQoBPXSsJZA6BCMZyp00++
|
|
||||||
tdfS2aomt9HFmb1wZDS0jWAxkVF6nXXBbolFVih+58h0nYLljtHIQ3SizRoXY459
|
|
||||||
x3JE9NReHp2OO3SlIeO03Kv8YMBvj7nSSd1C1PMpu+hJ/eCXi1WQxD6QY+40muk6
|
|
||||||
KhqE3PZ8BCY2b+VpywUF5gVH28mo3jscqAzhf2dZ3SQlzldI+hFyKPxTdAqkfUOH
|
|
||||||
|
|
||||||
--- cinb+wzjVfTkpfm1CtFIFaepwoQVCj1MquB5rAC45Ew
|
|
||||||
¾
|
|
||||||
6
|
|
||||||
ZCþHS 0 7ïº ÖóýE¼X* Àq b=üOßí ÛÉwu¥¤³Pºþ¹ Ùçǖѳ/£ómv òÞ×Ë2VœÄ«
|
|
||||||
ÁŠxvç[“£‚µ£±”Ì‚A~ evdÓåÙ0¢ Œni³1Ò›¹Qý„"í@Ù¹§ÞÔ{KpÐ:åϵuµsÊÎBñò(X…r[ ÂQVg¢Tš¤°ðœîËï@Ä*ÇõÿíB «<>.§¯žhE鲟èÐë’÷½¥Žûzlz|kã`l8‘´8¼M›cch<63>îáZ`ƒ ?yeoƒ+ÈM-:/–À**ìè¦Ê cŸÎZD¡2Ñá¼é&·÷¾Ç¢ ¹£e¤ï*Hnç"Þ~+|ua(û6óËJ
|
|
||||||
Binary file not shown.
|
|
@ -12,11 +12,9 @@ in
|
||||||
"monolith-forgejo-runner-token.age".publicKeys = [ main_ssh_public_key ];
|
"monolith-forgejo-runner-token.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ];
|
"lelgenio-cachix.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"monolith-nix-serve-privkey.age".publicKeys = [ main_ssh_public_key ];
|
"monolith-nix-serve-privkey.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"factorio-settings.age".publicKeys = [ main_ssh_public_key ];
|
|
||||||
"phantom-nextcloud.age".publicKeys = [ main_ssh_public_key ];
|
"phantom-nextcloud.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"phantom-writefreely.age".publicKeys = [ main_ssh_public_key ];
|
"phantom-writefreely.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"phantom-renawiki.age".publicKeys = [ main_ssh_public_key ];
|
"phantom-renawiki.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"phantom-forgejo-mailer-password.age".publicKeys = [ main_ssh_public_key ];
|
"phantom-forgejo-mailer-password.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"phantom-mastodon-mailer-password.age".publicKeys = [ main_ssh_public_key ];
|
"phantom-mastodon-mailer-password.age".publicKeys = [ main_ssh_public_key ];
|
||||||
"phantom-invidious-settings.age".publicKeys = [ main_ssh_public_key ];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
7
switch
7
switch
|
|
@ -4,9 +4,10 @@ nix fmt
|
||||||
|
|
||||||
git --no-pager diff
|
git --no-pager diff
|
||||||
|
|
||||||
nixos-rebuild \
|
sudo nice ionice \
|
||||||
|
nixos-rebuild \
|
||||||
switch \
|
switch \
|
||||||
--use-remote-sudo \
|
--verbose \
|
||||||
--print-build-logs \
|
--print-build-logs \
|
||||||
--flake .# \
|
--flake .# \
|
||||||
"$@"
|
$@
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
settings = {
|
settings = {
|
||||||
General = {
|
General = {
|
||||||
DiscoverableTimeout = 0;
|
DiscoverableTimeout = 0;
|
||||||
Discoverable = true;
|
# Discoverable = true;
|
||||||
AlwaysPairable = true;
|
AlwaysPairable = true;
|
||||||
};
|
};
|
||||||
Policy = {
|
Policy = {
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@
|
||||||
./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
|
||||||
|
|
@ -48,15 +47,6 @@
|
||||||
|
|
||||||
services.geoclue2.enable = true;
|
services.geoclue2.enable = true;
|
||||||
|
|
||||||
# Workaround for nm-wait-online hanging??
|
|
||||||
# Ref: https://github.com/NixOS/nixpkgs/issues/180175
|
|
||||||
systemd.services.NetworkManager-wait-online = {
|
|
||||||
serviceConfig.ExecStart = [
|
|
||||||
""
|
|
||||||
"${pkgs.networkmanager}/bin/nm-online -q"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.extraConfig = ''
|
systemd.extraConfig = ''
|
||||||
DefaultTimeoutStopSec=10s
|
DefaultTimeoutStopSec=10s
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -12,14 +12,6 @@
|
||||||
"--volumes"
|
"--volumes"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
daemon.settings = {
|
|
||||||
# needed by bitbucket runner ???
|
|
||||||
log-driver = "json-file";
|
|
||||||
log-opts = {
|
|
||||||
max-size = "10m";
|
|
||||||
max-file = "3";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.extra-container.enable = true;
|
programs.extra-container.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
{ pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
{
|
{
|
||||||
mkNixRunner =
|
mkNixRunner =
|
||||||
authenticationTokenConfigFile: with lib; rec {
|
registrationConfigFile: 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 authenticationTokenConfigFile; # 2
|
inherit registrationConfigFile; # 2
|
||||||
dockerImage = "alpine:3.18.2";
|
dockerImage = "alpine:3.18.2";
|
||||||
dockerAllowedImages = [ dockerImage ];
|
dockerAllowedImages = [ dockerImage ];
|
||||||
dockerVolumes = [
|
dockerVolumes = [
|
||||||
|
|
@ -47,5 +47,6 @@
|
||||||
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,8 +30,6 @@
|
||||||
|
|
||||||
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;
|
||||||
|
|
@ -42,6 +40,5 @@
|
||||||
|
|
||||||
chrome-gnome-shell
|
chrome-gnome-shell
|
||||||
gnomeExtensions.quick-settings-audio-devices-hider
|
gnomeExtensions.quick-settings-audio-devices-hider
|
||||||
gnome-pass-search-provider
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@ in
|
||||||
gimp
|
gimp
|
||||||
inkscape
|
inkscape
|
||||||
krita
|
krita
|
||||||
kdePackages.breeze
|
|
||||||
kdePackages.kdenlive
|
kdePackages.kdenlive
|
||||||
pitivi
|
pitivi
|
||||||
blender-hip
|
blender-hip
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,20 @@ in
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
services.gitlab-runner = {
|
services.gitlab-runner = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.concurrent = 12;
|
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;
|
||||||
|
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
{
|
|
||||||
# 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,11 +9,6 @@
|
||||||
# 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;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,18 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.concurrent = 1;
|
settings.concurrent = 1;
|
||||||
services = {
|
services = {
|
||||||
|
# ci_test = {
|
||||||
|
# registrationConfigFile = "/srv/gitlab-runner/env/ci_test";
|
||||||
|
# dockerImage = "debian";
|
||||||
|
# dockerPrivileged = true;
|
||||||
|
# };
|
||||||
|
thoreb_builder = {
|
||||||
|
registrationConfigFile =
|
||||||
|
config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
||||||
|
dockerImage = "debian";
|
||||||
|
dockerPrivileged = true;
|
||||||
|
};
|
||||||
|
|
||||||
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;
|
||||||
thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
thoreb-itinerario-nix = mkNixRunner config.age.secrets.rainbow-gitlab-runner-thoreb-itinerario-registrationConfigFile.path;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -6,32 +6,28 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
programs.steam.extraPackages =
|
programs.steam.package = pkgs.steam.override {
|
||||||
config.fonts.packages
|
extraLibraries =
|
||||||
++ (with pkgs; [
|
pkgs:
|
||||||
capitaine-cursors
|
with config.hardware.opengl;
|
||||||
bibata-cursors
|
if pkgs.hostPlatform.is64bit then
|
||||||
mangohud
|
[ package ] ++ extraPackages
|
||||||
xdg-user-dirs
|
else
|
||||||
gamescope
|
[ package32 ] ++ extraPackages32;
|
||||||
|
|
||||||
# gamescope compatibility??
|
|
||||||
xorg.libXcursor
|
|
||||||
xorg.libXi
|
|
||||||
xorg.libXinerama
|
|
||||||
xorg.libXScrnSaver
|
|
||||||
libpng
|
|
||||||
libpulseaudio
|
|
||||||
libvorbis
|
|
||||||
stdenv.cc.cc.lib
|
|
||||||
libkrb5
|
|
||||||
keyutils
|
|
||||||
]);
|
|
||||||
|
|
||||||
|
extraPkgs =
|
||||||
|
pkgs: with pkgs; [
|
||||||
|
capitaine-cursors
|
||||||
|
bibata-cursors
|
||||||
|
mangohud
|
||||||
|
xdg-user-dirs
|
||||||
|
];
|
||||||
|
};
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
protontricks
|
protontricks
|
||||||
bottles
|
bottles
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.dzgui.enable = true;
|
programs.dzgui.enable = true;
|
||||||
|
programs.dzgui.package = inputs.dzgui-nix.packages.${pkgs.system}.default;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,6 @@
|
||||||
"bluetooth"
|
"bluetooth"
|
||||||
"corectrl"
|
"corectrl"
|
||||||
"vboxusers"
|
"vboxusers"
|
||||||
"input"
|
|
||||||
];
|
];
|
||||||
shell = pkgs.fish;
|
shell = pkgs.fish;
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
|
|
|
||||||
|
|
@ -116,12 +116,6 @@ 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 vesktop
|
exec webcord
|
||||||
exec telegram-desktop
|
exec telegram-desktop
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
tdesktop
|
tdesktop
|
||||||
vesktop
|
webcord
|
||||||
thunderbird
|
thunderbird
|
||||||
element-desktop-wayland
|
element-desktop-wayland
|
||||||
];
|
];
|
||||||
|
|
|
||||||
26
user/controller.nix
Normal file
26
user/controller.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
{ 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-devedition-unwrapped // {
|
bugfixedFirefox = pkgs.firefox-esr-unwrapped // {
|
||||||
requireSigning = false;
|
requireSigning = false;
|
||||||
allowAddonSideload = true;
|
allowAddonSideload = true;
|
||||||
};
|
};
|
||||||
|
|
@ -35,15 +35,9 @@ in
|
||||||
})
|
})
|
||||||
(pkgs.fetchFirefoxAddon {
|
(pkgs.fetchFirefoxAddon {
|
||||||
name = "ublock-origin";
|
name = "ublock-origin";
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi";
|
url = "https://addons.mozilla.org/firefox/downloads/file/4198829/ublock_origin-1.54.0.xpi";
|
||||||
hash = "sha256-RwxWmUpxdNshV4rc5ZixWKXcCXDIfFz+iJrGMr0wheo=";
|
hash = "sha256-l5cWCQgZFxD/CFhTa6bcKeytmSPDCyrW0+XjcddZ5E0=";
|
||||||
})
|
})
|
||||||
(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";
|
||||||
|
|
@ -56,9 +50,14 @@ in
|
||||||
hash = "sha256-lKLX6IWWtliRdH1Ig33rVEB4DVfbeuMw0dfUPV/mSSI=";
|
hash = "sha256-lKLX6IWWtliRdH1Ig33rVEB4DVfbeuMw0dfUPV/mSSI=";
|
||||||
})
|
})
|
||||||
(pkgs.fetchFirefoxAddon {
|
(pkgs.fetchFirefoxAddon {
|
||||||
name = "invidious_redirect";
|
name = "unhook";
|
||||||
url = "https://addons.mozilla.org/firefox/downloads/file/4292924/invidious_redirect_2-1.16.xpi";
|
url = "https://addons.mozilla.org/firefox/downloads/file/4050795/youtube_recommended_videos-1.6.2.xpi";
|
||||||
hash = "sha256-ApCc+MNmW9Wd/5seV6npePQVEaszT/rhD9EB7HGiUb8=";
|
hash = "sha256-xMuglNassZb9WqjfEGg6WeuhMACRuYqQor+iX1dEdsE=";
|
||||||
|
})
|
||||||
|
(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 {
|
||||||
|
|
@ -86,7 +85,7 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
profiles = {
|
profiles = {
|
||||||
dev-edition-default = {
|
main = {
|
||||||
isDefault = true;
|
isDefault = true;
|
||||||
search.force = true;
|
search.force = true;
|
||||||
search.default = "DuckDuckGo";
|
search.default = "DuckDuckGo";
|
||||||
|
|
@ -107,7 +106,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" = true;
|
"media.av1.enabled" = false;
|
||||||
"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;
|
||||||
|
|
@ -124,53 +123,10 @@ in
|
||||||
"devtools.chrome.enabled" = true;
|
"devtools.chrome.enabled" = true;
|
||||||
"devtools.debugger.remote-enabled" = true;
|
"devtools.debugger.remote-enabled" = true;
|
||||||
};
|
};
|
||||||
userChrome =
|
userChrome = lib.mkIf (desktop == "sway") ''
|
||||||
if desktop == "sway" then
|
#titlebar { display: none !important; }
|
||||||
''
|
#sidebar-header { display: none !important; }
|
||||||
#titlebar { 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;
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ in
|
||||||
c = "cargo";
|
c = "cargo";
|
||||||
# system
|
# system
|
||||||
sv = "sudo systemct";
|
sv = "sudo systemct";
|
||||||
suv = "systemct --user";
|
suv = "sudo systemct --user";
|
||||||
# docker abbrs
|
# docker abbrs
|
||||||
d = "docker";
|
d = "docker";
|
||||||
dc = "docker-compose";
|
dc = "docker-compose";
|
||||||
|
|
|
||||||
|
|
@ -103,29 +103,29 @@ function fish_git_prompt
|
||||||
_fish_prompt_warn "init"
|
_fish_prompt_warn "init"
|
||||||
end
|
end
|
||||||
|
|
||||||
# if we have at least one commit
|
git rev-parse HEAD -- &>/dev/null
|
||||||
if git rev-parse HEAD -- &>/dev/null
|
or return
|
||||||
# print a "↑" if ahead of origin
|
|
||||||
test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
|
|
||||||
and set -f _git_sync_ahead '↑'
|
|
||||||
|
|
||||||
# print a "↓" if behind of origin
|
# print a "↑" if ahead of origin
|
||||||
test 0 -lt (git log --oneline HEAD.."$git_remote_branch" -- | wc -l)
|
test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
|
||||||
and set -l _git_sync_behind '↓'
|
and set -f _git_sync_ahead '↑'
|
||||||
|
|
||||||
if set -q _git_sync_ahead _git_sync_behind
|
# print a "↓" if behind of origin
|
||||||
_fish_prompt_normal '⇅'
|
test 0 -lt (git log --oneline HEAD.."$git_remote_branch" -- | wc -l)
|
||||||
else if set -q _git_sync_ahead
|
and set -l _git_sync_behind '↓'
|
||||||
_fish_prompt_normal '↑'
|
|
||||||
else if set -q _git_sync_behind
|
|
||||||
_fish_prompt_normal '↓'
|
|
||||||
end
|
|
||||||
|
|
||||||
if test -n "$git_log_unpushed"
|
if set -q _git_sync_ahead _git_sync_behind
|
||||||
and not string match -qr "$git_branch" "$git_log_unpushed"
|
_fish_prompt_normal '⇅'
|
||||||
_fish_prompt_normal '↻'
|
else if set -q _git_sync_ahead
|
||||||
_fish_prompt_warn $git_log_unpushed[1]
|
_fish_prompt_normal '↑'
|
||||||
end
|
else if set -q _git_sync_behind
|
||||||
|
_fish_prompt_normal '↓'
|
||||||
|
end
|
||||||
|
|
||||||
|
if test -n "$git_log_unpushed"
|
||||||
|
and not string match -qr "$git_branch" "$git_log_unpushed"
|
||||||
|
_fish_prompt_normal '↻'
|
||||||
|
_fish_prompt_warn $git_log_unpushed[1]
|
||||||
end
|
end
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
|
|
|
||||||
|
|
@ -28,13 +28,16 @@ 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
|
||||||
keepassxc
|
gnome-passwordsafe
|
||||||
|
|
||||||
libsForQt5.qt5ct
|
libsForQt5.qt5ct
|
||||||
libsForQt5.qtstyleplugin-kvantum
|
libsForQt5.qtstyleplugin-kvantum
|
||||||
|
|
@ -42,7 +45,9 @@ lib.mkIf (config.my.desktop == "gnome") {
|
||||||
qt6Packages.qtstyleplugin-kvantum
|
qt6Packages.qtstyleplugin-kvantum
|
||||||
];
|
];
|
||||||
|
|
||||||
services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
|
home.sessionVariables = {
|
||||||
|
QT_QPA_PLATFORMTHEME = "qt5ct";
|
||||||
|
};
|
||||||
|
|
||||||
xdg.defaultApplications = {
|
xdg.defaultApplications = {
|
||||||
enable = lib.mkForce false;
|
enable = lib.mkForce false;
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@
|
||||||
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,6 +8,7 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
./controller.nix
|
||||||
./waybar
|
./waybar
|
||||||
./helix.nix
|
./helix.nix
|
||||||
./kakoune
|
./kakoune
|
||||||
|
|
@ -41,7 +42,6 @@
|
||||||
./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,9 +52,11 @@
|
||||||
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; [
|
||||||
terminal
|
# home-manager
|
||||||
|
|
||||||
|
terminal # see flake.nix
|
||||||
|
|
||||||
pulse_sink
|
pulse_sink
|
||||||
pulseaudio
|
pulseaudio
|
||||||
|
|
@ -79,6 +81,7 @@
|
||||||
amdgpu_top
|
amdgpu_top
|
||||||
inxi
|
inxi
|
||||||
dmidecode
|
dmidecode
|
||||||
|
ncdu
|
||||||
|
|
||||||
## text manipulation
|
## text manipulation
|
||||||
sd
|
sd
|
||||||
|
|
@ -107,6 +110,7 @@
|
||||||
## Network
|
## Network
|
||||||
speedtest-cli
|
speedtest-cli
|
||||||
nmap
|
nmap
|
||||||
|
httpie
|
||||||
miniupnpc
|
miniupnpc
|
||||||
deluge
|
deluge
|
||||||
nicotine-plus
|
nicotine-plus
|
||||||
|
|
@ -118,6 +122,7 @@
|
||||||
# rustup
|
# rustup
|
||||||
|
|
||||||
docker-compose
|
docker-compose
|
||||||
|
gnumake
|
||||||
mariadb
|
mariadb
|
||||||
|
|
||||||
nodePackages.intelephense
|
nodePackages.intelephense
|
||||||
|
|
@ -127,7 +132,7 @@
|
||||||
clang-tools # c/c++ lsp server
|
clang-tools # c/c++ lsp server
|
||||||
rust-analyzer # rust analyzer
|
rust-analyzer # rust analyzer
|
||||||
|
|
||||||
unstable.blade-formatter
|
blade-formatter
|
||||||
nixfmt-rfc-style
|
nixfmt-rfc-style
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -114,112 +114,3 @@ 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,6 +6,7 @@
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (config.my)
|
inherit (config.my)
|
||||||
|
key
|
||||||
dmenu
|
dmenu
|
||||||
editor
|
editor
|
||||||
theme
|
theme
|
||||||
|
|
@ -16,7 +17,6 @@ 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,9 +100,6 @@ 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
|
||||||
|
|
@ -121,19 +118,16 @@ 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
|
||||||
unstable.kak-tree-sitter
|
|
||||||
kak-pager
|
kak-pager
|
||||||
kak-man-pager
|
kak-man-pager
|
||||||
|
|
||||||
emmet-cli
|
emmet-cli
|
||||||
nodePackages.prettier
|
nodePackages.prettier
|
||||||
pint-fmt
|
|
||||||
|
|
||||||
aspell
|
aspell
|
||||||
aspellDicts.en
|
aspellDicts.en
|
||||||
|
|
|
||||||
|
|
@ -30,18 +30,10 @@ hook global WinSetOption filetype=angular %[
|
||||||
add-highlighter buffer/angular ref html
|
add-highlighter buffer/angular ref html
|
||||||
]
|
]
|
||||||
|
|
||||||
hook global BufCreate .*\.php %{
|
|
||||||
set buffer formatcmd 'pint-fmt'
|
|
||||||
}
|
|
||||||
|
|
||||||
hook global BufCreate .*\.js %{
|
hook global BufCreate .*\.js %{
|
||||||
set buffer formatcmd 'prettier --parser babel'
|
set buffer formatcmd 'prettier --parser babel'
|
||||||
}
|
}
|
||||||
|
|
||||||
hook global BufCreate .*\.scss %{
|
|
||||||
set buffer formatcmd 'prettier --parser scss'
|
|
||||||
}
|
|
||||||
|
|
||||||
hook global BufCreate .*\.vue %{
|
hook global BufCreate .*\.vue %{
|
||||||
set buffer formatcmd 'prettier --parser vue'
|
set buffer formatcmd 'prettier --parser vue'
|
||||||
hook buffer InsertCompletionHide {
|
hook buffer InsertCompletionHide {
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,6 @@ 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 %{
|
||||||
|
|
@ -93,19 +92,6 @@ 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*'
|
||||||
|
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
{ pkgs, lib, ... }:
|
|
||||||
let
|
|
||||||
hx-src = pkgs.helix.src;
|
|
||||||
kts-src = pkgs.unstable.kak-tree-sitter-unwrapped.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,7 +492,6 @@ in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultApplications = mimes;
|
defaultApplications = mimes;
|
||||||
associations.added = mimes;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,7 @@
|
||||||
config = {
|
config = {
|
||||||
programs.password-store = {
|
programs.password-store = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.pass.withExtensions (
|
package = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
|
||||||
ex: with ex; [
|
|
||||||
pass-otp
|
|
||||||
pass-import
|
|
||||||
]
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
pass-secret-service.enable = true;
|
pass-secret-service.enable = true;
|
||||||
|
|
@ -31,7 +26,6 @@
|
||||||
_gpg-unlock
|
_gpg-unlock
|
||||||
qtpass
|
qtpass
|
||||||
readQrCode
|
readQrCode
|
||||||
pass-export
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
{ 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" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
34
user/ssh.nix
34
user/ssh.nix
|
|
@ -1,20 +1,26 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
inherit (config.my) username mail;
|
||||||
|
in
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
programs.ssh = {
|
programs.ssh.enable = true;
|
||||||
enable = true;
|
programs.ssh.matchBlocks = {
|
||||||
matchBlocks = {
|
monolith = {
|
||||||
monolith = {
|
user = "lelgenio";
|
||||||
user = "lelgenio";
|
hostname = "monolith.lelgenio.com";
|
||||||
hostname = "monolith.lelgenio.com";
|
port = 9022;
|
||||||
port = 9022;
|
};
|
||||||
};
|
phantom = {
|
||||||
phantom = {
|
user = "root";
|
||||||
user = "root";
|
hostname = "phantom.lelgenio.com";
|
||||||
hostname = "phantom.lelgenio.com";
|
port = 9022;
|
||||||
port = 9022;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
includes = [ "~/Wopus/.ssh.config" ];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -80,12 +80,6 @@ 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."type:pointer" = {
|
|
||||||
accel_profile = "flat";
|
|
||||||
pointer_accel = "0";
|
|
||||||
};
|
|
||||||
|
|
||||||
input."type:touchpad" = {
|
input."type:touchpad" = {
|
||||||
# Disable While Typing
|
# Disable While Typing
|
||||||
dwt = "enabled";
|
dwt = "enabled";
|
||||||
|
|
@ -137,8 +131,6 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.gpg-agent.pinentryPackage = pkgs.pinentry-all;
|
|
||||||
|
|
||||||
xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json;
|
xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json;
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|
@ -154,7 +146,6 @@ in
|
||||||
wdmenu
|
wdmenu
|
||||||
wlauncher
|
wlauncher
|
||||||
volumesh
|
volumesh
|
||||||
brightnessctl
|
|
||||||
showkeys
|
showkeys
|
||||||
pamixer
|
pamixer
|
||||||
libnotify
|
libnotify
|
||||||
|
|
@ -167,8 +158,7 @@ in
|
||||||
wl-crosshair
|
wl-crosshair
|
||||||
|
|
||||||
grim
|
grim
|
||||||
satty
|
swappy
|
||||||
xdg-user-dirs
|
|
||||||
(tesseract5.override {
|
(tesseract5.override {
|
||||||
enableLanguages = [
|
enableLanguages = [
|
||||||
"eng"
|
"eng"
|
||||||
|
|
|
||||||
|
|
@ -44,8 +44,6 @@ 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,6 +16,7 @@ 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
|
||||||
|
|
@ -157,12 +158,6 @@ 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}";
|
||||||
|
|
@ -170,9 +165,7 @@ 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" = ''
|
"${mod}+Shift+s" = "exec grim - | swappy -f -";
|
||||||
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";
|
||||||
|
|
@ -203,6 +196,5 @@ in
|
||||||
system_binds
|
system_binds
|
||||||
parenting_binds
|
parenting_binds
|
||||||
screenshot_binds
|
screenshot_binds
|
||||||
screen_binds
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -48,14 +48,9 @@ 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 = "gtk3";
|
platformTheme.name = "qtct";
|
||||||
style.name = "qt5ct";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
dconf.settings = {
|
dconf.settings = {
|
||||||
|
|
@ -84,13 +79,6 @@ 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,12 +10,6 @@
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
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;
|
package = pkgs.vscodium-fhs;
|
||||||
extensions = with pkgs.vscode-extensions; [
|
extensions = with pkgs.vscode-extensions; [
|
||||||
jnoortheen.nix-ide
|
jnoortheen.nix-ide
|
||||||
github.github-vscode-theme
|
github.github-vscode-theme
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,6 @@ in
|
||||||
"mpd"
|
"mpd"
|
||||||
"custom/playerctl"
|
"custom/playerctl"
|
||||||
"tray"
|
"tray"
|
||||||
"custom/controller-battery"
|
|
||||||
"custom/caffeine"
|
"custom/caffeine"
|
||||||
"pulseaudio"
|
"pulseaudio"
|
||||||
(lib.optional (osConfig.services.vpn.enable or false) "custom/vpn")
|
(lib.optional (osConfig.services.vpn.enable or false) "custom/vpn")
|
||||||
|
|
@ -107,7 +106,7 @@ in
|
||||||
};
|
};
|
||||||
clock = {
|
clock = {
|
||||||
interval = 60;
|
interval = 60;
|
||||||
format = "<b>{:L%H:%M %a %d/%m}</b>";
|
format = "<b>{:%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";
|
||||||
|
|
@ -138,8 +137,9 @@ in
|
||||||
{
|
{
|
||||||
format = "{stateIcon} {title} - {artist}";
|
format = "{stateIcon} {title} - {artist}";
|
||||||
format-paused = "{stateIcon}";
|
format-paused = "{stateIcon}";
|
||||||
format-stopped = "";
|
format-stopped = "{stateIcon}";
|
||||||
state-icons = {
|
state-icons = {
|
||||||
|
stopped = "";
|
||||||
paused = "";
|
paused = "";
|
||||||
playing = "";
|
playing = "";
|
||||||
};
|
};
|
||||||
|
|
@ -158,12 +158,6 @@ in
|
||||||
"sway/language" = {
|
"sway/language" = {
|
||||||
format = "{short} {variant}";
|
format = "{short} {variant}";
|
||||||
};
|
};
|
||||||
"custom/controller-battery" = {
|
|
||||||
format = "{}";
|
|
||||||
exec = lib.getExe pkgs.controller-battery;
|
|
||||||
interval = 1;
|
|
||||||
tooltip = false;
|
|
||||||
};
|
|
||||||
"custom/caffeine" = {
|
"custom/caffeine" = {
|
||||||
format = "{}";
|
format = "{}";
|
||||||
exec = "systemctl --user status swayidle > /dev/null && echo || echo ";
|
exec = "systemctl --user status swayidle > /dev/null && echo || echo ";
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,6 @@ window#waybar.solo {
|
||||||
#mpd,
|
#mpd,
|
||||||
#custom-mpd,
|
#custom-mpd,
|
||||||
#custom-playerctl,
|
#custom-playerctl,
|
||||||
#custom-controller-battery,
|
|
||||||
#tray,
|
#tray,
|
||||||
#clock,
|
#clock,
|
||||||
#network,
|
#network,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue