Compare commits
104 Commits
79d2d3b623
...
gitea_typs
| Author | SHA1 | Date | |
|---|---|---|---|
|
f601854156
|
|||
|
09bf9a3b17
|
|||
|
0b069d7277
|
|||
|
e3673902e2
|
|||
|
a9f02a8462
|
|||
|
3f5747d8e0
|
|||
|
da2c2dcd8c
|
|||
|
fca1cd048e
|
|||
|
d1f26e838d
|
|||
|
5440679d16
|
|||
|
fa1392dce8
|
|||
|
0751e0ac30
|
|||
|
a2cf986bc4
|
|||
|
0a95372a68
|
|||
|
ecf5065588
|
|||
|
bb6f0ab772
|
|||
|
90f939e056
|
|||
|
8740cc57fe
|
|||
|
f7eda08683
|
|||
|
15e60767b6
|
|||
|
d9d0ccaed5
|
|||
|
2818f61e28
|
|||
|
b1d4994f92
|
|||
|
4b6e99130b
|
|||
|
a2458211e3
|
|||
|
1f15bf221b
|
|||
|
908c352932
|
|||
|
db9139a08c
|
|||
|
54e4e82dc7
|
|||
|
30560f07cd
|
|||
|
91a9568828
|
|||
|
472105eb8a
|
|||
|
3d46b03022
|
|||
|
dbd3e323f8
|
|||
|
af9b6b9177
|
|||
|
4673549042
|
|||
|
b06f2546d6
|
|||
|
3d774357fd
|
|||
|
29e7cfbc65
|
|||
|
793d778428
|
|||
|
d272b50176
|
|||
|
27d3561623
|
|||
|
467daedae4
|
|||
|
1dc699e5b1
|
|||
|
df3e54c1ca
|
|||
|
0d2dd68933
|
|||
|
2641287a1c
|
|||
|
f854e137cb
|
|||
|
e62d5f62b8
|
|||
|
9551d72d8d
|
|||
|
6eb21658dd
|
|||
|
bdc019547e
|
|||
|
c7ac111ca4
|
|||
|
3576d4081a
|
|||
|
097357e838
|
|||
|
289ab74ca6
|
|||
|
ef20f44154
|
|||
|
cc92ccc52c
|
|||
|
d6ac321923
|
|||
|
fbbd2e3c8a
|
|||
|
7c135d2291
|
|||
|
4b114f6f51
|
|||
|
d32fcecea1
|
|||
|
fed978a9b6
|
|||
|
d4bae9aa7a
|
|||
|
15c7f6e3b5
|
|||
|
784477f82f
|
|||
|
7755c92d27
|
|||
|
f26f27355a
|
|||
|
6984ee4446
|
|||
|
064a2e6554
|
|||
|
e90f05bf99
|
|||
|
8509f81135
|
|||
|
6d08a3883f
|
|||
|
466dbc574d
|
|||
|
cfc66a92cb
|
|||
|
390d3a3ddb
|
|||
|
7a647287bb
|
|||
|
82efa133b3
|
|||
|
0e58c0a65f
|
|||
|
d1da1f149b
|
|||
|
58d1ee5a4c
|
|||
|
3fa43bff25
|
|||
|
5ed8aedf41
|
|||
|
4ae136ea6d
|
|||
|
cb38433656
|
|||
|
4f35747f51
|
|||
|
99ddee1f5e
|
|||
|
5630b394f0
|
|||
|
1a6ab2840a
|
|||
|
bf948813da
|
|||
|
059cfef98a
|
|||
|
e7632ff743
|
|||
|
f6105ac717
|
|||
|
654432249a
|
|||
|
282cac1b70
|
|||
|
a3948bc9a7
|
|||
|
7eb54d5293
|
|||
|
7cb3e2aae4
|
|||
|
511aee2794
|
|||
|
a418ea4145
|
|||
|
e1cfb9032c
|
|||
|
7024f0e216
|
|||
|
4e83712fc0
|
@@ -13,7 +13,7 @@
|
||||
optimise.automatic = true;
|
||||
gc.automatic = true;
|
||||
gc.options = "--delete-older-than 7d";
|
||||
package = pkgs.nixUnstable;
|
||||
package = pkgs.nixVersions.latest;
|
||||
settings.experimental-features = ["nix-command" "flakes"];
|
||||
};
|
||||
|
||||
|
||||
@@ -8,29 +8,39 @@
|
||||
[
|
||||
acpi
|
||||
binutils
|
||||
binwalk
|
||||
bluez
|
||||
bluez-tools
|
||||
btop
|
||||
busybox
|
||||
curlHTTP3
|
||||
dfu-util
|
||||
dhcpcd
|
||||
direnv
|
||||
dmidecode
|
||||
dnsmasq
|
||||
dnsutils
|
||||
dtach
|
||||
f2fs-tools
|
||||
fd
|
||||
file
|
||||
fio
|
||||
fzf
|
||||
fzy
|
||||
git
|
||||
adwaita-icon-theme
|
||||
gnomeExtensions.appindicator
|
||||
gnupg
|
||||
gptfdisk
|
||||
hcxdumptool
|
||||
hdparm
|
||||
htop-vim
|
||||
interception-tools
|
||||
iw
|
||||
jq
|
||||
lm_sensors
|
||||
man-pages
|
||||
man-pages-posix
|
||||
meson
|
||||
mosh
|
||||
msmtp
|
||||
@@ -43,6 +53,7 @@
|
||||
ntfs3g
|
||||
ntfsprogs
|
||||
nvim
|
||||
nvme-cli
|
||||
openhantek6022
|
||||
optipng
|
||||
pax-utils
|
||||
@@ -76,6 +87,7 @@
|
||||
wirelesstools
|
||||
wol
|
||||
xdg-utils
|
||||
xfsprogs
|
||||
zip
|
||||
z-lua
|
||||
]
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
wg_preshared:
|
||||
nixy: ENC[AES256_GCM,data:kP+Vt48NMpdBSGjpWzzxt+nqxPNXrofV4kLwgU4o62riB9rxU1CZ4Ddr17k=,iv:xCqR/rbGrJYBkxOpsAg1qxxEGXRD+577JGTNDqshcOQ=,tag:9rAdg6Zw6kVzLxwF1U+pNg==,type:str]
|
||||
mediabox: ENC[AES256_GCM,data:BL9vCUE6wWtmTNPMCvJNZjiAMUWRmLLHOk73v1Z8EOJWcsZ5G3U+08TxBBg=,iv:XTZnF2kMVurTD+TPL0T7uDDu1gGjOdO7AWHXsZS5yO8=,tag:6RIAsbe0Ue4MX28VxzbPCg==,type:str]
|
||||
workstation: ENC[AES256_GCM,data:x60PMdgihMjtvQagphdO0uft7LLU2grdgeTrO5oSRiqOtb23P5S5SxDQ3Js=,iv:CB8QldIZ8/FjbcAkLxekygUo5luHig7FnH7wyrgZEuk=,tag:E3XWxPH5/fHyFmGimQ4tLg==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
@@ -34,8 +35,8 @@ sops:
|
||||
eDhXVWo2UHVCaFUrak9aVEU5N0FxRVEKDKBpbHWwTkW3BFAXQ213/glZyTz88OjZ
|
||||
JHh0phDzFZG0+nzBz3TAi0ZyYnlbOYAuEvQh1uUg9MI1XUCr8GC9Qw==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-04-20T18:39:51Z"
|
||||
mac: ENC[AES256_GCM,data:VyhkViFZAHM22OxlqzFPRvgJvK/54GhcVS9U3B8HYrZnShxLO5VC2HOVDIvheDflewOv8Wt5wA+kloDv9y/L45Wa/lUPvOser0ruvEYcJBmNiPpxKNoR+/MOIHeUuSMpzBoiCob1LY4qkM8nU4xDU6N1GkPGxbg67UkHcpAfV/U=,iv:P2Xup7rQZibEaGGLpaVsyRPTp4WiJxwO6SuJ7H7eaTc=,tag:y1iTx4PMuTAVvZU72RipIg==,type:str]
|
||||
lastmodified: "2024-04-22T16:06:34Z"
|
||||
mac: ENC[AES256_GCM,data:BRgF+L22FuN/v+Vi57JLaTxtAe4Gr8UtY4QIYRUeigpHCkxza+pUd5qyGTIsHeaRFWNy726u9+PlX3uy0MlOt9lzQ1Zlmc+hDthUIHRWX9mqO+j5+klmDvVug5yqr2f7HMtBD+tnEwDr65FuPNKqJjmg1Tbk0RD12yt/gkEAy7w=,iv:aTWVlHEQGNgnIIoJ2IpnppU6lo7g0kI7gxtPM1ZqXvM=,tag:PhZypRZAlmxnKz1Kxtppzg==,type:str]
|
||||
pgp: []
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.8.1
|
||||
|
||||
1
common/wg_pubkey_proton
Normal file
1
common/wg_pubkey_proton
Normal file
@@ -0,0 +1 @@
|
||||
g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=
|
||||
1
common/wg_pubkey_workstation
Normal file
1
common/wg_pubkey_workstation
Normal file
@@ -0,0 +1 @@
|
||||
kbmzzQc3bBpkjE7K/ohycZtx+ml+dzVYOQ2xM0/bzzQ=
|
||||
235
flake.lock
generated
235
flake.lock
generated
@@ -19,11 +19,11 @@
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"lastModified": 1732722421,
|
||||
"narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -33,22 +33,6 @@
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
@@ -64,7 +48,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_4": {
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
@@ -80,39 +64,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1701473968,
|
||||
"narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-root": {
|
||||
"locked": {
|
||||
"lastModified": 1692742795,
|
||||
"narHash": "sha256-f+Y0YhVCIJ06LemO+3Xx00lIcqQxSKJHXT/yk1RTKxw=",
|
||||
"owner": "srid",
|
||||
"repo": "flake-root",
|
||||
"rev": "d9a70d9c7a5fd7f3258ccf48da9335e9b47c3937",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "srid",
|
||||
"repo": "flake-root",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
@@ -131,30 +82,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"goatcounter": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-root": "flake-root",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1705880453,
|
||||
"narHash": "sha256-Y1O6tia2Pc1MA5ZoFH3B2y7FwjZuIDiNT4C9+bBawrY=",
|
||||
"owner": "asmir-abdulahovic",
|
||||
"repo": "goatcounter-flake",
|
||||
"rev": "f912ab7024cbc47d5fa80a416b643707a9b50b06",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "asmir-abdulahovic",
|
||||
"repo": "goatcounter-flake",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -162,11 +89,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711868868,
|
||||
"narHash": "sha256-QpZanlbVu6Gb2K96u3vgu0F2BvZD74+fOsIFWcYEXoY=",
|
||||
"lastModified": 1730016908,
|
||||
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "30f2ec39519f4f5a8a96af808c439e730c15aeab",
|
||||
"rev": "e83414058edd339148dc142a8437edb9450574c8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -177,17 +104,17 @@
|
||||
},
|
||||
"nix-xilinx": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-compat": "flake-compat",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1699035130,
|
||||
"narHash": "sha256-emK4aJCC2gW94b2P3N2LjkQ6PEMLUcDduVWwYQ7aq+o=",
|
||||
"lastModified": 1732892167,
|
||||
"narHash": "sha256-AZ0rgM9xj+Bf2C8RfGMUvuVdcqkvQU5/Wm8u6A5xYJg=",
|
||||
"owner": "asmir.abdulahovic",
|
||||
"repo": "nix-xilinx",
|
||||
"rev": "0323990db46c32e361e4fd70600d859eb90862af",
|
||||
"rev": "3071f40914fe2db3837a40a72a97af6f0a442f16",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@@ -198,50 +125,47 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1711703276,
|
||||
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
|
||||
"lastModified": 1732981179,
|
||||
"narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
|
||||
"rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"nixpkgs-24_05": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1701253981,
|
||||
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
|
||||
"lastModified": 1717144377,
|
||||
"narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
|
||||
"rev": "805a384895c696f802a9bf5bf4720f37385df547",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"dir": "lib",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-24.05",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1711819797,
|
||||
"narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
|
||||
"lastModified": 1729973466,
|
||||
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
|
||||
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "release-23.11",
|
||||
"ref": "release-24.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -253,11 +177,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712935714,
|
||||
"narHash": "sha256-zGo9wiDH+qn4Mky70CJEvST1gGgMM/VMajAjsgNdOqk=",
|
||||
"lastModified": 1733261583,
|
||||
"narHash": "sha256-HOVUtrhtJ16umPuEODuVE9fx+JmDCRp7wIxnEART0Eg=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "ba6b926cc4f6d65015271ebe7edd22269af77840",
|
||||
"revCount": 31,
|
||||
"rev": "a09a34997ce692c7a2e8e434b44433156a73088c",
|
||||
"revCount": 38,
|
||||
"type": "git",
|
||||
"url": "https://git.project-cloud.net/asmir/nvim_flake"
|
||||
},
|
||||
@@ -268,7 +192,7 @@
|
||||
},
|
||||
"peerix": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
@@ -297,11 +221,11 @@
|
||||
"theme_deepthought": "theme_deepthought"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1705870326,
|
||||
"narHash": "sha256-ojdGSeqztnnGMyLKjnSCGq0muGh3U+Zb9iwzaaDsaF4=",
|
||||
"lastModified": 1729077289,
|
||||
"narHash": "sha256-z5LEPxOJq2LjhPhY4QE1IOt0lBD39cipR6Lw8vRTNlI=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "ad6af66a6142279789db8967b285eb04c6d18c02",
|
||||
"revCount": 26,
|
||||
"rev": "eab712e42139d33911ba767c2ff1bfbdf05c254d",
|
||||
"revCount": 27,
|
||||
"type": "git",
|
||||
"url": "https://git.project-cloud.net/asmir/project-cloud"
|
||||
},
|
||||
@@ -312,7 +236,6 @@
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"goatcounter": "goatcounter",
|
||||
"home-manager": "home-manager",
|
||||
"nix-xilinx": "nix-xilinx",
|
||||
"nixpkgs": "nixpkgs",
|
||||
@@ -328,18 +251,18 @@
|
||||
"simple-nixos-mailserver": {
|
||||
"inputs": {
|
||||
"blobs": "blobs",
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils"
|
||||
"nixpkgs-24_05": "nixpkgs-24_05"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710449465,
|
||||
"narHash": "sha256-2orO8nfplp6uQJBFqKkj1iyNMC6TysmwbWwbb4osTag=",
|
||||
"lastModified": 1722877200,
|
||||
"narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "79c8cfcd5873a85559da6201b116fb38b490d030",
|
||||
"rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@@ -356,11 +279,11 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711855048,
|
||||
"narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
|
||||
"lastModified": 1729999681,
|
||||
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
|
||||
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -404,21 +327,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"theme_anemone": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -451,45 +359,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"goatcounter",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1702461037,
|
||||
"narHash": "sha256-ssyGxfGHRuuLHuMex+vV6RMOt7nAo07nwufg9L5GkLg=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "d06b70e5163a903f19009c3f97770014787a080f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709126324,
|
||||
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"zremap": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -497,17 +366,17 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1696448728,
|
||||
"narHash": "sha256-kUc6983IX9n0eQxTFZRK7LYCLHoxoGZ5rOV7nu8hGRI=",
|
||||
"owner": "asmir.abdulahovic",
|
||||
"repo": "zremap",
|
||||
"rev": "9043844893cfc333ed04d04c1d3b67d9904c0afc",
|
||||
"type": "gitlab"
|
||||
"lastModified": 1721120316,
|
||||
"narHash": "sha256-CaAMnU6LKqJrsZmR9k0/2brpULnAekpgG5S0BjtFhaQ=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "8a7923bd4e5d36b186408d5432568a91ac67b695",
|
||||
"revCount": 21,
|
||||
"type": "git",
|
||||
"url": "https://git.project-cloud.net/asmir/zremap"
|
||||
},
|
||||
"original": {
|
||||
"owner": "asmir.abdulahovic",
|
||||
"repo": "zremap",
|
||||
"type": "gitlab"
|
||||
"type": "git",
|
||||
"url": "https://git.project-cloud.net/asmir/zremap"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
12
flake.nix
12
flake.nix
@@ -2,7 +2,7 @@
|
||||
description = "NixOS configuration";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||
|
||||
nix-xilinx = {
|
||||
url = "gitlab:asmir.abdulahovic/nix-xilinx";
|
||||
@@ -15,7 +15,7 @@
|
||||
};
|
||||
|
||||
zremap = {
|
||||
url = "gitlab:asmir.abdulahovic/zremap";
|
||||
url = "git+https://git.project-cloud.net/asmir/zremap";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
@@ -34,11 +34,6 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
goatcounter = {
|
||||
url = "github:asmir-abdulahovic/goatcounter-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
@@ -56,7 +51,6 @@
|
||||
};
|
||||
|
||||
outputs = inputs @ {
|
||||
goatcounter,
|
||||
home-manager,
|
||||
nixpkgs,
|
||||
nix-xilinx,
|
||||
@@ -89,6 +83,7 @@
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.akill = import ./home/home.nix;
|
||||
home-manager.extraSpecialArgs = {inherit inputs system;};
|
||||
home-manager.backupFileExtension = "home_backup";
|
||||
}
|
||||
peerix.nixosModules.peerix
|
||||
{
|
||||
@@ -165,7 +160,6 @@
|
||||
{nix.registry.nixpkgs.flake = nixpkgs;}
|
||||
./magpie/configuration.nix
|
||||
./magpie/hardware-configuration.nix
|
||||
goatcounter.nixosModules.goatcounter
|
||||
simple-nixos-mailserver.nixosModule
|
||||
sops-nix.nixosModules.sops
|
||||
(builtins.toPath "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix")
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
|
||||
firejail -- ${pkgs.qutebrowser}/bin/qutebrowser "$@"
|
||||
firejail -- ${lib.getExe pkgs.qutebrowser} "$@"
|
||||
'';
|
||||
in {
|
||||
imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
|
||||
@@ -18,6 +18,7 @@ in {
|
||||
enable = true;
|
||||
defaultApplications = {
|
||||
"application/pdf" = "sioyek.desktop";
|
||||
"default-web-browser" = "org.qutebrowser.qutebrowser.desktop";
|
||||
"text/html" = "org.qutebrowser.qutebrowser.desktop";
|
||||
"x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
|
||||
"x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
|
||||
@@ -29,11 +30,12 @@ in {
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
home.sessionVariables = rec {
|
||||
BROWSER = "${qutebrowser_firejail}/bin/qutebrowser";
|
||||
BROWSER = lib.getExe qutebrowser_firejail;
|
||||
DEFAULT_BROWSER = "${BROWSER}";
|
||||
EDITOR = "nvim";
|
||||
_JAVA_AWT_WM_NONREPARENTING = "1";
|
||||
MOZ_ENABLE_WAYLAND = "1";
|
||||
NIXOS_OZONE_WL = "1";
|
||||
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
|
||||
SUDO_EDITOR = "nvim";
|
||||
WLR_RENDERER = "vulkan";
|
||||
@@ -180,6 +182,7 @@ in {
|
||||
userName = "Asmir A";
|
||||
userEmail = "asmir.abdulahovic@gmail.com";
|
||||
extraConfig = {
|
||||
init.defaultBranch = "master";
|
||||
pull = {rebase = true;};
|
||||
credential = {helper = "store";};
|
||||
};
|
||||
@@ -220,8 +223,8 @@ in {
|
||||
swayidle = let
|
||||
locker = pkgs.writeShellScriptBin "swaylock_fancy" ''
|
||||
TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg)
|
||||
${pkgs.grim}/bin/grim -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
|
||||
${pkgs.swaylock}/bin/swaylock -f -i "$TMP_FILE"
|
||||
${lib.getExe pkgs.grim} -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
|
||||
${lib.getExe pkgs.swaylock} -f -i "$TMP_FILE"
|
||||
${pkgs.coreutils}/bin/rm "$TMP_FILE"
|
||||
'';
|
||||
in {
|
||||
@@ -247,6 +250,37 @@ in {
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
kanshi = {
|
||||
enable = true;
|
||||
settings = [
|
||||
{
|
||||
profile.name = "undocked";
|
||||
profile.outputs = [
|
||||
{
|
||||
criteria = "eDP-1";
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
{
|
||||
profile.name = "docked";
|
||||
profile.outputs = [
|
||||
{
|
||||
criteria = "eDP-1";
|
||||
}
|
||||
{
|
||||
criteria = "Philips Consumer Electronics Company PHL 272S1 UHB2347026536";
|
||||
mode = "1920x1080@74.973Hz";
|
||||
}
|
||||
{
|
||||
criteria = "Philips Consumer Electronics Company PHL 272S1 UHB2347026535";
|
||||
mode = "1920x1080@74.973Hz";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
systemd.user = {
|
||||
|
||||
@@ -1,14 +1,21 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
system,
|
||||
...
|
||||
}: let
|
||||
chromium_teams = pkgs.writeShellScriptBin "chromium_teams" ''
|
||||
${pkgs.chromium}/bin/chromium --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
|
||||
${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
|
||||
'';
|
||||
chromium_discord = pkgs.writeShellScriptBin "chromium_discord" ''
|
||||
${pkgs.chromium}/bin/chromium --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
|
||||
${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me
|
||||
'';
|
||||
chromium_stackfield = pkgs.writeShellScriptBin "chromium_stackfield" ''
|
||||
${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://stackfield.com/
|
||||
'';
|
||||
qcad = pkgs.writeShellScriptBin "qcad" ''
|
||||
QT_QPA_PLATFORM=xcb ${lib.getExe pkgs.qcad} $@
|
||||
'';
|
||||
ssh_proxy = pkgs.writeShellScriptBin "ssh_proxy" ''
|
||||
if ${pkgs.coreutils}/bin/test $# -ne 1; then
|
||||
@@ -16,7 +23,7 @@
|
||||
exit
|
||||
fi
|
||||
PROXY_PORT="1337"
|
||||
${pkgs.openssh}/bin/ssh -D "$PROXY_PORT" -q -N "$@"
|
||||
${lib.getExe pkgs.openssh} -D "$PROXY_PORT" -q -N "$@"
|
||||
'';
|
||||
wrap_sh = let
|
||||
bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix {};
|
||||
@@ -47,13 +54,16 @@ in {
|
||||
cached-nix-shell
|
||||
caddy
|
||||
cargo
|
||||
chromium
|
||||
ungoogled-chromium
|
||||
cmake
|
||||
compsize
|
||||
cura
|
||||
/*cura*/
|
||||
deluge
|
||||
dfu-util
|
||||
discord
|
||||
dmenu-wayland
|
||||
drawio
|
||||
dualsensectl
|
||||
ffmpeg-full
|
||||
firefox
|
||||
freecad
|
||||
@@ -65,7 +75,9 @@ in {
|
||||
gnumake
|
||||
go
|
||||
grim
|
||||
heimdall
|
||||
hyperfine
|
||||
icestorm
|
||||
imagemagick
|
||||
imv
|
||||
inkscape
|
||||
@@ -75,44 +87,60 @@ in {
|
||||
kodi-wayland
|
||||
krita
|
||||
libnotify
|
||||
libreoffice
|
||||
libreoffice-qt6-fresh
|
||||
libva-utils
|
||||
linuxPackages_latest.perf
|
||||
lsix
|
||||
lsix
|
||||
mediainfo
|
||||
ncdu
|
||||
neovide
|
||||
nextpnr
|
||||
ngspice
|
||||
nix-init
|
||||
nixpkgs-fmt
|
||||
nix-prefetch-git
|
||||
nodePackages.peerflix
|
||||
nom
|
||||
openems
|
||||
openocd
|
||||
openscad
|
||||
pandoc
|
||||
paraview
|
||||
pass-wayland
|
||||
patchelf
|
||||
pavucontrol
|
||||
pay-respects
|
||||
pirate-get
|
||||
poppler_utils
|
||||
powertop
|
||||
pulsemixer
|
||||
pwvucontrol
|
||||
python3
|
||||
python3Packages.west
|
||||
remmina
|
||||
river
|
||||
rtorrent
|
||||
sbcl
|
||||
screen
|
||||
seer
|
||||
sioyek
|
||||
skypeforlinux
|
||||
slurp
|
||||
steam-run
|
||||
stm32cubemx
|
||||
swayimg
|
||||
tea
|
||||
teams-for-linux
|
||||
tectonic
|
||||
tessen
|
||||
texlive.combined.scheme-full
|
||||
thunderbird
|
||||
typst
|
||||
upx
|
||||
waybar
|
||||
wdisplays
|
||||
weechat
|
||||
whatsapp-for-linux
|
||||
wine
|
||||
wireshark
|
||||
@@ -121,17 +149,20 @@ in {
|
||||
wofi
|
||||
x2goclient
|
||||
yewtube
|
||||
yosys
|
||||
yt-dlp
|
||||
zapzap
|
||||
zathura
|
||||
zeal-qt6
|
||||
/*zeal-qt6*/
|
||||
zig
|
||||
]
|
||||
++ [
|
||||
chromium_discord
|
||||
chromium_stackfield
|
||||
chromium_teams
|
||||
ssh_proxy
|
||||
wrap_sh
|
||||
qcad
|
||||
]
|
||||
++ [
|
||||
inputs.swaysw.packages.${system}.swaysw
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
|
||||
@@ -18,7 +18,15 @@
|
||||
}
|
||||
{
|
||||
block = "disk_space";
|
||||
path = "/";
|
||||
path = "/nix";
|
||||
info_type = "available";
|
||||
interval = 20;
|
||||
warning = 20.0;
|
||||
alert = 10.0;
|
||||
}
|
||||
{
|
||||
block = "disk_space";
|
||||
path = "/home";
|
||||
info_type = "available";
|
||||
interval = 20;
|
||||
warning = 20.0;
|
||||
@@ -34,6 +42,11 @@
|
||||
device = "enp5s0";
|
||||
interval = 2;
|
||||
}
|
||||
{
|
||||
block = "net";
|
||||
device = "enp7s0f3u1u1";
|
||||
interval = 2;
|
||||
}
|
||||
{
|
||||
block = "net";
|
||||
device = "eno1";
|
||||
|
||||
@@ -3,17 +3,18 @@
|
||||
pkgs,
|
||||
inputs,
|
||||
system,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" ''
|
||||
${pkgs.cliphist}/bin/cliphist list | \
|
||||
${pkgs.wofi}/bin/wofi --dmenu --insensitive | \
|
||||
${pkgs.cliphist}/bin/cliphist decode | \
|
||||
${lib.getExe pkgs.cliphist} list | \
|
||||
${lib.getExe pkgs.wofi} --dmenu --insensitive | \
|
||||
${lib.getExe pkgs.cliphist} decode | \
|
||||
${pkgs.wl-clipboard}/bin/wl-copy
|
||||
'';
|
||||
screenshot_clip = pkgs.writeShellScriptBin "screenshot_clip" ''
|
||||
GEOM="$(${pkgs.slurp}/bin/slurp -d)"
|
||||
${pkgs.grim}/bin/grim -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
|
||||
GEOM="$(${lib.getExe pkgs.slurp} -d)"
|
||||
${lib.getExe pkgs.grim} -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
|
||||
'';
|
||||
swaysw = inputs.swaysw.packages.${system}.swaysw;
|
||||
viber = pkgs.callPackage ../packages/viber/default.nix {};
|
||||
@@ -22,6 +23,7 @@ in {
|
||||
wayland.windowManager.sway = {
|
||||
enable = true;
|
||||
extraSessionCommands = "";
|
||||
extraConfigEarly = '''';
|
||||
|
||||
config = {
|
||||
fonts = {
|
||||
@@ -48,8 +50,8 @@ in {
|
||||
modifier = "Mod4";
|
||||
output = {
|
||||
eDP-1 = {
|
||||
bg = "~/pic/wallpaper stretch";
|
||||
/*
|
||||
bg = "~/pic/wallpaper stretch";
|
||||
scale = "1.4";
|
||||
*/
|
||||
};
|
||||
@@ -73,14 +75,14 @@ in {
|
||||
style = "Bold Semi-Condensed";
|
||||
size = 12.0;
|
||||
};
|
||||
statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-top.toml";
|
||||
statusCommand = "${lib.getExe pkgs.i3status-rust} ~/.config/i3status-rust/config-top.toml";
|
||||
}
|
||||
];
|
||||
|
||||
keybindings = {
|
||||
"Alt+Shift+q" = "kill";
|
||||
"Alt+Shift+Return" = "exec ${term}";
|
||||
"Alt+p" = "exec ${pkgs.dmenu-wayland}/bin/dmenu-wl_run -fn \"mono 14\"";
|
||||
"Alt+p" = "exec ${pkgs.bemenu}/bin/bemenu-run";
|
||||
"Alt+c" = "exec ${pkgs.moreutils}/bin/lckdo cliphist_sway ${cliphist_sway}/bin/cliphist_sway";
|
||||
"Print" = "exec ${pkgs.moreutils}/bin/lckdo screenshot_clip ${screenshot_clip}/bin/screenshot_clip";
|
||||
|
||||
@@ -120,13 +122,16 @@ in {
|
||||
"Alt+slash" = "exec ${pkgs.moreutils}/bin/lckdo swaysw ${swaysw}/bin/swaysw";
|
||||
"Alt+Escape" = "workspace back_and_forth";
|
||||
"Alt+f" = "fullscreen enable";
|
||||
"Alt+bracketright" = "focus output right";
|
||||
"Alt+bracketleft" = "focus output left";
|
||||
|
||||
"Mod4+l" = ''
|
||||
exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${pkgs.python3}/bin/python3'';
|
||||
"Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${pkgs.zapzap}/bin/zapzap";
|
||||
exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${lib.getExe pkgs.python3}'';
|
||||
"Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${lib.getExe pkgs.zapzap}";
|
||||
"Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber";
|
||||
"Mod4+y" = ''
|
||||
exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${pkgs.pulsemixer}/bin/pulsemixer'';
|
||||
exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${lib.getExe pkgs.pulsemixer}'';
|
||||
"Mod4+p" = "exec ${lib.getExe pkgs.tessen} -a copy";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
cp = "cp -v";
|
||||
rm = "rm -v";
|
||||
ip = "ip --color=auto";
|
||||
f = "''$(pay-respects zsh)";
|
||||
};
|
||||
|
||||
history = {
|
||||
@@ -37,11 +38,6 @@
|
||||
src = pkgs.nix-zsh-completions;
|
||||
file = "share/zsh/plugins/nix/nix-zsh-completions.plugin.zsh";
|
||||
}
|
||||
{
|
||||
name = "fast_syntax_highlight";
|
||||
src = pkgs.zsh-fast-syntax-highlighting;
|
||||
file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
|
||||
}
|
||||
{
|
||||
name = "pure_prompt";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
pkgs,
|
||||
lib,
|
||||
project-cloud,
|
||||
goatcounter,
|
||||
nvim,
|
||||
system,
|
||||
...
|
||||
@@ -12,17 +11,36 @@
|
||||
|
||||
nix.optimise.automatic = true;
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
system.switch = {
|
||||
enable = false;
|
||||
enableNg = true;
|
||||
};
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.systemd-boot.configurationLimit = 2;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelParams = ["ip=dhcp"];
|
||||
boot.kernel.sysctl = {
|
||||
"net.core.default_qdisc" = "fq";
|
||||
"net.ipv4.tcp_congestion_control" = "bbr";
|
||||
};
|
||||
|
||||
boot.initrd = {
|
||||
compressor = "zstd";
|
||||
availableKernelModules = ["virtio-pci"];
|
||||
systemd.enable = true;
|
||||
network = {
|
||||
enable = true;
|
||||
ssh = {
|
||||
enable = true;
|
||||
hostKeys = [/etc/ssh_dummy_ed25519_key];
|
||||
authorizedKeyFiles = [../nixy/ssh_pubkey];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "Europe/Berlin";
|
||||
|
||||
@@ -38,7 +56,6 @@
|
||||
fzf
|
||||
fzy
|
||||
git
|
||||
goatcounter.packages.${system}.goatcounter
|
||||
nvim.packages.${system}.nvim
|
||||
htop-vim
|
||||
nvim
|
||||
@@ -100,18 +117,13 @@
|
||||
|
||||
services.goatcounter = {
|
||||
enable = true;
|
||||
environmentFile = "/var/lib/goatcounter.env";
|
||||
extraArgs = ["-listen='*:8002'" "-tls=proxy"];
|
||||
database = {
|
||||
backend = "sqlite";
|
||||
name = "goatcounter";
|
||||
user = "goatcounter";
|
||||
automigrate = true;
|
||||
};
|
||||
port = 8002;
|
||||
proxy = true;
|
||||
address = "127.0.0.1";
|
||||
};
|
||||
|
||||
services.nextcloud = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
package = pkgs.nextcloud28;
|
||||
config.adminpassFile = config.sops.secrets."nextcloud_admin".path;
|
||||
configureRedis = true;
|
||||
@@ -157,12 +169,14 @@
|
||||
root = "${project-cloud.packages.${system}.default}/public";
|
||||
};
|
||||
|
||||
/*
|
||||
virtualHosts.${config.services.nextcloud.hostName} = {
|
||||
quic = true;
|
||||
http3 = true;
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
};
|
||||
*/
|
||||
|
||||
virtualHosts."miniflux.project-cloud.net" = {
|
||||
quic = true;
|
||||
@@ -180,7 +194,7 @@
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
|
||||
proxyPass = "http://unix:${toString config.services.gitea.settings.server.HTTP_ADDR}";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -208,6 +222,7 @@
|
||||
DISABLE_SSH = true;
|
||||
HTTP_PORT = 3001;
|
||||
LANDING_PAGE = "explore";
|
||||
PROTOCOL = "http+unix";
|
||||
};
|
||||
settings.mailer = {
|
||||
ENABLED = true;
|
||||
@@ -230,6 +245,13 @@
|
||||
RENDER_COMMAND = "${docutils}/bin/rst2html.py";
|
||||
IS_INPUT_FILE = false;
|
||||
};
|
||||
|
||||
settings."markup.typst" = {
|
||||
ENABLED = true;
|
||||
FILE_EXTENSIONS = ".typ";
|
||||
RENDER_COMMAND = "timeout 30s ${lib.getExe pkgs.python3Packages.pygments} -f html -O full";
|
||||
IS_INPUT_FILE = false;
|
||||
};
|
||||
};
|
||||
|
||||
services.nfs.server.enable = false;
|
||||
@@ -258,6 +280,12 @@
|
||||
startAt = "daily";
|
||||
};
|
||||
|
||||
services.seafile = {
|
||||
enable = false;
|
||||
initialAdminPassword = "admin";
|
||||
adminEmail = "asmir.abdulahovic" + "@" + "gmail.com";
|
||||
};
|
||||
|
||||
/*
|
||||
needed for sendmail mail functionality
|
||||
*/
|
||||
@@ -272,48 +300,29 @@
|
||||
defaults.email = "asmir.abdulahovic@gmail.com";
|
||||
};
|
||||
|
||||
sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
|
||||
|
||||
sops.secrets."miniflux_env" = {
|
||||
sopsFile = ./secrets/miniflux.yaml;
|
||||
};
|
||||
|
||||
sops.secrets."gitea_mail_pw_hash" = {
|
||||
sopsFile = ./secrets/gitea_mail_pw_hash.yaml;
|
||||
};
|
||||
|
||||
sops.secrets."asmir_mail_pw_hash" = {
|
||||
sopsFile = ./secrets/asmir_mail_pw_hash.yaml;
|
||||
};
|
||||
|
||||
sops.secrets."gitea_db" = {
|
||||
sopsFile = ./secrets/gitea_db.yaml;
|
||||
owner = config.users.users.gitea.name;
|
||||
};
|
||||
|
||||
sops.secrets."nextcloud_admin" = {
|
||||
sopsFile = ./secrets/nextcloud_admin.yaml;
|
||||
owner = config.users.users.nextcloud.name;
|
||||
};
|
||||
|
||||
sops.secrets."wg_privkey" = {
|
||||
sopsFile = ./secrets/wg_privkey.yaml;
|
||||
};
|
||||
|
||||
sops.secrets."wg_preshared/nixy" = {
|
||||
sopsFile = ../common/secrets/wg_preshared.yaml;
|
||||
};
|
||||
|
||||
sops.secrets."wg_preshared/mediabox" = {
|
||||
sopsFile = ../common/secrets/wg_preshared.yaml;
|
||||
};
|
||||
|
||||
sops.secrets."borgbase_enc_key" = {
|
||||
sopsFile = ./secrets/borgbase_enc_key.yaml;
|
||||
};
|
||||
|
||||
sops.secrets."borgbase_ssh_key" = {
|
||||
sopsFile = ./secrets/borgbase_ssh_key.yaml;
|
||||
sops = {
|
||||
age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
|
||||
secrets = {
|
||||
"asmir_mail_pw_hash".sopsFile = ./secrets/asmir_mail_pw_hash.yaml;
|
||||
"borgbase_enc_key".sopsFile = ./secrets/borgbase_enc_key.yaml;
|
||||
"borgbase_ssh_key".sopsFile = ./secrets/borgbase_ssh_key.yaml;
|
||||
"gitea_mail_pw_hash".sopsFile = ./secrets/gitea_mail_pw_hash.yaml;
|
||||
"miniflux_env".sopsFile = ./secrets/miniflux.yaml;
|
||||
"wg_preshared/mediabox".sopsFile = ../common/secrets/wg_preshared.yaml;
|
||||
"wg_preshared/nixy".sopsFile = ../common/secrets/wg_preshared.yaml;
|
||||
"wg_preshared/workstation".sopsFile = ../common/secrets/wg_preshared.yaml;
|
||||
"wg_privkey".sopsFile = ./secrets/wg_privkey.yaml;
|
||||
"gitea_db" = {
|
||||
sopsFile = ./secrets/gitea_db.yaml;
|
||||
owner = config.users.users.gitea.name;
|
||||
};
|
||||
/*
|
||||
"nextcloud_admin" = {
|
||||
sopsFile = ./secrets/nextcloud_admin.yaml;
|
||||
owner = config.users.users.nextcloud.name;
|
||||
};
|
||||
*/
|
||||
};
|
||||
};
|
||||
|
||||
networking.hostName = "magpie";
|
||||
@@ -358,6 +367,11 @@
|
||||
presharedKeyFile = config.sops.secrets."wg_preshared/mediabox".path;
|
||||
allowedIPs = ["10.100.0.5/32"];
|
||||
}
|
||||
{
|
||||
publicKey = builtins.readFile ../common/wg_pubkey_workstation;
|
||||
presharedKeyFile = config.sops.secrets."wg_preshared/workstation".path;
|
||||
allowedIPs = ["10.100.0.4/32"];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -27,21 +27,34 @@
|
||||
};
|
||||
|
||||
sops.secrets."wg_preshared/mediabox" = {
|
||||
sopsFile = ../common/secrets/wg_privkey.yaml;
|
||||
sopsFile = ../common/secrets/wg_preshared.yaml;
|
||||
};
|
||||
|
||||
nix = {
|
||||
optimise.automatic = true;
|
||||
gc.automatic = true;
|
||||
gc.options = "--delete-older-than 7d";
|
||||
package = pkgs.nixUnstable;
|
||||
package = pkgs.nixVersions.latest;
|
||||
settings = {
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
};
|
||||
};
|
||||
|
||||
boot = {
|
||||
initrd.compressor = "zstd";
|
||||
initrd = {
|
||||
compressor = "zstd";
|
||||
availableKernelModules = ["e1000e"];
|
||||
network = {
|
||||
enable = true;
|
||||
udhcpc.enable = true;
|
||||
ssh = {
|
||||
enable = true;
|
||||
hostKeys = [/etc/ssh_dummy_ed25519_key];
|
||||
authorizedKeys = [(builtins.readFile ../nixy/ssh_pubkey)];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
kernelModules = ["acpi_call"];
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = ["msr.allow_writes=on"];
|
||||
@@ -100,7 +113,6 @@
|
||||
wireguard.interfaces = {
|
||||
wg0 = {
|
||||
ips = ["10.100.0.5/24"];
|
||||
listenPort = 51820;
|
||||
privateKeyFile = config.sops.secrets."wg_privkey".path;
|
||||
peers = [
|
||||
{
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
nix-xilinx,
|
||||
system,
|
||||
nvim,
|
||||
pkgs,
|
||||
system,
|
||||
zremap,
|
||||
...
|
||||
}: {
|
||||
@@ -11,38 +11,54 @@
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
system.autoUpgrade.enable = false;
|
||||
|
||||
sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
|
||||
sops.secrets."peerix/private" = {
|
||||
sopsFile = ./secrets/peerix.yaml;
|
||||
mode = "0400";
|
||||
owner = config.users.users.nobody.name;
|
||||
group = config.users.users.nobody.group;
|
||||
system.switch = {
|
||||
enable = false;
|
||||
enableNg = true;
|
||||
};
|
||||
|
||||
sops.secrets."wg_privkey" = {
|
||||
sopsFile = ./secrets/wg_privkey.yaml;
|
||||
};
|
||||
sops = {
|
||||
age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
|
||||
secrets = {
|
||||
"peerix/private" = {
|
||||
sopsFile = ./secrets/peerix.yaml;
|
||||
mode = "0400";
|
||||
owner = config.users.users.nobody.name;
|
||||
group = config.users.users.nobody.group;
|
||||
};
|
||||
|
||||
sops.secrets."wg_preshared/nixy" = {
|
||||
sopsFile = ../common/secrets/wg_preshared.yaml;
|
||||
};
|
||||
"wg_privkey" = {
|
||||
sopsFile = ./secrets/wg_privkey.yaml;
|
||||
};
|
||||
|
||||
sops.secrets."borgbase_enc_key" = {
|
||||
sopsFile = ./secrets/borgbase_enc_key.yaml;
|
||||
owner = config.users.users.akill.name;
|
||||
};
|
||||
"wg_preshared/nixy" = {
|
||||
sopsFile = ../common/secrets/wg_preshared.yaml;
|
||||
};
|
||||
|
||||
sops.secrets."borgbase_ssh_key" = {
|
||||
sopsFile = ./secrets/borgbase_ssh_key.yaml;
|
||||
owner = config.users.users.akill.name;
|
||||
"wg_privkey_proton" = {
|
||||
sopsFile = ./secrets/wg_privkey_proton.yaml;
|
||||
};
|
||||
|
||||
"wg_endpoint_proton" = {
|
||||
sopsFile = ./secrets/wg_privkey_proton.yaml;
|
||||
};
|
||||
|
||||
"borgbase_enc_key" = {
|
||||
sopsFile = ./secrets/borgbase_enc_key.yaml;
|
||||
owner = config.users.users.akill.name;
|
||||
};
|
||||
|
||||
"borgbase_ssh_key" = {
|
||||
sopsFile = ./secrets/borgbase_ssh_key.yaml;
|
||||
owner = config.users.users.akill.name;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
nix = {
|
||||
optimise.automatic = true;
|
||||
gc.automatic = true;
|
||||
gc.options = "--delete-older-than 7d";
|
||||
package = pkgs.nixUnstable;
|
||||
package = pkgs.nixVersions.latest;
|
||||
settings = {
|
||||
sandbox = true;
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
@@ -52,7 +68,8 @@
|
||||
boot = {
|
||||
extraModulePackages = with config.boot.kernelPackages; [usbip v4l2loopback];
|
||||
initrd.compressor = "zstd";
|
||||
initrd.kernelModules = ["amdgpu"];
|
||||
initrd.kernelModules = [];
|
||||
initrd.systemd.enable = true;
|
||||
binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows"];
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = ["psmouse.synaptics_intertouch=0" "mem_sleep_default=deep"];
|
||||
@@ -67,7 +84,7 @@
|
||||
memtest86.enable = true;
|
||||
};
|
||||
readOnlyNixStore = true;
|
||||
supportedFilesystems = ["btrfs" "nfs"];
|
||||
supportedFilesystems = ["f2fs" "xfs"];
|
||||
tmp.useTmpfs = true;
|
||||
};
|
||||
|
||||
@@ -92,7 +109,7 @@
|
||||
networking = {
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [80 443 51820];
|
||||
allowedTCPPorts = [80 443 51820 8020];
|
||||
};
|
||||
|
||||
hostName = "nixy";
|
||||
@@ -128,7 +145,6 @@
|
||||
wireguard.interfaces = {
|
||||
wg0 = {
|
||||
ips = ["10.100.0.6/24"];
|
||||
listenPort = 51820;
|
||||
privateKeyFile = config.sops.secrets."wg_privkey".path;
|
||||
peers = [
|
||||
{
|
||||
@@ -140,6 +156,19 @@
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
neox_wg = {
|
||||
ips = ["192.168.51.2/32"];
|
||||
privateKeyFile = config.sops.secrets."wg_privkey".path;
|
||||
peers = [
|
||||
{
|
||||
publicKey = builtins.readFile ../nixy/wg_pubkey_nx;
|
||||
allowedIPs = ["192.168.2.0/24"];
|
||||
endpoint = "185.194.64.26:51820";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -148,6 +177,11 @@
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.overlays = [nix-xilinx.overlay nvim.overlays.${system}.overlay];
|
||||
environment = {
|
||||
etc = {
|
||||
"firejail/qutebrowser.local".text = ''
|
||||
whitelist ''${RUNUSER}/qutebrowser
|
||||
'';
|
||||
};
|
||||
extraInit = ''
|
||||
unset -v SSH_ASKPASS
|
||||
'';
|
||||
@@ -158,10 +192,20 @@
|
||||
};
|
||||
|
||||
programs = {
|
||||
steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = true;
|
||||
dedicatedServer.openFirewall = false;
|
||||
localNetworkGameTransfers.openFirewall = true;
|
||||
};
|
||||
gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
appimage = {
|
||||
enable = true;
|
||||
binfmt = true;
|
||||
};
|
||||
zsh.enable = true;
|
||||
firejail.enable = true;
|
||||
adb.enable = true;
|
||||
@@ -169,19 +213,119 @@
|
||||
sway.enable = true;
|
||||
};
|
||||
|
||||
documentation.dev.enable = true;
|
||||
|
||||
# List services that you want to enable:
|
||||
systemd = {
|
||||
services = {
|
||||
"zremap" = {
|
||||
description = "Intercepts keyboard udev events";
|
||||
wants = ["systemd-udevd.service"];
|
||||
wantedBy = ["multi-user.target"];
|
||||
"zremap@" = {
|
||||
enable = true;
|
||||
restartIfChanged = true;
|
||||
serviceConfig.Nice = -20;
|
||||
script = ''
|
||||
sleep 1
|
||||
${zremap.defaultPackage.${system}}/bin/zremap \
|
||||
/dev/input/by-path/platform-i8042-serio-0-event-kbd
|
||||
'';
|
||||
unitConfig = {
|
||||
Description = "zremap on %I";
|
||||
ConditionPathExists = "%I";
|
||||
};
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${zremap.defaultPackage.${system}}/bin/zremap %I";
|
||||
};
|
||||
};
|
||||
|
||||
"netns@" = {
|
||||
description = "%I network namespace";
|
||||
before = ["network.target"];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = "${pkgs.iproute2}/bin/ip netns add %I";
|
||||
ExecStop = "${pkgs.iproute2}/bin/ip netns del %I";
|
||||
};
|
||||
};
|
||||
|
||||
"wg_proton" = {
|
||||
description = "wg network interface";
|
||||
bindsTo = ["netns@wg.service"];
|
||||
requires = ["network-online.target"];
|
||||
wants = ["dnscrypt-proxy2_proton.service"];
|
||||
after = ["netns@wg.service"];
|
||||
before = ["dnscrypt-proxy2_proton.service"];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = pkgs.writers.writeBash "wg-up" ''
|
||||
set -e
|
||||
ENDPOINT_IP=$(${pkgs.coreutils-full}/bin/cat "${config.sops.secrets."wg_endpoint_proton".path}")
|
||||
${pkgs.iproute2}/bin/ip link add proton_wg type wireguard
|
||||
${pkgs.iproute2}/bin/ip link set proton_wg netns wg
|
||||
${pkgs.iproute2}/bin/ip -n wg address add 10.2.0.2/32 dev proton_wg
|
||||
${pkgs.iproute2}/bin/ip netns exec wg \
|
||||
${pkgs.wireguard-tools}/bin/wg set "proton_wg" private-key "${config.sops.secrets."wg_privkey_proton".path}"
|
||||
${pkgs.iproute2}/bin/ip netns exec wg \
|
||||
${pkgs.wireguard-tools}/bin/wg set "proton_wg" peer "g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=" \
|
||||
endpoint "$ENDPOINT_IP:51820" \
|
||||
persistent-keepalive "25" \
|
||||
allowed-ips "0.0.0.0/0"
|
||||
${pkgs.iproute2}/bin/ip -n wg link set lo up
|
||||
${pkgs.iproute2}/bin/ip -n wg link set proton_wg up
|
||||
${pkgs.iproute2}/bin/ip -n wg route add default dev proton_wg
|
||||
'';
|
||||
ExecStop = pkgs.writers.writeBash "wg-down" ''
|
||||
${pkgs.iproute2}/bin/ip -n wg route del default dev proton_wg
|
||||
${pkgs.iproute2}/bin/ip -n wg link del proton_wg
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
"dnscrypt-proxy2_proton" = {
|
||||
description = "DNSCrypt-proxy client proton";
|
||||
wants = [
|
||||
"network-online.target"
|
||||
"nss-lookup.target"
|
||||
];
|
||||
before = ["nss-lookup.target"];
|
||||
after = ["wg_proton.service"];
|
||||
partOf = ["wg_proton.service"];
|
||||
serviceConfig = {
|
||||
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
|
||||
CacheDirectory = "dnscrypt-proxy";
|
||||
DynamicUser = true;
|
||||
ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${config.services.dnscrypt-proxy2.configFile}";
|
||||
LockPersonality = true;
|
||||
LogsDirectory = "dnscrypt-proxy";
|
||||
MemoryDenyWriteExecute = true;
|
||||
NetworkNamespacePath = "/var/run/netns/wg";
|
||||
NonBlocking = true;
|
||||
NoNewPrivileges = true;
|
||||
PrivateDevices = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectSystem = "strict";
|
||||
Restart = "always";
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
RestrictRealtime = true;
|
||||
RuntimeDirectory = "dnscrypt-proxy";
|
||||
StateDirectory = "dnscrypt-proxy";
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [
|
||||
"@system-service"
|
||||
"@chown"
|
||||
"~@aio"
|
||||
"~@keyring"
|
||||
"~@memlock"
|
||||
"~@setuid"
|
||||
"~@timer"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -193,14 +337,13 @@
|
||||
|
||||
services = {
|
||||
acpid.enable = true;
|
||||
btrfs.autoScrub.enable = true;
|
||||
dbus.enable = true;
|
||||
dbus.implementation = "broker";
|
||||
fstrim.enable = true;
|
||||
fwupd.enable = true;
|
||||
ntp.enable = true;
|
||||
openssh.enable = true;
|
||||
printing.enable = true;
|
||||
rpcbind.enable = true;
|
||||
|
||||
pipewire = {
|
||||
enable = true;
|
||||
@@ -209,21 +352,26 @@
|
||||
pulse.enable = true;
|
||||
};
|
||||
|
||||
avahi = {
|
||||
enable = true;
|
||||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
libinput.enable = true;
|
||||
xserver = {
|
||||
enable = true;
|
||||
dpi = 144;
|
||||
libinput.enable = true;
|
||||
desktopManager.xterm.enable = false;
|
||||
displayManager = {
|
||||
lightdm.enable = false;
|
||||
startx.enable = true;
|
||||
defaultSession = "none+i3";
|
||||
};
|
||||
windowManager.i3.enable = false;
|
||||
};
|
||||
|
||||
udev = {
|
||||
packages = [pkgs.rtl-sdr pkgs.openhantek6022 pkgs.openocd];
|
||||
packages = [pkgs.openhantek6022 pkgs.openocd];
|
||||
extraRules = ''
|
||||
#Xilinx FTDI
|
||||
ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666"
|
||||
@@ -234,6 +382,9 @@
|
||||
|
||||
#Arduino UNO r4
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", MODE:="0666"
|
||||
|
||||
#zremap on new keyboard
|
||||
ACTION=="add", SUBSYSTEM=="input", ATTRS{phys}!="", KERNEL=="event[0-9]*", ENV{ID_INPUT_KEY}=="1", ENV{ID_INPUT_KEYBOARD}=="1", TAG+="systemd", ENV{SYSTEMD_WANTS}+="zremap@$env{DEVNAME}.service"
|
||||
'';
|
||||
};
|
||||
|
||||
@@ -287,13 +438,16 @@
|
||||
settings = {
|
||||
ipv6_servers = true;
|
||||
require_dnssec = true;
|
||||
require_nolog = true;
|
||||
require_nofilter = true;
|
||||
http3 = true;
|
||||
|
||||
sources.public-resolvers = {
|
||||
urls = [
|
||||
"https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
|
||||
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
|
||||
];
|
||||
cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
|
||||
cache_file = "public-resolvers.md";
|
||||
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
|
||||
};
|
||||
};
|
||||
@@ -339,6 +493,23 @@
|
||||
logind.extraConfig = ''
|
||||
KillUserProcesses=yes
|
||||
'';
|
||||
|
||||
seafile = {
|
||||
enable = false;
|
||||
initialAdminPassword = "admin";
|
||||
adminEmail = "asmir.abdulahovic@gmail.com";
|
||||
ccnetSettings = {
|
||||
General = {
|
||||
SERVICE_URL = "http://127.0.0.1:8020";
|
||||
};
|
||||
};
|
||||
seafileSettings = {
|
||||
fileserver = {
|
||||
host = "0.0.0.0";
|
||||
port = 8082;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
fonts = {
|
||||
@@ -356,27 +527,29 @@
|
||||
dina-font
|
||||
fira-code
|
||||
fira-code-symbols
|
||||
font-awesome
|
||||
font-awesome_4
|
||||
font-awesome_6
|
||||
inconsolata
|
||||
iosevka
|
||||
jetbrains-mono
|
||||
liberation_ttf
|
||||
libertine
|
||||
noto-fonts
|
||||
noto-fonts-cjk
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-color-emoji
|
||||
noto-fonts-emoji
|
||||
proggyfonts
|
||||
siji
|
||||
terminus_font
|
||||
terminus_font_ttf
|
||||
ubuntu_font_family
|
||||
vistafonts
|
||||
];
|
||||
};
|
||||
|
||||
virtualisation = {
|
||||
spiceUSBRedirection.enable = true;
|
||||
containers.storage.settings = {
|
||||
storage = {
|
||||
driver = "btrfs";
|
||||
graphroot = "/var/lib/containers/storage";
|
||||
runroot = "/run/containers/storage";
|
||||
};
|
||||
@@ -388,8 +561,6 @@
|
||||
};
|
||||
};
|
||||
|
||||
sound.enable = true;
|
||||
|
||||
hardware = {
|
||||
bluetooth = {
|
||||
enable = true;
|
||||
@@ -400,12 +571,11 @@
|
||||
};
|
||||
};
|
||||
|
||||
opengl = {
|
||||
graphics = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
extraPackages = with pkgs; [];
|
||||
extraPackages = [];
|
||||
};
|
||||
rtl-sdr.enable = true;
|
||||
};
|
||||
|
||||
zramSwap = {
|
||||
|
||||
@@ -1,77 +1,44 @@
|
||||
# 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, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd" "amdgpu"];
|
||||
boot.extraModulePackages = [];
|
||||
boot.initrd.luks.devices."crypt_dev".device = "/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a";
|
||||
boot.initrd.luks.devices."crypt_dev".allowDiscards = true;
|
||||
boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "uas" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||
boot.kernelModules = [ "kvm-amd" "amd-gpu" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=root" "compress=lzo" "noatime"];
|
||||
};
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2";
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."sys_enc".device = "/dev/disk/by-uuid/682d030d-189e-4b47-a60a-62cf1f3729d3";
|
||||
fileSystems."/nix" =
|
||||
{ device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047";
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=home" "compress=lzo" "noatime"];
|
||||
};
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376";
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix" "compress=lzo" "noatime"];
|
||||
};
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/828E-F3C3";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=persist" "compress=lzo" "noatime"];
|
||||
};
|
||||
swapDevices = [ ];
|
||||
|
||||
fileSystems."/var/log" = {
|
||||
device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=log" "compress=lzo" "noatime"];
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/3F3E-9833";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
fileSystems."/opt/xilinx" = {
|
||||
device = "/dev/disk/by-uuid/f5c27ef2-8053-4d96-9f8f-c6a50d6193b9";
|
||||
fsType = "erofs";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
/*
|
||||
{
|
||||
device = "/dev/disk/by-uuid/ee1792c9-098b-40c1-b760-20def16ba67f";
|
||||
encrypted = {
|
||||
enable = true;
|
||||
keyFile = "/mnt-root/swap.key";
|
||||
label = "swap_encr";
|
||||
blkDev = "/dev/disk/by-uuid/aee12e27-b45a-4291-be78-db0a903071b3";
|
||||
};
|
||||
}
|
||||
*/
|
||||
];
|
||||
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
nix.settings.max-jobs = lib.mkDefault 8;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = true;
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
}
|
||||
|
||||
22
nixy/secrets/wg_privkey_proton.yaml
Normal file
22
nixy/secrets/wg_privkey_proton.yaml
Normal file
@@ -0,0 +1,22 @@
|
||||
wg_privkey_proton: ENC[AES256_GCM,data:qVVd+1s2T3sKDi03V+eMvgqW8LAVl/yEKwtG2EMn8NhBCN7RvlttC5SeIDM=,iv:/QcrtmMjCzZRulumIz5u9oxyaRt+HUq96ZiP8ecpvAo=,tag:1DCaJqVGfg3sfvKTQnmzZA==,type:str]
|
||||
wg_endpoint_proton: ENC[AES256_GCM,data:ggoWnB6nGjGc/kSOaCo=,iv:1r5J6SO5JYH7+bMhE2lGwfFETVFeS61eCXtej0Pl07M=,tag:p+0hhQ/vqZzZML24YReA0g==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
azure_kv: []
|
||||
hc_vault: []
|
||||
age:
|
||||
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
|
||||
enc: |
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxdXZpL1lrOEYyYVdFTzNJ
|
||||
SHhXRVc5Y0o4ZzN2THRjM215UWczVjZOTXg4CjBJZ2VxN0t0ZFgzTmJMeXo5SWZk
|
||||
UjRlNmdRTVVPbHVEeXM3TWhoS0pSUTQKLS0tIEtkTURBc1A3d2lTalhmeEoxUkZj
|
||||
K3BHZnUzN3ZrL1dFQk8rWFpZR05pbFUKObrnIpY3NR1o3/lKhTfVpQU+eQRTi7wF
|
||||
SAjGZ5BRdCi5x1VWRxiT1Fvjqkm7kBEQFvdSvbqW2UK6lVHtWgt2Vg==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2024-05-12T13:30:18Z"
|
||||
mac: ENC[AES256_GCM,data:3UqJGcNGPZDlLA3a0uNHUI0ykDC0ByxAR2ZsrsbWQMv3BS6zyBuc+zpTHQZoIPGsAMUetuB3OuA0IQNll3abg6u2AadEQBUf1PYMWlo58txLYlAs/q0g+575F+LhDSgmDMKOFXz4HqbFP0RYTHkPnmjWPMWWY3G9o6B3Iaw5+Kc=,iv:massJRpGcH4pDZxJrpQYy80XVViyw+qFsZ8Sk9Xze08=,tag:eDvuNadKGKBS/3jauvnuFQ==,type:str]
|
||||
pgp: []
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.8.1
|
||||
1
nixy/wg_pubkey_nx
Normal file
1
nixy/wg_pubkey_nx
Normal file
@@ -0,0 +1 @@
|
||||
eoYSDh27qQFpvOcDmuVFzSTuPnrHQYXDMqatKmDAth0=
|
||||
@@ -44,12 +44,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "viber";
|
||||
version = "21.8.0.11";
|
||||
version = "23.2.0.3";
|
||||
|
||||
src = fetchurl {
|
||||
# Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb
|
||||
url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
|
||||
hash = "sha256-RrObmN21QOm5nk0R2avgCH0ulrfiUIo2PnyYWvQaGVw=";
|
||||
hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [makeWrapper];
|
||||
|
||||
Reference in New Issue
Block a user