asmir/nixos_flake_config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: asmir:nftables_transition
Branches Tags
asmir:master asmir:nftables_transition asmir:gitea_typst asmir:magento2
..
compare: asmir:66701189d519ee7f25ac6f18ba6142c7d949f74b
Branches Tags
asmir:master asmir:nftables_transition asmir:gitea_typst asmir:magento2

3 Commits
nftables_t ... 66701189d5

Author SHA1 Message Date
Asmir A
66701189d5 flake: update nvim 2024-04-17 22:28:58 +02:00
Asmir A
3fadc9d785 magpie/nfs: disable nfs 2024-04-17 22:28:19 +02:00
Asmir A
c06e05a7de magpie/ssh: change auth pubkey 2024-04-17 22:27:10 +02:00
46 changed files with 1045 additions and 1632 deletions
Expand all files Collapse all files

30
.sops.yaml
View File

@@ -1,30 +0,0 @@
keys:
- &magpie age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
- &mediabox age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
- &nixy age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
creation_rules:
- path_regex: common/secrets/[^/]+\.yaml$
key_groups:
- age:
- *magpie
- *mediabox
- *nixy
- path_regex: magpie/secrets/[^/]+\.yaml$
key_groups:
- age:
- *magpie
- *nixy
- path_regex: mediabox/secrets/[^/]+\.yaml$
key_groups:
- age:
- *mediabox
- *nixy
- path_regex: nixy/secrets/[^/]+\.yaml$
key_groups:
- age:
- *nixy

72
blue/configuration.nix
View File

@@ -2,8 +2,7 @@
config, config,
pkgs, pkgs,
... ...
}: }: {
{
imports = [ imports = [
]; ];
@@ -14,17 +13,14 @@
optimise.automatic = true; optimise.automatic = true;
gc.automatic = true; gc.automatic = true;
gc.options = "--delete-older-than 7d"; gc.options = "--delete-older-than 7d";
package = pkgs.nixVersions.latest; package = pkgs.nixUnstable;
settings.experimental-features = [ settings.experimental-features = ["nix-command" "flakes"];
"nix-command"
"flakes"
];
}; };
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [ "msr.allow_writes=on" ]; kernelParams = ["msr.allow_writes=on"];
supportedFilesystems = [ "btrfs" ]; supportedFilesystems = ["btrfs"];
tmpOnTmpfs = true; tmpOnTmpfs = true;
initrd.compressor = "zstd"; initrd.compressor = "zstd";
loader.systemd-boot = { loader.systemd-boot = {
@@ -43,7 +39,7 @@
doas.enable = true; doas.enable = true;
doas.extraRules = [ doas.extraRules = [
{ {
users = [ "akill" ]; users = ["akill"];
keepEnv = true; keepEnv = true;
persist = true; persist = true;
} }
@@ -57,16 +53,15 @@
networking = { networking = {
firewall.enable = true; firewall.enable = true;
hostName = "blue"; hostName = "blue";
nameservers = [ nameservers = ["127.0.0.1" "::1"];
"127.0.0.1"
"::1"
];
dhcpcd.extraConfig = "nohook resolv.conf"; dhcpcd.extraConfig = "nohook resolv.conf";
networkmanager = { networkmanager = {
enable = true; enable = true;
dns = "none"; dns = "none";
# wifi.backend = "iwd"; /*
wifi.backend = "iwd";
*/
}; };
}; };
@@ -97,8 +92,8 @@
services = { services = {
"caps2esc" = { "caps2esc" = {
description = "Intercepts keyboard udev events"; description = "Intercepts keyboard udev events";
wants = [ "systemd-udevd.service" ]; wants = ["systemd-udevd.service"];
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
serviceConfig.Nice = -20; serviceConfig.Nice = -20;
script = '' script = ''
${pkgs.interception-tools}/bin/intercept \ ${pkgs.interception-tools}/bin/intercept \
@@ -157,10 +152,7 @@
windowManager.i3.enable = true; windowManager.i3.enable = true;
}; };
udev.packages = [ udev.packages = [pkgs.rtl-sdr pkgs.openhantek6022];
pkgs.rtl-sdr
pkgs.openhantek6022
];
tlp = { tlp = {
enable = true; enable = true;
@@ -170,38 +162,32 @@
enable = true; enable = true;
bindings = [ bindings = [
{ {
keys = [ 113 ]; keys = [113];
events = [ "key" ]; events = ["key"];
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'";
} }
{ {
keys = [ 114 ]; keys = [114];
events = [ events = ["key" "rep"];
"key"
"rep"
];
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'";
} }
{ {
keys = [ 115 ]; keys = [115];
events = [ events = ["key" "rep"];
"key"
"rep"
];
command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'";
} }
{ {
keys = [ 224 ]; keys = [224];
events = [ "key" ]; events = ["key"];
command = "${pkgs.light}/bin/light -U 5"; command = "${pkgs.light}/bin/light -U 5";
} }
{ {
keys = [ 225 ]; keys = [225];
events = [ "key" ]; events = ["key"];
command = "${pkgs.light}/bin/light -A 5"; command = "${pkgs.light}/bin/light -A 5";
} }
]; ];
@@ -251,7 +237,7 @@
allowBitmaps = true; allowBitmaps = true;
useEmbeddedBitmaps = true; useEmbeddedBitmaps = true;
defaultFonts = { defaultFonts = {
monospace = [ "JetBrainsMono" ]; monospace = ["JetBrainsMono"];
}; };
}; };
@@ -320,14 +306,6 @@
users.users.akill = { users.users.akill = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;
extraGroups = [ extraGroups = ["wireshark" "kvm" "tty" "audio" "sound" "adbusers" "dialout"];
"wireshark"
"kvm"
"tty"
"audio"
"sound"
"adbusers"
"dialout"
];
}; };
} }

54
blue/hardware-configuration.nix
View File

@@ -6,77 +6,47 @@
lib, lib,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod"];
"xhci_pci" boot.initrd.kernelModules = [];
"ahci" boot.kernelModules = ["kvm-intel"];
"nvme" boot.extraModulePackages = [];
"usbhid"
"usb_storage"
"sd_mod"
"sr_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=root" "compress=zstd" "noatime"];
"subvol=root"
"compress=zstd"
"noatime"
];
}; };
boot.initrd.luks.devices."enc_root".device = boot.initrd.luks.devices."enc_root".device = "/dev/disk/by-uuid/8eb8ac22-d89d-4406-bfbd-ce43e283649f";
"/dev/disk/by-uuid/8eb8ac22-d89d-4406-bfbd-ce43e283649f";
fileSystems."/home" = { fileSystems."/home" = {
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=home" "compress=zstd" "noatime"];
"subvol=home"
"compress=zstd"
"noatime"
];
}; };
fileSystems."/nix" = { fileSystems."/nix" = {
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=nix" "compress=zstd" "noatime"];
"subvol=nix"
"compress=zstd"
"noatime"
];
}; };
fileSystems."/var/log" = { fileSystems."/var/log" = {
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=log" "compress=zstd" "noatime"];
"subvol=log"
"compress=zstd"
"noatime"
];
neededForBoot = true; neededForBoot = true;
}; };
fileSystems."/persist" = { fileSystems."/persist" = {
device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4"; device = "/dev/disk/by-uuid/0af4dcb9-6e59-4946-87b2-0d2f14b808d4";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=persist" "compress=zstd" "noatime"];
"subvol=persist"
"compress=zstd"
"noatime"
];
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
@@ -84,7 +54,7 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [];
# 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

29
common/packages.nix
View File

@@ -3,48 +3,34 @@
nix-xilinx, nix-xilinx,
system, system,
... ...
}: }: {
{ environment.systemPackages = with pkgs;
environment.systemPackages =
with pkgs;
[ [
acpi acpi
aria2
binutils binutils
binwalk
bluez bluez
bluez-tools bluez-tools
btop btop
busybox
curlHTTP3 curlHTTP3
dfu-util dfu-util
dhcpcd dhcpcd
direnv direnv
dmidecode dmidecode
dnsmasq dnsmasq
dnsutils
dtach dtach
ethtool
f2fs-tools
fd fd
file file
fio
fzf fzf
fzy fzy
git git
adwaita-icon-theme
gnomeExtensions.appindicator
gnupg gnupg
gptfdisk gptfdisk
hcxdumptool hcxdumptool
hdparm hdparm
htop-vim htop-vim
interception-tools interception-tools
iw
jq jq
lm_sensors lm_sensors
man-pages
man-pages-posix
meson meson
mosh mosh
msmtp msmtp
@@ -57,7 +43,6 @@
ntfs3g ntfs3g
ntfsprogs ntfsprogs
nvim nvim
nvme-cli
openhantek6022 openhantek6022
optipng optipng
pax-utils pax-utils
@@ -70,7 +55,6 @@
rsync rsync
silver-searcher silver-searcher
socat socat
sops
sshfs sshfs
strace strace
swaylock swaylock
@@ -91,15 +75,8 @@
wirelesstools wirelesstools
wol wol
xdg-utils xdg-utils
xfsprogs
zip zip
z-lua z-lua
] ]
++ (with nix-xilinx.packages.${system}; [ ++ (with nix-xilinx.packages.${system}; [vivado vitis vitis_hls model_composer xilinx-shell]);
vivado
vitis
vitis_hls
model_composer
xilinx-shell
]);
} }

42
common/secrets/wg_preshared.yaml
View File

@@ -1,42 +0,0 @@
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: []
azure_kv: []
hc_vault: []
age:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzQ3JGNWRMeGhwM1dIOU5T
ZEt4WVhFa2lSaklpM3hmR04wY213TGd6K1FvCnltWFpqNHdrQ2V1V2ZDdTVOYlhP
M0x2TVRJbUtZK2xaOGE5Ri93YmV6R1UKLS0tIDQ3VkNrYjFNTjNrRTNFRmhYaENt
ZkRpMnZ3ZldOdWJ3VGw1T1RnRG15WDQKeZ9VBkcu2j83Hjofy1AAtBBqM9Tk3uFi
F/wgzV7mBXiBB/4w17iJsU5mB6s/JXXnGq11pu9QXC5tu072huCNYQ==
-----END AGE ENCRYPTED FILE-----
- recipient: age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBheWtsbnArT3BwSVJ4QTJB
ZENTK2ZpS0lLUmJ1d1VaUVVGNnNXMEZ4RFJvCmFueFNiQjk5MkdnTVkvVVk1TkVV
M2Izamo0M1lGaVRPaGFOQUhkNGpmSmsKLS0tIGxtSXVackdsTTN1cTIvSEo4bGg3
a0dVL2FmL05TRllrZjBuOStPNTBHcU0KOaJFNhr0emSiAJFOFsaJ4sdUwjzg5TOW
Mh3JvRJINefiBUsFnFx8d3gn0+jHn+kXw22WMGRcbGgZTxJbFylmeA==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5UVJiMENSeFdGWHRVVkt0
UEI4ek9jRFdYYkN5Nlc5Qi85MDhPRTA2bGt3CnZJcThNU1huczJGaEF6WWpzcHdV
dWhIczMzWSt0ZEVXeXdVQlBOZTZsN3cKLS0tIHRBQlhPT1FDcEZWU3JyNEZ0UWxC
eDhXVWo2UHVCaFUrak9aVEU5N0FxRVEKDKBpbHWwTkW3BFAXQ213/glZyTz88OjZ
JHh0phDzFZG0+nzBz3TAi0ZyYnlbOYAuEvQh1uUg9MI1XUCr8GC9Qw==
-----END AGE ENCRYPTED FILE-----
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

8
common/suspend.nix
View File

@@ -4,11 +4,9 @@
pkgs, pkgs,
... ...
}: }:
with lib; with lib; let
let
cfg = config.services.batteryNotifier; cfg = config.services.batteryNotifier;
in in {
{
options = { options = {
services.batteryNotifier = { services.batteryNotifier = {
enable = mkOption { enable = mkOption {
@@ -44,7 +42,7 @@ in
timerConfig.OnBootSec = "1m"; timerConfig.OnBootSec = "1m";
timerConfig.OnUnitInactiveSec = "1m"; timerConfig.OnUnitInactiveSec = "1m";
timerConfig.Unit = "lowbatt.service"; timerConfig.Unit = "lowbatt.service";
wantedBy = [ "timers.target" ]; wantedBy = ["timers.target"];
}; };
systemd.user.services."lowbatt" = { systemd.user.services."lowbatt" = {
description = "battery level notifier"; description = "battery level notifier";

1
common/wg_pubkey_proton
View File

@@ -1 +0,0 @@
g6DkXWKI/68RsLjROIwCEcyB/ZhyK5Q7OWcz1TtqER0=

1
common/wg_pubkey_workstation
View File

@@ -1 +0,0 @@
kbmzzQc3bBpkjE7K/ohycZtx+ml+dzVYOQ2xM0/bzzQ=

247
flake.lock generated
View File

@@ -19,11 +19,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732722421, "lastModified": 1696426674,
"narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -33,6 +33,22 @@
} }
}, },
"flake-compat_2": { "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, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@@ -48,7 +64,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": { "flake-compat_4": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@@ -64,6 +80,39 @@
"type": "github" "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": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
@@ -82,6 +131,30 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -89,33 +162,32 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736373539, "lastModified": 1711868868,
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "narHash": "sha256-QpZanlbVu6Gb2K96u3vgu0F2BvZD74+fOsIFWcYEXoY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "rev": "30f2ec39519f4f5a8a96af808c439e730c15aeab",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nix-xilinx": { "nix-xilinx": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1732892167, "lastModified": 1699035130,
"narHash": "sha256-AZ0rgM9xj+Bf2C8RfGMUvuVdcqkvQU5/Wm8u6A5xYJg=", "narHash": "sha256-emK4aJCC2gW94b2P3N2LjkQ6PEMLUcDduVWwYQ7aq+o=",
"owner": "asmir.abdulahovic", "owner": "asmir.abdulahovic",
"repo": "nix-xilinx", "repo": "nix-xilinx",
"rev": "3071f40914fe2db3837a40a72a97af6f0a442f16", "rev": "0323990db46c32e361e4fd70600d859eb90862af",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -126,33 +198,52 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738574474, "lastModified": 1711703276,
"narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=", "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c", "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-24_11": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1734083684, "dir": "lib",
"narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "lastModified": 1701253981,
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "dir": "lib",
"ref": "nixos-24.11", "owner": "NixOS",
"type": "indirect" "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1711819797,
"narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.11",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nvim": { "nvim": {
@@ -162,11 +253,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736528609, "lastModified": 1712935714,
"narHash": "sha256-p0tYmTVnnFghamXEXD4w/lldCi604zIWDV4Ol9ubQ5g=", "narHash": "sha256-zGo9wiDH+qn4Mky70CJEvST1gGgMM/VMajAjsgNdOqk=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "8245a48cc75cc74dea1b3ca89cb58f24f8e14f85", "rev": "ba6b926cc4f6d65015271ebe7edd22269af77840",
"revCount": 42, "revCount": 31,
"type": "git", "type": "git",
"url": "https://git.project-cloud.net/asmir/nvim_flake" "url": "https://git.project-cloud.net/asmir/nvim_flake"
}, },
@@ -177,7 +268,7 @@
}, },
"peerix": { "peerix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@@ -206,11 +297,11 @@
"theme_deepthought": "theme_deepthought" "theme_deepthought": "theme_deepthought"
}, },
"locked": { "locked": {
"lastModified": 1729077289, "lastModified": 1705870326,
"narHash": "sha256-z5LEPxOJq2LjhPhY4QE1IOt0lBD39cipR6Lw8vRTNlI=", "narHash": "sha256-ojdGSeqztnnGMyLKjnSCGq0muGh3U+Zb9iwzaaDsaF4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "eab712e42139d33911ba767c2ff1bfbdf05c254d", "rev": "ad6af66a6142279789db8967b285eb04c6d18c02",
"revCount": 27, "revCount": 26,
"type": "git", "type": "git",
"url": "https://git.project-cloud.net/asmir/project-cloud" "url": "https://git.project-cloud.net/asmir/project-cloud"
}, },
@@ -221,6 +312,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"goatcounter": "goatcounter",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-xilinx": "nix-xilinx", "nix-xilinx": "nix-xilinx",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
@@ -236,18 +328,18 @@
"simple-nixos-mailserver": { "simple-nixos-mailserver": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-24_11": "nixpkgs-24_11" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1737736848, "lastModified": 1710449465,
"narHash": "sha256-VrUfCXBXYV+YmQ2OvVTeML9EnmaPRtH+POrNIcJp6yo=", "narHash": "sha256-2orO8nfplp6uQJBFqKkj1iyNMC6TysmwbWwbb4osTag=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "6b425d13f5a9d73cb63973d3609acacef4d1e261", "rev": "79c8cfcd5873a85559da6201b116fb38b490d030",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -260,14 +352,15 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ],
"nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1738291974, "lastModified": 1711855048,
"narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -311,6 +404,21 @@
"type": "github" "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": { "theme_anemone": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -343,6 +451,45 @@
"type": "github" "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": { "zremap": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -350,17 +497,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737802495, "lastModified": 1696448728,
"narHash": "sha256-Q+bZnH7uQM5T/G+xCGSRU3bTJqD70NeE4vLXLXLCm7k=", "narHash": "sha256-kUc6983IX9n0eQxTFZRK7LYCLHoxoGZ5rOV7nu8hGRI=",
"ref": "refs/heads/master", "owner": "asmir.abdulahovic",
"rev": "4962f12867b0b6c4c4d39b98e6016e7f925a802c", "repo": "zremap",
"revCount": 23, "rev": "9043844893cfc333ed04d04c1d3b67d9904c0afc",
"type": "git", "type": "gitlab"
"url": "https://git.project-cloud.net/asmir/zremap"
}, },
"original": { "original": {
"type": "git", "owner": "asmir.abdulahovic",
"url": "https://git.project-cloud.net/asmir/zremap" "repo": "zremap",
"type": "gitlab"
} }
} }
}, },

60
flake.nix
View File

@@ -2,7 +2,7 @@
description = "NixOS configuration"; description = "NixOS configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nix-xilinx = { nix-xilinx = {
url = "gitlab:asmir.abdulahovic/nix-xilinx"; url = "gitlab:asmir.abdulahovic/nix-xilinx";
@@ -15,7 +15,7 @@
}; };
zremap = { zremap = {
url = "git+https://git.project-cloud.net/asmir/zremap"; url = "gitlab:asmir.abdulahovic/zremap";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@@ -34,8 +34,13 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
goatcounter = {
url = "github:asmir-abdulahovic/goatcounter-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.11"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@@ -50,8 +55,8 @@
}; };
}; };
outputs = outputs = inputs @ {
inputs@{ goatcounter,
home-manager, home-manager,
nixpkgs, nixpkgs,
nix-xilinx, nix-xilinx,
@@ -63,18 +68,16 @@
swaysw, swaysw,
zremap, zremap,
... ...
}: }: let
let
pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs; pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
in in {
{
nixosConfigurations = rec { nixosConfigurations = rec {
nixy = nixpkgs.lib.nixosSystem rec { nixy = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{ _module.args = inputs; } {_module.args = inputs;}
{ _module.args.system = system; } {_module.args.system = system;}
{ nix.registry.nixpkgs.flake = nixpkgs; } {nix.registry.nixpkgs.flake = nixpkgs;}
./common/packages.nix ./common/packages.nix
./common/suspend.nix ./common/suspend.nix
./nixy/configuration.nix ./nixy/configuration.nix
@@ -85,8 +88,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.akill = import ./home/home.nix; home-manager.users.akill = import ./home/home.nix;
home-manager.extraSpecialArgs = { inherit inputs system; }; home-manager.extraSpecialArgs = {inherit inputs system;};
home-manager.backupFileExtension = "home_backup";
} }
peerix.nixosModules.peerix peerix.nixosModules.peerix
{ {
@@ -106,9 +108,9 @@
mediabox = nixpkgs.lib.nixosSystem rec { mediabox = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{ _module.args = inputs; } {_module.args = inputs;}
{ _module.args.system = system; } {_module.args.system = system;}
{ nix.registry.nixpkgs.flake = nixpkgs; } {nix.registry.nixpkgs.flake = nixpkgs;}
./common/packages.nix ./common/packages.nix
./common/suspend.nix ./common/suspend.nix
./mediabox/configuration.nix ./mediabox/configuration.nix
@@ -120,7 +122,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.akill = import ./home/home.nix; home-manager.users.akill = import ./home/home.nix;
home-manager.extraSpecialArgs = { inherit inputs system; }; home-manager.extraSpecialArgs = {inherit inputs system;};
} }
peerix.nixosModules.peerix peerix.nixosModules.peerix
{ {
@@ -140,9 +142,9 @@
blue = nixpkgs.lib.nixosSystem rec { blue = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
{ _module.args = inputs; } {_module.args = inputs;}
{ _module.args.system = system; } {_module.args.system = system;}
{ nix.registry.nixpkgs.flake = nixpkgs; } {nix.registry.nixpkgs.flake = nixpkgs;}
./blue/configuration.nix ./blue/configuration.nix
./blue/hardware-configuration.nix ./blue/hardware-configuration.nix
./common/packages.nix ./common/packages.nix
@@ -151,19 +153,19 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.akill = import ./home/home.nix; home-manager.users.akill = import ./home/home.nix;
home-manager.extraSpecialArgs = { inherit inputs system; }; home-manager.extraSpecialArgs = {inherit inputs system;};
} }
]; ];
}; };
magpie = nixpkgs.lib.nixosSystem rec { magpie = nixpkgs.lib.nixosSystem rec {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ modules = [
{ _module.args = inputs; } {_module.args = inputs;}
{ _module.args.system = system; } {_module.args.system = system;}
{ nix.registry.nixpkgs.flake = nixpkgs; } {nix.registry.nixpkgs.flake = nixpkgs;}
./magpie/configuration.nix ./magpie/configuration.nix
./magpie/hardware-configuration.nix ./magpie/hardware-configuration.nix
goatcounter.nixosModules.goatcounter
simple-nixos-mailserver.nixosModule simple-nixos-mailserver.nixosModule
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
(builtins.toPath "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix") (builtins.toPath "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix")
@@ -172,11 +174,7 @@
}; };
devShell.x86_64-linux = pkgs.mkShell { devShell.x86_64-linux = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [sops ssh-to-age age];
sops
ssh-to-age
age
];
shellHook = '' shellHook = ''
echo "Configuring NixOS!" echo "Configuring NixOS!"
''; '';

110
home/home.nix
View File

@@ -1,22 +1,13 @@
{ {
lib,
pkgs, pkgs,
config,
... ...
}: }: let
let
qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" '' qutebrowser_firejail = pkgs.writeShellScriptBin "qutebrowser" ''
firejail -- ${lib.getExe pkgs.qutebrowser} "$@" firejail -- ${pkgs.qutebrowser}/bin/qutebrowser "$@"
''; '';
in in {
{ imports = [./zsh.nix ./i3status-rust.nix ./sway.nix ./i3.nix ./home_packages.nix ./whatsapp-for-linux.nix];
imports = [
./zsh.nix
./i3status-rust.nix
./sway.nix
./i3.nix
./home_packages.nix
./whatsapp-for-linux.nix
];
home.stateVersion = "22.11"; home.stateVersion = "22.11";
home.username = "akill"; home.username = "akill";
@@ -27,7 +18,6 @@ in
enable = true; enable = true;
defaultApplications = { defaultApplications = {
"application/pdf" = "sioyek.desktop"; "application/pdf" = "sioyek.desktop";
"default-web-browser" = "org.qutebrowser.qutebrowser.desktop";
"text/html" = "org.qutebrowser.qutebrowser.desktop"; "text/html" = "org.qutebrowser.qutebrowser.desktop";
"x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop"; "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
"x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop"; "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
@@ -39,20 +29,17 @@ in
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home.sessionVariables = rec { home.sessionVariables = rec {
BROWSER = lib.getExe qutebrowser_firejail; BROWSER = "${qutebrowser_firejail}/bin/qutebrowser";
DEFAULT_BROWSER = "${BROWSER}"; DEFAULT_BROWSER = "${BROWSER}";
EDITOR = "nvim"; EDITOR = "nvim";
_JAVA_AWT_WM_NONREPARENTING = "1"; _JAVA_AWT_WM_NONREPARENTING = "1";
MOZ_ENABLE_WAYLAND = "1"; MOZ_ENABLE_WAYLAND = "1";
NIXOS_OZONE_WL = "1";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
SUDO_EDITOR = "nvim"; SUDO_EDITOR = "nvim";
WLR_RENDERER = "vulkan"; WLR_RENDERER = "vulkan";
}; };
wayland.windowManager.sway = { wayland.windowManager.sway = {enable = true;};
enable = true;
};
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
@@ -71,11 +58,7 @@ in
clock24 = true; clock24 = true;
keyMode = "vi"; keyMode = "vi";
terminal = "screen-256color"; terminal = "screen-256color";
plugins = with pkgs.tmuxPlugins; [ plugins = with pkgs.tmuxPlugins; [sysstat net-speed gruvbox];
sysstat
net-speed
gruvbox
];
}; };
mpv = { mpv = {
@@ -152,9 +135,7 @@ in
font = "JetBrainsMono:size=10"; font = "JetBrainsMono:size=10";
dpi-aware = "yes"; dpi-aware = "yes";
}; };
mouse = { mouse = {hide-when-typing = "yes";};
hide-when-typing = "yes";
};
}; };
}; };
@@ -199,13 +180,8 @@ in
userName = "Asmir A"; userName = "Asmir A";
userEmail = "asmir.abdulahovic@gmail.com"; userEmail = "asmir.abdulahovic@gmail.com";
extraConfig = { extraConfig = {
init.defaultBranch = "master"; pull = {rebase = true;};
pull = { credential = {helper = "store";};
rebase = true;
};
credential = {
helper = "store";
};
}; };
signing.key = "020C42B7A9ABA3E2"; signing.key = "020C42B7A9ABA3E2";
signing.signByDefault = true; signing.signByDefault = true;
@@ -213,14 +189,7 @@ in
obs-studio = { obs-studio = {
enable = true; enable = true;
plugins = with pkgs.obs-studio-plugins; [ plugins = with pkgs.obs-studio-plugins; [obs-vkcapture input-overlay obs-multi-rtmp obs-pipewire-audio-capture wlrobs obs-vaapi];
obs-vkcapture
input-overlay
obs-multi-rtmp
obs-pipewire-audio-capture
wlrobs
obs-vaapi
];
}; };
i3status-rust.enable = true; i3status-rust.enable = true;
@@ -248,17 +217,14 @@ in
enableSshSupport = true; enableSshSupport = true;
}; };
swayidle = swayidle = let
let
locker = pkgs.writeShellScriptBin "swaylock_fancy" '' locker = pkgs.writeShellScriptBin "swaylock_fancy" ''
TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg) TMP_FILE=$(${pkgs.coreutils}/bin/mktemp /tmp/.swaylock_ss_XXXXXX.jpg)
${lib.getExe pkgs.grim} -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE" ${pkgs.grim}/bin/grim -t ppm - | ${pkgs.imagemagick}/bin/convert - -blur 0x12 "$TMP_FILE"
${lib.getExe pkgs.swaylock} -f -i "$TMP_FILE" ${pkgs.swaylock}/bin/swaylock -f -i "$TMP_FILE"
${pkgs.coreutils}/bin/shred "$TMP_FILE"
${pkgs.coreutils}/bin/rm "$TMP_FILE" ${pkgs.coreutils}/bin/rm "$TMP_FILE"
''; '';
in in {
{
enable = true; enable = true;
events = [ events = [
{ {
@@ -281,55 +247,23 @@ in
} }
]; ];
}; };
kanshi = {
enable = true;
settings = [
{
profile.name = "undocked";
profile.outputs = [
{
criteria = "eDP-1";
}
];
}
{
profile.name = "docked";
profile.outputs = [
{
criteria = "eDP-1";
position = "3840,0";
}
{
criteria = "Philips Consumer Electronics Company PHL 272S1 UHB2347026536";
mode = "1920x1080@74.973Hz";
position = "5760,0";
}
{
criteria = "Philips Consumer Electronics Company PHL 272S1 UHB2347026535";
mode = "1920x1080@74.973Hz";
position = "7680,0";
}
];
}
];
};
}; };
systemd.user = { systemd.user = {
services = { services = {
wayland-pipewire-idle-inhibit = { /*
Unit.Description = "inhibit sleep while audio output is active"; himalaya = {
Unit.Description = "Himalaya new messages notifier";
Service = { Service = {
ExecStart = "${lib.getExe pkgs.wayland-pipewire-idle-inhibit}"; ExecStart = "himalaya notify";
Restart = "always"; Restart = "always";
RestartSec = 10; RestartSec = 10;
}; };
Install = { Install = {
WantedBy = [ "graphical-session.target" ]; WantedBy = [ "multi-user.target" ];
}; };
}; };
*/
}; };
}; };
} }

64
home/home_packages.nix
View File

@@ -1,22 +1,14 @@
{ {
lib,
pkgs, pkgs,
inputs, inputs,
system, system,
... ...
}: }: let
let
chromium_teams = pkgs.writeShellScriptBin "chromium_teams" '' chromium_teams = pkgs.writeShellScriptBin "chromium_teams" ''
${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/ ${pkgs.chromium}/bin/chromium --socket=wayland org.chromium.Chromium --app=https://teams.microsoft.com/
''; '';
chromium_discord = pkgs.writeShellScriptBin "chromium_discord" '' chromium_discord = pkgs.writeShellScriptBin "chromium_discord" ''
${lib.getExe pkgs.ungoogled-chromium} --socket=wayland org.chromium.Chromium --app=https://discordapp.com/channels/@me ${pkgs.chromium}/bin/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" '' ssh_proxy = pkgs.writeShellScriptBin "ssh_proxy" ''
if ${pkgs.coreutils}/bin/test $# -ne 1; then if ${pkgs.coreutils}/bin/test $# -ne 1; then
@@ -24,11 +16,10 @@ let
exit exit
fi fi
PROXY_PORT="1337" PROXY_PORT="1337"
${lib.getExe pkgs.openssh} -D "$PROXY_PORT" -q -N "$@" ${pkgs.openssh}/bin/ssh -D "$PROXY_PORT" -q -N "$@"
''; '';
wrap_sh = wrap_sh = let
let bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix {};
bubblewrap = pkgs.callPackage ../packages/bubblewrap/default.nix { };
in in
pkgs.writeShellScriptBin "wrap.sh" '' pkgs.writeShellScriptBin "wrap.sh" ''
if ${pkgs.coreutils-full}/bin/test $# -ne 1; then if ${pkgs.coreutils-full}/bin/test $# -ne 1; then
@@ -43,10 +34,8 @@ let
--tmp-overlay "$FULL_PATH" \ --tmp-overlay "$FULL_PATH" \
"$SHELL" "$SHELL"
''; '';
in in {
{ home.packages = with pkgs;
home.packages =
with pkgs;
[ [
anydesk anydesk
appimage-run appimage-run
@@ -58,16 +47,13 @@ in
cached-nix-shell cached-nix-shell
caddy caddy
cargo cargo
ungoogled-chromium chromium
cmake cmake
compsize compsize
# cura cura
deluge deluge
dfu-util
discord discord
dmenu-wayland dmenu-wayland
drawio
dualsensectl
ffmpeg-full ffmpeg-full
firefox firefox
freecad freecad
@@ -79,9 +65,7 @@ in
gnumake gnumake
go go
grim grim
heimdall
hyperfine hyperfine
icestorm
imagemagick imagemagick
imv imv
inkscape inkscape
@@ -91,61 +75,44 @@ in
kodi-wayland kodi-wayland
krita krita
libnotify libnotify
libreoffice-qt6-fresh libreoffice
libva-utils libva-utils
linuxPackages_latest.perf
lsix
lsix
mediainfo mediainfo
ncdu ncdu
neovide neovide
nextpnr
ngspice ngspice
nix-init nix-init
nixpkgs-fmt nixpkgs-fmt
nix-prefetch-git nix-prefetch-git
nodePackages.peerflix nodePackages.peerflix
nom
openems
openocd openocd
openscad openscad
pandoc pandoc
paraview
pass-wayland pass-wayland
patchelf patchelf
pavucontrol pavucontrol
pay-respects
pirate-get pirate-get
poppler_utils poppler_utils
powertop powertop
pulsemixer pulsemixer
pwvucontrol
python3 python3
python3Packages.west python3Packages.west
remmina remmina
river river
rizin
rtorrent rtorrent
sbcl
screen screen
seer seer
sioyek sioyek
skypeforlinux skypeforlinux
slurp slurp
steam-run
stm32cubemx stm32cubemx
swayimg
tea tea
teams-for-linux teams-for-linux
tectonic
tessen
texlive.combined.scheme-full texlive.combined.scheme-full
thunderbird thunderbird
typst
upx upx
waybar waybar
wdisplays wdisplays
weechat
whatsapp-for-linux whatsapp-for-linux
wine wine
wireshark wireshark
@@ -154,24 +121,21 @@ in
wofi wofi
x2goclient x2goclient
yewtube yewtube
yosys
yt-dlp yt-dlp
zapzap zapzap
zathura zathura
# zeal-qt6 zeal-qt6
zig zig
] ]
++ [ ++ [
chromium_discord chromium_discord
chromium_stackfield
chromium_teams chromium_teams
ssh_proxy ssh_proxy
wrap_sh wrap_sh
qcad
] ]
++ [ ++ [
inputs.swaysw.packages.${system}.swaysw inputs.swaysw.packages.${system}.swaysw
(pkgs.callPackage ../packages/viber/default.nix { }) (pkgs.callPackage ../packages/viber/default.nix {})
(pkgs.callPackage ../packages/bubblewrap/default.nix { }) (pkgs.callPackage ../packages/bubblewrap/default.nix {})
]; ];
} }

34
home/i3.nix
View File

@@ -1,12 +1,11 @@
{ {
config,
lib, lib,
pkgs, pkgs,
... ...
}: }: let
let
scratchpad_cmd = "floating enable, resize set 1502 845, move position center, move scratchpad, scratchpad show"; scratchpad_cmd = "floating enable, resize set 1502 845, move position center, move scratchpad, scratchpad show";
in in {
{
xsession.windowManager.i3 = { xsession.windowManager.i3 = {
enable = true; enable = true;
package = pkgs.i3; package = pkgs.i3;
@@ -55,28 +54,24 @@ in
"${modifier}+Escape" = "workspace back_and_forth"; "${modifier}+Escape" = "workspace back_and_forth";
"${modifier}+p" = "exec ${pkgs.dmenu}/bin/dmenu_run"; "${modifier}+p" = "exec ${pkgs.dmenu}/bin/dmenu_run";
"Mod4+l" = "Mod4+l" = "exec i3-msg [instance=\"python3_scr\"] scratchpad show || exec alacritty --class python3_scr -e python3";
"exec i3-msg [instance=\"python3_scr\"] scratchpad show || exec alacritty --class python3_scr -e python3";
"Mod4+j" = "exec i3-msg [class=\"ViberPC\"] scratchpad show || exec viber"; "Mod4+j" = "exec i3-msg [class=\"ViberPC\"] scratchpad show || exec viber";
"Mod4+m" = "exec i3-msg [class=\"Thunderbird\"] scratchpad show || exec thunderbird"; "Mod4+m" = "exec i3-msg [class=\"Thunderbird\"] scratchpad show || exec thunderbird";
"Mod4+y" = "Mod4+y" = "exec i3-msg [instance=\"pulsemixer_scr\"] scratchpad show || exec alacritty --class pulsemixer_scr -e pulsemixer";
"exec i3-msg [instance=\"pulsemixer_scr\"] scratchpad show || exec alacritty --class pulsemixer_scr -e pulsemixer";
}; };
window = { window = {
# border = 4; /*
border = 4;
*/
commands = [ commands = [
{ {
command = scratchpad_cmd; command = scratchpad_cmd;
criteria = { criteria = {instance = "pulsemixer_scr|python3_scr";};
instance = "pulsemixer_scr|python3_scr";
};
} }
{ {
command = scratchpad_cmd; command = scratchpad_cmd;
criteria = { criteria = {class = "Thunderbird";};
class = "Thunderbird";
};
} }
{ {
command = scratchpad_cmd; command = scratchpad_cmd;
@@ -87,9 +82,7 @@ in
} }
{ {
command = "focus child, layout tabbed, focus"; command = "focus child, layout tabbed, focus";
criteria = { criteria = {class = "qutebrowser";};
class = "qutebrowser";
};
} }
]; ];
}; };
@@ -98,10 +91,7 @@ in
{ {
position = "top"; position = "top";
fonts = { fonts = {
names = [ names = ["DejaVu Sans Mono" "FontAwesome5Free"];
"DejaVu Sans Mono"
"FontAwesome5Free"
];
style = "Fixed Bold SemiCondensed"; style = "Fixed Bold SemiCondensed";
size = 7.0; size = 7.0;
}; };

18
home/i3status-rust.nix
View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
programs.i3status-rust = { programs.i3status-rust = {
bars.top = { bars.top = {
icons = "awesome5"; icons = "awesome5";
@@ -19,15 +18,7 @@
} }
{ {
block = "disk_space"; block = "disk_space";
path = "/nix"; path = "/";
info_type = "available";
interval = 20;
warning = 20.0;
alert = 10.0;
}
{
block = "disk_space";
path = "/home";
info_type = "available"; info_type = "available";
interval = 20; interval = 20;
warning = 20.0; warning = 20.0;
@@ -43,11 +34,6 @@
device = "enp5s0"; device = "enp5s0";
interval = 2; interval = 2;
} }
{
block = "net";
device = "enp7s0f3u1u1";
interval = 2;
}
{ {
block = "net"; block = "net";
device = "eno1"; device = "eno1";

75
home/sway.nix
View File

@@ -1,34 +1,31 @@
{ {
config,
pkgs, pkgs,
inputs, inputs,
system, system,
lib,
... ...
}: }: let
let
cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" '' cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" ''
${lib.getExe pkgs.cliphist} list | \ ${pkgs.cliphist}/bin/cliphist list | \
${lib.getExe pkgs.wofi} --dmenu --insensitive | \ ${pkgs.wofi}/bin/wofi --dmenu --insensitive | \
${lib.getExe pkgs.cliphist} decode | \ ${pkgs.cliphist}/bin/cliphist decode | \
${pkgs.wl-clipboard}/bin/wl-copy ${pkgs.wl-clipboard}/bin/wl-copy
''; '';
screenshot_clip = pkgs.writeShellScriptBin "screenshot_clip" '' screenshot_clip = pkgs.writeShellScriptBin "screenshot_clip" ''
GEOM="$(${lib.getExe pkgs.slurp} -d)" GEOM="$(${pkgs.slurp}/bin/slurp -d)"
${lib.getExe pkgs.grim} -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy ${pkgs.grim}/bin/grim -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy
''; '';
swaysw = inputs.swaysw.packages.${system}.swaysw; swaysw = inputs.swaysw.packages.${system}.swaysw;
viber = pkgs.callPackage ../packages/viber/default.nix { }; viber = pkgs.callPackage ../packages/viber/default.nix {};
term = "${pkgs.foot}/bin/footclient"; term = "${pkgs.foot}/bin/footclient";
in in {
{
wayland.windowManager.sway = { wayland.windowManager.sway = {
enable = true; enable = true;
extraSessionCommands = ""; extraSessionCommands = "";
extraConfigEarly = '''';
config = { config = {
fonts = { fonts = {
names = [ "JetBrainsMono" ]; names = ["JetBrainsMono"];
style = "Bold Semi-Condensed"; style = "Bold Semi-Condensed";
size = 11.0; size = 11.0;
}; };
@@ -36,29 +33,23 @@ in
window.commands = [ window.commands = [
{ {
command = "move scratchpad, resize set 1152 648"; command = "move scratchpad, resize set 1152 648";
criteria = { criteria = {app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber";};
app_id = "pulsemixer|python3|com.rtosta.zapzap|whatsapp-for-linux|com.viber";
};
} }
{ {
command = "move scratchpad, resize set 1502 845"; command = "move scratchpad, resize set 1502 845";
criteria = { criteria = {app_id = "com.viber";};
app_id = "com.viber";
};
} }
{ {
command = "floating enable"; command = "floating enable";
criteria = { criteria = {app_id = "sws_cli";};
app_id = "sws_cli";
};
} }
]; ];
modifier = "Mod4"; modifier = "Mod4";
output = { output = {
eDP-1 = { eDP-1 = {
/*
bg = "~/pic/wallpaper stretch"; bg = "~/pic/wallpaper stretch";
/*
scale = "1.4"; scale = "1.4";
*/ */
}; };
@@ -69,36 +60,27 @@ in
}; };
input = { input = {
"type:keyboard" = { "type:keyboard" = {repeat_delay = "150";};
repeat_delay = "150"; "type:keyboard" = {repeat_rate = "70";};
}; "type:touchpad" = {tap = "enabled";};
"type:keyboard" = {
repeat_rate = "70";
};
"type:touchpad" = {
tap = "enabled";
};
}; };
bars = [ bars = [
{ {
position = "top"; position = "top";
fonts = { fonts = {
names = [ names = ["Iosevka" "FontAwesome"];
"Iosevka"
"FontAwesome"
];
style = "Bold Semi-Condensed"; style = "Bold Semi-Condensed";
size = 12.0; size = 12.0;
}; };
statusCommand = "${lib.getExe pkgs.i3status-rust} ~/.config/i3status-rust/config-top.toml"; statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-top.toml";
} }
]; ];
keybindings = { keybindings = {
"Alt+Shift+q" = "kill"; "Alt+Shift+q" = "kill";
"Alt+Shift+Return" = "exec ${term}"; "Alt+Shift+Return" = "exec ${term}";
"Alt+p" = "exec ${pkgs.bemenu}/bin/bemenu-run"; "Alt+p" = "exec ${pkgs.dmenu-wayland}/bin/dmenu-wl_run -fn \"mono 14\"";
"Alt+c" = "exec ${pkgs.moreutils}/bin/lckdo cliphist_sway ${cliphist_sway}/bin/cliphist_sway"; "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"; "Print" = "exec ${pkgs.moreutils}/bin/lckdo screenshot_clip ${screenshot_clip}/bin/screenshot_clip";
@@ -138,18 +120,13 @@ in
"Alt+slash" = "exec ${pkgs.moreutils}/bin/lckdo swaysw ${swaysw}/bin/swaysw"; "Alt+slash" = "exec ${pkgs.moreutils}/bin/lckdo swaysw ${swaysw}/bin/swaysw";
"Alt+Escape" = "workspace back_and_forth"; "Alt+Escape" = "workspace back_and_forth";
"Alt+f" = "fullscreen enable"; "Alt+f" = "fullscreen enable";
"Alt+bracketright" = "focus output right";
"Alt+bracketleft" = "focus output left";
"Mod4+l" = "Mod4+l" = ''
''exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${lib.getExe pkgs.python3}''; exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${pkgs.python3}/bin/python3'';
"Mod4+j" = "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=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+h" = "Mod4+y" = ''
"exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber"; exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${pkgs.pulsemixer}/bin/pulsemixer'';
"Mod4+y" =
''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";
}; };
}; };
}; };

7
home/whatsapp-for-linux.nix
View File

@@ -1,8 +1,7 @@
{ lib, ... }: {lib, ...}:
with lib; with lib; {
{
xdg.configFile."whatsapp-for-linux/settings.conf".source = builtins.toFile "settings.conf" ( xdg.configFile."whatsapp-for-linux/settings.conf".source = builtins.toFile "settings.conf" (
generators.toINI { } { generators.toINI {} {
General = { General = {
zoom_level = 1; zoom_level = 1;
close_to_tray = false; close_to_tray = false;

35
home/zsh.nix
View File

@@ -1,5 +1,4 @@
{ pkgs, lib, ... }: {pkgs, ...}: {
{
programs.z-lua = { programs.z-lua = {
enableAliases = true; enableAliases = true;
enableZshIntegration = true; enableZshIntegration = true;
@@ -8,16 +7,16 @@
programs.zsh = { programs.zsh = {
autocd = true; autocd = true;
enableCompletion = false; enableCompletion = false;
syntaxHighlighting.enable = true;
defaultKeymap = "viins"; defaultKeymap = "viins";
shellAliases = { shellAliases = {
cfind = "${pkgs.cscope}/bin/cscope -C -R -L1"; cfind = "cscope -C -R -L1";
chmod = "chmod -v"; chmod = "chmod -v";
chown = "chown -v"; chown = "chown -v";
cp = "cp -v"; cp = "cp -v";
rm = "rm -v"; rm = "rm -v";
ip = "ip --color=auto"; ip = "ip --color=auto";
f = "''$(${lib.getExe pkgs.pay-respects} zsh)";
}; };
history = { history = {
@@ -38,13 +37,18 @@
src = pkgs.nix-zsh-completions; src = pkgs.nix-zsh-completions;
file = "share/zsh/plugins/nix/nix-zsh-completions.plugin.zsh"; 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"; name = "pure_prompt";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "sindresorhus"; owner = "sindresorhus";
repo = "pure"; repo = "pure";
rev = "92b8e9057988566b37ff695e70e2e9bbeb7196c8"; rev = "a02209d36c8509c0e62f44324127632999c9c0cf";
hash = "sha256-TbOrnhLHgOvcfsgmL0l3bWY33yLIhG1KSi4ITIPq1+A="; hash = "sha256-BmQO4xqd/3QnpLUitD2obVxL0UulpboT8jGNEh4ri8k=";
}; };
file = "pure.plugin.zsh"; file = "pure.plugin.zsh";
} }
@@ -63,11 +67,6 @@
}; };
file = "sudo.plugin.zsh"; file = "sudo.plugin.zsh";
} }
{
name = "zsh-fast-syntax-highlighting";
src = pkgs.zsh-fast-syntax-highlighting;
file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
}
]; ];
envExtra = ''''; envExtra = '''';
@@ -92,23 +91,11 @@
ls; ls;
} }
function osc7-pwd() {
emulate -L zsh # also sets localoptions for us
setopt extendedglob
local LC_ALL=C
printf '\e]7;file://%s%s\e\' $HOST ''${PWD//(#m)([^@-Za-z&-;_~])/%''${(l:2::0:)''$(([##16]#MATCH))}}
}
function chpwd-osc7-pwd() {
(( ZSH_SUBSHELL )) || osc7-pwd
}
add-zsh-hook -Uz chpwd chpwd-osc7-pwd
eval "$(direnv hook zsh)" eval "$(direnv hook zsh)"
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
if [[ -n "$PS1" ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then if [[ -n "$PS1" ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then
TMUX_EXE="${lib.getExe pkgs.tmux}" TMUX_EXE="${pkgs.tmux}/bin/tmux"
systemd-run --scope --user $TMUX_EXE attach-session -t $USER || systemd-run --scope --user $TMUX_EXE new-session -s $USER systemd-run --scope --user $TMUX_EXE attach-session -t $USER || systemd-run --scope --user $TMUX_EXE new-session -s $USER
fi fi

185
magpie/configuration.nix
View File

@@ -3,60 +3,32 @@
pkgs, pkgs,
lib, lib,
project-cloud, project-cloud,
goatcounter,
nvim, nvim,
system, system,
... ...
}: }: {
{ imports = [];
imports = [ ];
nix.optimise.automatic = true; nix.optimise.automatic = true;
nix.settings.experimental-features = [ nix.settings.experimental-features = ["nix-command" "flakes"];
"nix-command"
"flakes"
];
system.switch = {
enable = false;
enableNg = true;
};
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.systemd-boot.configurationLimit = 2; boot.loader.systemd-boot.configurationLimit = 2;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.kernelParams = [
"ip=dhcp"
"console=tty"
];
boot.kernel.sysctl = { boot.kernel.sysctl = {
"net.core.default_qdisc" = "fq"; "net.core.default_qdisc" = "fq";
"net.ipv4.tcp_congestion_control" = "bbr"; "net.ipv4.tcp_congestion_control" = "bbr";
}; };
boot.initrd = {
compressor = "zstd";
availableKernelModules = [
"virtio-pci"
"virtio-gpu"
];
systemd.enable = true;
network = {
enable = true;
ssh = {
enable = true;
hostKeys = [ /etc/ssh_dummy_ed25519_key ];
authorizedKeyFiles = [ ../nixy/ssh_pubkey ];
};
};
};
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
users.users.root.initialHashedPassword = ""; users.users.root.initialHashedPassword = "";
users.users.root.openssh.authorizedKeys.keys = [ users.users.root.openssh.authorizedKeys.keys = [
(builtins.readFile ../nixy/ssh_pubkey) builtins.readFile ../nixy/ssh_pubkey
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@@ -66,6 +38,7 @@
fzf fzf
fzy fzy
git git
goatcounter.packages.${system}.goatcounter
nvim.packages.${system}.nvim nvim.packages.${system}.nvim
htop-vim htop-vim
nvim nvim
@@ -84,7 +57,7 @@
enable = true; enable = true;
debug = false; debug = false;
fqdn = "mail.project-cloud.net"; fqdn = "mail.project-cloud.net";
domains = [ "project-cloud.net" ]; domains = ["project-cloud.net"];
enableSubmissionSsl = true; enableSubmissionSsl = true;
enableImap = false; enableImap = false;
enableImapSsl = true; enableImapSsl = true;
@@ -94,11 +67,11 @@
loginAccounts = { loginAccounts = {
"gitea@project-cloud.net" = { "gitea@project-cloud.net" = {
hashedPasswordFile = config.sops.secrets."gitea_mail_pw_hash".path; hashedPasswordFile = config.sops.secrets."gitea_mail_pw_hash".path;
aliases = [ "git@project-cloud.net" ]; aliases = ["git@project-cloud.net"];
}; };
"asmir@project-cloud.net" = { "asmir@project-cloud.net" = {
hashedPasswordFile = config.sops.secrets."asmir_mail_pw_hash".path; hashedPasswordFile = config.sops.secrets."asmir_mail_pw_hash".path;
aliases = [ "asmir.abdulahovic@project-cloud.net" ]; aliases = ["asmir.abdulahovic@project-cloud.net"];
}; };
}; };
certificateScheme = "acme-nginx"; certificateScheme = "acme-nginx";
@@ -127,13 +100,18 @@
services.goatcounter = { services.goatcounter = {
enable = true; enable = true;
port = 8002; environmentFile = "/var/lib/goatcounter.env";
proxy = true; extraArgs = ["-listen='*:8002'" "-tls=proxy"];
address = "127.0.0.1"; database = {
backend = "sqlite";
name = "goatcounter";
user = "goatcounter";
automigrate = true;
};
}; };
services.nextcloud = { services.nextcloud = {
enable = false; enable = true;
package = pkgs.nextcloud28; package = pkgs.nextcloud28;
config.adminpassFile = config.sops.secrets."nextcloud_admin".path; config.adminpassFile = config.sops.secrets."nextcloud_admin".path;
configureRedis = true; configureRedis = true;
@@ -179,14 +157,12 @@
root = "${project-cloud.packages.${system}.default}/public"; root = "${project-cloud.packages.${system}.default}/public";
}; };
/*
virtualHosts.${config.services.nextcloud.hostName} = { virtualHosts.${config.services.nextcloud.hostName} = {
quic = true; quic = true;
http3 = true; http3 = true;
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
}; };
*/
virtualHosts."miniflux.project-cloud.net" = { virtualHosts."miniflux.project-cloud.net" = {
quic = true; quic = true;
@@ -204,7 +180,7 @@
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
locations."/" = { locations."/" = {
proxyPass = "http://unix:${toString config.services.gitea.settings.server.HTTP_ADDR}"; proxyPass = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
}; };
}; };
@@ -232,7 +208,6 @@
DISABLE_SSH = true; DISABLE_SSH = true;
HTTP_PORT = 3001; HTTP_PORT = 3001;
LANDING_PAGE = "explore"; LANDING_PAGE = "explore";
PROTOCOL = "http+unix";
}; };
settings.mailer = { settings.mailer = {
ENABLED = true; ENABLED = true;
@@ -246,16 +221,10 @@
REGISTER_EMAIL_CONFIRM = true; REGISTER_EMAIL_CONFIRM = true;
}; };
settings."markup.restructuredtext" = settings."markup.restructuredtext" = let
let docutils =
docutils = pkgs.python3.withPackages ( pkgs.python3.withPackages (ps: with ps; [docutils pygments]);
ps: with ps; [ in {
docutils
pygments
]
);
in
{
ENABLED = true; ENABLED = true;
FILE_EXTENSIONS = ".rst"; FILE_EXTENSIONS = ".rst";
RENDER_COMMAND = "${docutils}/bin/rst2html.py"; RENDER_COMMAND = "${docutils}/bin/rst2html.py";
@@ -278,7 +247,7 @@
paths = [ paths = [
"/var/lib/gitea" "/var/lib/gitea"
]; ];
exclude = [ ]; exclude = [];
repo = "ssh://na9fqv67@na9fqv67.repo.borgbase.com/./repo"; repo = "ssh://na9fqv67@na9fqv67.repo.borgbase.com/./repo";
encryption = { encryption = {
mode = "repokey-blake2"; mode = "repokey-blake2";
@@ -289,16 +258,12 @@
startAt = "daily"; startAt = "daily";
}; };
services.seafile = { /*
enable = false; needed for sendmail mail functionality
initialAdminPassword = "admin"; */
adminEmail = "asmir.abdulahovic" + "@" + "gmail.com"; users.users.gitea.extraGroups = ["postdrop"];
};
# needed for sendmail mail functionality
users.users.gitea.extraGroups = [ "postdrop" ];
systemd.services.gitea.serviceConfig = { systemd.services.gitea.serviceConfig = {
RestrictAddressFamilies = [ "AF_NETLINK" ]; RestrictAddressFamilies = ["AF_NETLINK"];
ProtectSystem = lib.mkForce false; ProtectSystem = lib.mkForce false;
}; };
@@ -307,89 +272,81 @@
defaults.email = "asmir.abdulahovic@gmail.com"; defaults.email = "asmir.abdulahovic@gmail.com";
}; };
sops = { sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
secrets = { sops.secrets."miniflux_env" = {
"asmir_mail_pw_hash".sopsFile = ./secrets/asmir_mail_pw_hash.yaml; sopsFile = ./secrets/miniflux.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; sops.secrets."gitea_mail_pw_hash" = {
"miniflux_env".sopsFile = ./secrets/miniflux.yaml; sopsFile = ./secrets/gitea_mail_pw_hash.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; sops.secrets."asmir_mail_pw_hash" = {
"wg_privkey".sopsFile = ./secrets/wg_privkey.yaml; sopsFile = ./secrets/asmir_mail_pw_hash.yaml;
"gitea_db" = { };
sops.secrets."gitea_db" = {
sopsFile = ./secrets/gitea_db.yaml; sopsFile = ./secrets/gitea_db.yaml;
owner = config.users.users.gitea.name; owner = config.users.users.gitea.name;
}; };
/*
"nextcloud_admin" = { sops.secrets."nextcloud_admin" = {
sopsFile = ./secrets/nextcloud_admin.yaml; sopsFile = ./secrets/nextcloud_admin.yaml;
owner = config.users.users.nextcloud.name; owner = config.users.users.nextcloud.name;
}; };
*/
sops.secrets."wg_privkey" = {
sopsFile = ./secrets/wg_privkey.yaml;
}; };
sops.secrets."borgbase_enc_key" = {
sopsFile = ./secrets/borgbase_enc_key.yaml;
};
sops.secrets."borgbase_ssh_key" = {
sopsFile = ./secrets/borgbase_ssh_key.yaml;
}; };
networking.hostName = "magpie"; networking.hostName = "magpie";
networking.firewall = {
nftables.enable = true;
enable = true;
allowedTCPPorts = [
80
443
587
2049
]; # http, mail, mail, nfs
allowedUDPPorts = [
443
51820
]; # mail, wireguard
allowPing = true;
logRefusedConnections = lib.mkDefault false;
};
networking.nat = { networking.firewall.enable = true;
enable = true; networking.firewall.allowedTCPPorts = [80 443 587 2049]; # http, mail, mail, nfs
externalInterface = "enp1s0"; networking.firewall.allowedUDPPorts = [443 51820]; #mail, wireguard
internalInterfaces = [ "wg0" ]; networking.firewall.allowPing = true;
}; networking.firewall.logRefusedConnections = lib.mkDefault false;
networking.nat.enable = true;
networking.nat.externalInterface = "enp1s0";
networking.nat.internalInterfaces = ["wg0"];
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.wireless.enable = false; networking.wireless.enable = false;
networking.wireguard.interfaces = { networking.wireguard.interfaces = {
wg0 = { wg0 = {
ips = [ "10.100.0.1/24" ]; ips = ["10.100.0.1/24"];
listenPort = 51820; listenPort = 51820;
# This allows the wireguard server to route your traffic to the internet and hence be like a VPN # This allows the wireguard server to route your traffic to the internet and hence be like a VPN
# For this to work you have to set the dnsserver IP of your router (or dnsserver of choice) in your clients # For this to work you have to set the dnsserver IP of your router (or dnsserver of choice) in your clients
postSetup = '' postSetup = ''
${pkgs.nftables}/bin/nft add rule ip nat POSTROUTING oifname "eth0" ip saddr 10.100.0.0/24 counter masquerade ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s 10.100.0.0/24 -o eth0 -j MASQUERADE
''; '';
# This undoes the above command, TODO fix command below to be more specific # This undoes the above command
postShutdown = '' postShutdown = ''
${pkgs.nftables}/bin/nft flush table ip nat ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -o eth0 -j MASQUERADE
''; '';
privateKeyFile = config.sops.secrets."wg_privkey".path; privateKeyFile = config.sops.secrets."wg_privkey".path;
peers = [ peers = [
{ {
publicKey = builtins.readFile ../nixy/wg_pubkey; publicKey = builtins.readFile ../nixy/wg_pubkey;
presharedKeyFile = config.sops.secrets."wg_preshared/nixy".path; allowedIPs = ["10.100.0.6/32"];
allowedIPs = [ "10.100.0.6/32" ];
} }
{ {
publicKey = builtins.readFile ../mediabox/wg_pubkey; publicKey = builtins.readFile ../mediabox/wg_pubkey;
presharedKeyFile = config.sops.secrets."wg_preshared/mediabox".path; allowedIPs = ["10.100.0.5/32"];
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" ];
} }
]; ];
}; };

18
magpie/hardware-configuration.nix
View File

@@ -5,21 +5,15 @@
lib, lib,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "usbhid" "sr_mod"];
"xhci_pci" boot.initrd.kernelModules = [];
"virtio_pci" boot.kernelModules = [];
"usbhid" boot.extraModulePackages = [];
"sr_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/118de1e5-f23e-4af3-a10a-054eded78152"; device = "/dev/disk/by-uuid/118de1e5-f23e-4af3-a10a-054eded78152";
@@ -31,7 +25,7 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [];
# 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

21
magpie/secrets/3proxy.yaml Normal file
View File

@@ -0,0 +1,21 @@
string: ENC[AES256_GCM,data:9PAgqNliAEo5NIc8uFho1dYt/90X9Y6iOz2HP2aLzqA3ghvasi5l3n79wV0wxI+Vnw==,iv:Atkz33cnTLQ4RyT0nVt2/VhWgLiQE0acGbOJUbWZ2kM=,tag:IWLpVYeiYtzLK6h2K/MjLA==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoVTAvOFAvbGdLUWxNcElp
NmY2MC9XUzBHWVdOek1oTkFSaWdENnhmZWgwCktock10L3YrL2JoTHVaOWhtWlhK
K2lMeUpqNFZTNnBOMmtJajdHWjRLT1UKLS0tIFd2OXBLRGQzVzF4TzhrOXFjWDVL
VzRqWXBYT0RHN1V3bnVMRHc2SXVUcDAKD8Et0nJv8mT1KoWQKcxfpv8s57zqIK0J
TCm3sby77wZ9i3BpO1Mg8S2GGwM0X+fZme8S5HVTzAgpzIyUbdcmww==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-03-17T18:25:56Z"
mac: ENC[AES256_GCM,data:ezv1W5jPjZxDt5gs+ljha/ywjSc1P00QtdEZBoWye6y61iOAMlF+VeWgI1yAIz9h2STdb2mqbFj1pmJcFujCYzxTY6Vx4j1GHpVv+Zczvnj1AnepDgLZn320FzwUmWscGcSL/Tn9+H/g0rH0BR2qv5GfRE9vmdXpXPsS6jZ+mcw=,iv:t4yaE56jPI4ozMpEChAT6y0zN9v1vlsR2J5VriFoV48=,tag:zs7vtq5J0EnwBgT9rjZIMA==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.8.1

19
magpie/secrets/asmir_mail_pw_hash.yaml
View File

@@ -8,20 +8,11 @@ sops:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOS3RoalBRQTB5Mkp4THpa YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKbTM0ZzVHZ1hlNzJ6d25a
aG9jS0UraEJlWHlVRFBWNWNJNGVOd0hxdUZBCm10OWwramN3UGdLUFpwbkduaU16 eFpZMHdBZjBFSjU4L0dkK1Noby9HK29CMldNCkJWb2NmcC9jNVFBMWJOZjVBalRw
S1FWcHIrK0dKRTAvSlN4SlI3eHJJL3cKLS0tIFljS3oxWXZyRlFEVUdUYXRsc2x4 VVZsN3B1WGJseDFiRTA1R3cvU3c2NEEKLS0tIFI4WHFDRHBCN29IQ0tPVC9zbHZS
N1h6SFYrcTZQK1JSRWZsV2MvTGFwb0kKxRohlU6vR3CR2SGqDT9P8AxQXMSbpQuO OFdsQUpvRzNKc2x1WW13b2d4R3lxdXMKJeMJ1IdxS+WUTzUlFdc4WfnUozWU4/80
g1t6gj3c+YBugUsCMuNpYEE+8OvfSQmsZV0VHojS8dMHSD9x75237w== 9GBPz3VCppunrXrh1zFkfIL+Lz48HFyf7HNI4na6TkyqipR6wsW4gw==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2bnFpZzB2b21YVEZtenBj
TlkxdVlSWmM3dDNnQmxqQm5FWlQ0ZHhySGg0Cll1andBcE0yZ04zaFZlajBDSDUx
VHRWbFVOeE1CZmlveTB0UEpjZUpzMEEKLS0tIE5tcVFuaWt6K2RKR3FodGYra25n
bHNWWmh1dFdJVGtETWYvZDY1TGpvUVkKu4sO+/OXdV4xsLmOMlbV5nIidX+iREgF
q0IavI9nzOZ0tkWSV/9mFua8Mp1vPW8wCBOqnW3nhPvYDoTbGQEovQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2023-10-20T19:31:29Z" lastmodified: "2023-10-20T19:31:29Z"
mac: ENC[AES256_GCM,data:xXiCems/1em6JdK3V5GcD811yc8t6iHHFmz0OOrWM3muR807Ux80TrD3uoMN8GxIMyr0AloH41k8+vxaSlMmHsGGl6o1P13aR03E+A9ZLp1W2Nb3nCy5rH4pF8WSeNMxZ1SoT2iEAtTsh29xusocQTMUvr7Ou8TDLyVvrKhBPZw=,iv:SSPpVTbVQTvhPg1qm9akrg2ji1fRcukkwX5P2FzWMb4=,tag:a6GiGWfwnKLtteVoi9DJtQ==,type:str] mac: ENC[AES256_GCM,data:xXiCems/1em6JdK3V5GcD811yc8t6iHHFmz0OOrWM3muR807Ux80TrD3uoMN8GxIMyr0AloH41k8+vxaSlMmHsGGl6o1P13aR03E+A9ZLp1W2Nb3nCy5rH4pF8WSeNMxZ1SoT2iEAtTsh29xusocQTMUvr7Ou8TDLyVvrKhBPZw=,iv:SSPpVTbVQTvhPg1qm9akrg2ji1fRcukkwX5P2FzWMb4=,tag:a6GiGWfwnKLtteVoi9DJtQ==,type:str]

19
magpie/secrets/borgbase_enc_key.yaml
View File

@@ -8,20 +8,11 @@ sops:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCdm1lejdSTm1PN1dsWHNJ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvbGhiTHNXczdHZGd6Mjg4
Nzc5aERNUlk5U0VoNWRzcVlMSXpqSEFmYkVNCkhqeHZrMng4WjEzcnBxdmtVUWlz dGtVUmorcHVtaDJQRHRFSlVNZVA2ZUV6NVF3CllsNWRTT2YzS1ZnQ1dJTGRHbjJE
NXhiNFB6Ukc2eGRiNW96YVloQyt0ZW8KLS0tIFhjUVlITVVTcktCTzEzdUJzTmsy N3l5L00rK2RpT0VWenVVR2Nxald2cGsKLS0tIE9EZ0hXeWM0dEZuYW9lTDc4NS9Q
UVhGc2VKeFJmS3RUY2YrR2FVVlVOcDAKsl+Fo16/3PpQ35aF4EBq5kjpyNxnZfip bFUzRjE3aVNLQ1RaRHk0RStrUkRaMncKxwHapHc7cMA2YB1uZyZ5vPxGwDc9+RBW
1sfq1ppUfg6QRRICWtxUyXLS898BVusW8cMft6k9JbgZfQnc9YUSBg== xj1FBWUVe0kaLibThqHWH7D9KuBComk/rkBPF3xk4As2M7O/UixTpg==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhMTZhdm1mVXhWdlNJVytR
Z3ROLzNnZHUvMXRUcCtPeFFBRWJxY3lyRWljCkErdXAxc3ZETFMxd3ZCRHJPY2JU
N1YxL0VJZ1M0eUdEblhrTDd2VWNNRVUKLS0tIFRBTGNKUDUxaDdGK2x4aWIxMm9i
Zit1QTdRTjVNdjhFYklEUVlsQjZCM2cKtutM+au5vNF0x9ZP9Cg4pMUGsScIMRFU
KYrBHGW+VfEDpr534X8FXe1Uox70U+HPoT/mEm4RF575ssbTSoW0Hg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-04-05T19:01:07Z" lastmodified: "2024-04-05T19:01:07Z"
mac: ENC[AES256_GCM,data:Fz1ZwYR7cg+bcgNe/JZ2oEqhYihQWnCoy3J76VIPb089PNCXXp0xJ/eYjOoKlGK42z1wEO8hJ8FoaLvzuqhO0aatKpHDx0bBos8YqZYuGAuW115AdK5m6ecby7yi5lBIBpXOv1sU8uOtdBR32UPFAQ9oQf0KleWju47phF43v9o=,iv:Lbu5eLKfEnrehSY1+r0z75pZnNDNEVSmrEaJRDpDTU4=,tag:TLdtQTNbo0dxlpV9ZPm+uQ==,type:str] mac: ENC[AES256_GCM,data:Fz1ZwYR7cg+bcgNe/JZ2oEqhYihQWnCoy3J76VIPb089PNCXXp0xJ/eYjOoKlGK42z1wEO8hJ8FoaLvzuqhO0aatKpHDx0bBos8YqZYuGAuW115AdK5m6ecby7yi5lBIBpXOv1sU8uOtdBR32UPFAQ9oQf0KleWju47phF43v9o=,iv:Lbu5eLKfEnrehSY1+r0z75pZnNDNEVSmrEaJRDpDTU4=,tag:TLdtQTNbo0dxlpV9ZPm+uQ==,type:str]

19
magpie/secrets/borgbase_ssh_key.yaml
View File

@@ -8,20 +8,11 @@ sops:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAydXE0RXhGU0tsbnRTU0pw YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5UHRuVS95ZFNTWU5LdS8z
THZBNngvUEwwMGVTQ3dscCtKMnVCb1pSSzN3CkVzNS9UY3dqYWRDOENTaFhadFcz UDVaTjZReWc4T2ZKaTVSdDExY2drSHFIcEM0CnkvZkhkSHVFVG1pVUJvUzRxMWYv
MGlibCt5Q3ppelVQU1AyM0wvTm1zMXMKLS0tIHNGM291dE5lb2pwTDFWbWtiUFNp SE1sZEJBazRBcW53bzV4QXFiM0p5ZEkKLS0tIGNhaTB1NFBLd2NjTWs0V1BaVEE2
Y1ZoSG43TFd0WktKY3lUM3Y0RHJHZVkK0/sD5M54XiQzkSMlDHPkSVMypoxdhU/f WDZadWdTMFIwei83clhkNVRLNUhVTk0KiJGENx2jXnStGslESR5aWp/LolbF2f0u
0nUWA20s6IU63Oqn0j7rGwV6S5j+fZCBzF4kSi8JLJb0619G2++M5g== QDbs0yW+I4Tzw6Tg4FMS4rFzlmesFqoj+3JBgegb/dDRhIvuWrwCig==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiem5ZRE1oRU1hWENzc2sv
dkg4czhVeVNJQllnWG9vYnptL1FhZy9zc0hBClhLRzQxNlhQUEVUcnZDYlZqTWYx
eDQzV2ozbkd6ZWVZNWkxOXhBV0JNR00KLS0tIFQ4d29OQzhoWTl0Z3BrOURTSktU
SHZNdFhmS3ZQMnhzMDJWMTl4cXNudFEKhgbRW+6xqGhkTtr4h4JzPxZnGKqr4jcX
BABLTgzqvM+JvBzmUcYjuagVcLpWsQcNWBaYFBJBMhP8oOgF2dVBcQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-04-05T20:03:21Z" lastmodified: "2024-04-05T20:03:21Z"
mac: ENC[AES256_GCM,data:YpXUK6UNKpdudVZ+YManWreHufFzw9XbF1cBYutdAaTdqhlzPErpuOmEKLuMA7nr7SQkLK4pu1Eg0P5CA3QXsh0VUHMTiFWxNz7KZeoYAkacK9WzutEldsMG4iVlKmGHhQApSNW4kfPBKs1TgYyZdndBHEdILcoLDxke8kfkoVU=,iv:rpNeNTfXoMpScSfyrY7uK9ZkKasJGVAhgiMoe0XyJFo=,tag:Rl4Ya+iq0BvMSM/J0wySnQ==,type:str] mac: ENC[AES256_GCM,data:YpXUK6UNKpdudVZ+YManWreHufFzw9XbF1cBYutdAaTdqhlzPErpuOmEKLuMA7nr7SQkLK4pu1Eg0P5CA3QXsh0VUHMTiFWxNz7KZeoYAkacK9WzutEldsMG4iVlKmGHhQApSNW4kfPBKs1TgYyZdndBHEdILcoLDxke8kfkoVU=,iv:rpNeNTfXoMpScSfyrY7uK9ZkKasJGVAhgiMoe0XyJFo=,tag:Rl4Ya+iq0BvMSM/J0wySnQ==,type:str]

19
magpie/secrets/gitea_db.yaml
View File

@@ -8,20 +8,11 @@ sops:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUUXAraFhvN0NLeHhKWGJt YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKZ3l1UTRDMFVlM01TR1dW
c2ttRGljUzZiN2ZJeWpTdVRzNCtzL0pqdHhnCmJvek9YNkF4UTd1ZEFSaDBJR1Jz VzNnRXpuc0R0d3BpVzZveHRrdHRTTVRXNWpnCjVqNittd3BiZ0d3YXVQUXBpWExU
ZkUwTFNEYkhmbS9DVUJ0cTNrTVR5TlkKLS0tIFdscFJCaTJjYXFPcVZXUXBPS2ph cGdkSmVtOHJBN3FEdDVCeTVjUllHc0EKLS0tIG5TQlpIQXhNNmJiR0Y3L1p3SVpG
bERTT1dsaStRQnRvb1VnV2lTdGNQd0UK3dXTtGkfxq7oLzDrxFomE0oAjgZo+7H7 ZnlvRDRUam5MaFdZcGgyZlJSZzMvVWcKxiwENpP7qlF0Uy7DJM0WwLFQ0h+ost5T
SVVxKy/caewOXbI3R/CHxuaYb0fDDlyIX/zqxqkSaXUIh4rsIT46xw== BCsZtGP61Z2WcQq0EWYLqJItR2Tk3AXox014CJAm+G/G8PMTAKv0xw==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCOFFtQUptR2xIcW5FS3JR
aUdLbGRJeU4rbFFVcU9HVVdYL293WXY0L3hvCmpPN1BnRDlZNDhOT25zVFRjaGE1
TThWQUVDOG5YOGtlRmU1T1pZZ1dxTHcKLS0tIHZSUTBDbFN5eXZPMHZvZ2UwMFJu
cjhmWGJIUEhZQjNXN3J6ZTk1aE1jZHMKjiwLd6gHiLJx63AIzM17C3RaEBbCFIyI
ppLWEw8cm53hvjCuxsY8jJ/5kHD+25Pw2NMAD5PKt8SjrJzrJcOtMA==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2023-10-17T21:16:10Z" lastmodified: "2023-10-17T21:16:10Z"
mac: ENC[AES256_GCM,data:EPiLv8IzVXqRan9UlBuA3TmxtB3f4Qj4owed+1Pat9Tih1yOe4Z9RT28JIYJQ70R/IK+Yi0NQem9Ec6HU+8kaxLE3fff/4PM+B9QQbB6fjgLFod/nFk+OuWgR7FTcJ2j16OnlxE5ikCP+qdfvAM0eEv+BoDrWv98gSyCXtMCe48=,iv:th0E7zioz7gtgMlns8kvnf5hmlRH0KX65wPxBi3YP6Y=,tag:JhoGvF8LJmrAQpUOEopohA==,type:str] mac: ENC[AES256_GCM,data:EPiLv8IzVXqRan9UlBuA3TmxtB3f4Qj4owed+1Pat9Tih1yOe4Z9RT28JIYJQ70R/IK+Yi0NQem9Ec6HU+8kaxLE3fff/4PM+B9QQbB6fjgLFod/nFk+OuWgR7FTcJ2j16OnlxE5ikCP+qdfvAM0eEv+BoDrWv98gSyCXtMCe48=,iv:th0E7zioz7gtgMlns8kvnf5hmlRH0KX65wPxBi3YP6Y=,tag:JhoGvF8LJmrAQpUOEopohA==,type:str]

19
magpie/secrets/gitea_mail_pw_hash.yaml
View File

@@ -8,20 +8,11 @@ sops:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrL2YxU2VhNTArQ0QwYzlU YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCT2VyNWxUeUZ5aDdHcXJR
Z0NSRm5KRU8xRmZCT1E1N09KY2Vob0lsQ2k0CktqTlZnaUVNaEhpT3BkOGNmN2cv WGJVOGgyeC83MEV4REpGZkRUcVJKZDBqYmtjCllQdFhyRWNiTURYQmpucndFWDlr
Z0JoaFFTTzBwNzVmcHNOeXdwVzdQOTQKLS0tIDluazF6RXA0MVYvY2dRRGkxMGRk WUFybGtmckNBdXYzMVZxT3lQM1k3aTgKLS0tIEpNZjU1RkpSOVo3Y1ovR0lmbHJu
UEltOVNQdElpRGJVVlpoTVV2bU5rSncKoSGq75dVH7j/hSnqdjgWJyDgg0doEr6K bENVWmpCcTVqMDh2Wjhob2I2VzRRblkKPGCV1gRyihDCStM4tmvp89d996v1UzdJ
anD9sghKSX0afZmVJFOCXZ+lRYi7kmRbqFNBkkuuFndERtbN/5foXw== /NyK49//+uJJqwCEWuvHWWCB+EbkkOE6gPPKXZyXZSTbb/TDDcVF/Q==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByNW9UcERVditoUE1DVUsw
WmxtbVNHeVpQS0g2WENJWTVJeHNUMU4yZEVNCnNrSnFnU2hUckxlYjJMYk5CTW9j
eU9mU1F4WlY1NWdLU0VxaDVtZWduaXcKLS0tIExtRHJkbFBKTWRjSGZOWGc1U0FF
ZjJkY0FpQnhCazVVVG1DOUZsQ2lXYzgK3UWDBu/Aq7n6CQiRF4NOQdSD4nfU2Gm2
Tlzyou5rj/rSAv5J7ENsDAzKtK6e5+Xe7acUDY+4Rye82vDxyoblaQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2023-10-14T21:21:12Z" lastmodified: "2023-10-14T21:21:12Z"
mac: ENC[AES256_GCM,data:NE9btXZKE3KJmxtWc0Ytb0atfBJKRs5T+Xk9RDFX6veSGBoB+M2+YMCONQdr8T2w6lLJqlrMBHqlfuvD3YnDj041xZmfSsi9NACliWj6GWVWcFWWc6W9OVH8/5CfwjYBdgTJ2o7wdnF9fYHvwMRcaHThDmoUkaExVtVsyu912og=,iv:kyekfEq32GSKVNKy8MJYfT5ZMKNSRQUk1viB2W6k29U=,tag:7ie/2P/F3bPQXpkWGKqTfA==,type:str] mac: ENC[AES256_GCM,data:NE9btXZKE3KJmxtWc0Ytb0atfBJKRs5T+Xk9RDFX6veSGBoB+M2+YMCONQdr8T2w6lLJqlrMBHqlfuvD3YnDj041xZmfSsi9NACliWj6GWVWcFWWc6W9OVH8/5CfwjYBdgTJ2o7wdnF9fYHvwMRcaHThDmoUkaExVtVsyu912og=,iv:kyekfEq32GSKVNKy8MJYfT5ZMKNSRQUk1viB2W6k29U=,tag:7ie/2P/F3bPQXpkWGKqTfA==,type:str]

19
magpie/secrets/miniflux.yaml
View File

@@ -8,20 +8,11 @@ sops:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0K0ZNSWEweUNTbm5KZE5y YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpZ1d3aGhud0UyOVV6Vzcw
M3ZlbTdBc1RheHFNbGpxZllRdi9tMXVJaEFJCmdQdWh6cks5L3JFclJYWmlkYmVv Q3Q2OVRQOEpXUk1TK2dOOEZtKzNlUkJGZHh3CmJwYnRpWFhJWHZXQ2I1TnhKWDRx
WDA2YXhiN3ovL1V0ZlJjbmluSm5tbGMKLS0tIG1QRnoxMHBQeGtLekRSRVVMNWdP MGlrbXJoQTVPcUFBa0gvME95OVlxWkEKLS0tIHNZWWRwWUJPV3o3REpENzdMYkVk
R1BuNDZVNzNaTmVvZm9EMy9ld0V4U1UKFjPcFiuhjwCChJKGQbIPFsHwl9oE7S+g Y1V5SXhCUllDWGhjK3JzWDRKQU9hMmMKuVmn6OAy2q/mpBKqUhl1qfpnPvFOd72c
Utne4LrODAa3wj8TX3vgfRTBrljJmt+OwQJxRfTtq2ocyzR9rNUI+w== /jMqnxClGSVXjJ5qdvcXCfLeYwT8vnhViNZmjE1ebRosE5YupvrjUg==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVNFAvaUlyeHA3Mnluam1G
dmtIWHU2R2pRV2E3NTVKV1NOTHRSYjVhQVRVCnR4OENHZGYzVE9UdlJBTjdxblIz
Q0MxN3gyeTJhNTdORFk0SDdycVFrWjAKLS0tIEc5c0RMNjdLSTNKWExsVmlQUGx5
RFp0dWJXOVVvSGlhZ1pPbGRBWmt2S0UKTwkFwYaTr5jNuQTlqR/1ud8ITKGIbNiM
myAf39EHCP6cQQ0fjtx2ihy56m9xoK35Aj7h3w0fadONWtCNnhuH2A==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2023-10-13T11:17:33Z" lastmodified: "2023-10-13T11:17:33Z"
mac: ENC[AES256_GCM,data:CpzC0H2Rfvl7F9tXCJ0WwkhE4Ba7eOIl1QMh1DHP8YQ9rChzAE8S5SXXuJA0jcmVY6NPfZ7zl8VEBepE+LHCq2UdSkAefawLeM6HwNfedP8N+zheqlyCZ8Os48628aHYN0PVI+/dMvpWWcfl+CFaH1mm4c+KYedCIsS9ZEYi9N8=,iv:EbF58pxbtHxPTAgs4dbZ31qyRT3QJ1kQoUShbLE11FY=,tag:FNF/OzS2SL3FweFw0RcRLQ==,type:str] mac: ENC[AES256_GCM,data:CpzC0H2Rfvl7F9tXCJ0WwkhE4Ba7eOIl1QMh1DHP8YQ9rChzAE8S5SXXuJA0jcmVY6NPfZ7zl8VEBepE+LHCq2UdSkAefawLeM6HwNfedP8N+zheqlyCZ8Os48628aHYN0PVI+/dMvpWWcfl+CFaH1mm4c+KYedCIsS9ZEYi9N8=,iv:EbF58pxbtHxPTAgs4dbZ31qyRT3QJ1kQoUShbLE11FY=,tag:FNF/OzS2SL3FweFw0RcRLQ==,type:str]

19
magpie/secrets/nextcloud_admin.yaml
View File

@@ -8,20 +8,11 @@ sops:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHYVVnM0xOVzJ5OFZsYlZL YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrUnQ3SDAyRTUxUDF0dDhY
SThvVkNBdzJoVkZ3ZFBMYVlTNjQwNUxuaVFjCjBhUFRSaGZ6TEh4ellSdS9Uc3FP K3JmQWlYRVJtdEFac0J4U0RGKzZGNXJmUEg4CmtBSW9yNGZScXhKdnhZWkxIamFW
cGJaanNUci9JMDZISXljM1lSREZaZGcKLS0tIFhJOGVIM3Bub3J0WWVMNDlqY3da YXEzbGhwR2F3dDJGdzljZUZBeERhU1kKLS0tIGlXZUhsdnI4ell5R3ZZbjZ0NCtO
RmVCdEpoUjJGTDYzczNnOWRRTTE3WmcKnRV787F3yBJgSDEhHW1+sAFcyvH+OMQf TUpkZmxBNzZ1UUY1dGRud2hycGUyZW8KFUGikaFQjFfmn068qex2tpGbRHIbmS3l
N7er4Wd9Tqi3IJ/lR2Z7Gwn1Dfm5kMHk+hxzPlmdpaGr42ZJNPmNVw== 27lqo8+eRFnq0nw8H/1yRMi8IghR0+XK68T49hlt0VLS9LZJG1aPag==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBCZmFFRXU5NnlGRit6K1ov
TmR0K05uY2hva3liaDdGNmhST3dWTGdZb1EwCkpsQ3o1ZWloaUdFR3NpbS9uKzE5
S0ZRRmkxbkJnMFN6SzhzUFo1M3NnTnMKLS0tIE84aFdJS3E4eWw3SG1JeXJwRWd2
RWp5ZUtUNzJ4OWswWmhXWjRkZkpzWEUKj23XymHvh+nh3HiPD+erv2GZNNpUZKp6
s0KJSkGuIuILf3kfgp23jXNSFLMEtWwlSh5EP02g2EIHzUg2kLKNpQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2023-10-17T23:08:24Z" lastmodified: "2023-10-17T23:08:24Z"
mac: ENC[AES256_GCM,data:fb9cOL4Q+q5uarmXtXNlpRmWgv/Ao1MqwwH2V2CQxEiP8zFyFBZs2435vdcLzrQrnBXz0JLVu4g10SH2T4dpYFP42teIkrgmneecjjcM+UOsBsGsrxlpHMha1t/ERRhBA7uJze5/kwHqry6eruWehRTu65QF1qBTql3m6ipjCeY=,iv:a7aFuTCcRCIDERlrj/9dFCF7VgCDDakfPteQimHV3lc=,tag:4mwrDHaQWA4EU0AgtgZaMg==,type:str] mac: ENC[AES256_GCM,data:fb9cOL4Q+q5uarmXtXNlpRmWgv/Ao1MqwwH2V2CQxEiP8zFyFBZs2435vdcLzrQrnBXz0JLVu4g10SH2T4dpYFP42teIkrgmneecjjcM+UOsBsGsrxlpHMha1t/ERRhBA7uJze5/kwHqry6eruWehRTu65QF1qBTql3m6ipjCeY=,iv:a7aFuTCcRCIDERlrj/9dFCF7VgCDDakfPteQimHV3lc=,tag:4mwrDHaQWA4EU0AgtgZaMg==,type:str]

19
magpie/secrets/wg_privkey.yaml
View File

@@ -8,20 +8,11 @@ sops:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJUFplcGZMWGhrS2NsRUZF YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBOZW1IOGNtVG1uNjlQTE5l
WnltcCsvS0VaV29RbTdDK1UveDJwdlBXbTBJCkVaekVUWFVSVkZ5UjUwaWMxU3h0 ZThlcHVTWVgwek8zQTQ0NEFoV0pNUTMrRUNzCjhGMFRPdDJ0Z0ZiUTRkRXZqOUtZ
eEtOQUR2VkF6RUtLYVBNalJPV3YzWWsKLS0tIDNGek4veStoa011VUV2Z3ZSUVpq RFNtYmNFbGdpWElET1VwckhRY2c3bzQKLS0tIDFKVDdKdWVPZFVjMmVGQVEyREZZ
ZWlYQ2x6a3ROdlYzc3E1WjRhN3F1QUUKwaJruHMCoWtgvep0fI00helDZh8WVrsh VEpUK1d3cUJvd2Y5VHNVNlpKazIxZTAK6WKMvsf8CE3BJxHtyt0Gw4baQ/FQB0Q3
MV5IaEH5xapid5HHw9bLkjeeVKcT1fo7LCovouv+G5NTjvVzsMyLhw== 4ehZeDi7cYiH4EG5HmeIBVcgpv/i25GNLFDP3E3TdJJs62F5X08Qng==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlRWdQeWxUUlJaRndzcVln
ck5USkpzdDJpSWJTNDZJWVBMQnl0QnVvTDF3Clg2SEY3eDdqS0Y5ei8vUlk0dTli
bTYycFYyMjcxdmtpc1IybXBxN2RORm8KLS0tIHlHaEJLMnRTQ20yN2RrRnNqMzk0
ZVlSb1FHVVJhb0IyaHJiQlpHRjNyMDAKNQ8VzdC3s43YcZk6UQjyA1GX69x/znhE
ZaFkMfNX6CgxfjKRW2rhXrJi+txdhmQ0CfpfWDr3zp3XVuMq942M1Q==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-04-04T19:04:00Z" lastmodified: "2024-04-04T19:04:00Z"
mac: ENC[AES256_GCM,data:qYNlokRd1lQnOwNNVbV4PwdYeybIRNrxDKX4RPfHJxvQGHBmISzd52JCnCe7zJ14FP/bSNhQqfuxyjdxid/DVPUvkHP+HlaKUR0SLv6c91ORDoaMRC93hrPXypRGplFSbSjnd3dME43ll3oH8fLe4lP9z9KhGS2lRMdduptfWvg=,iv:/j6OOT1dK94vrPOk1Lbcca8KeWvoD+ZaHoH6nMMo0y8=,tag:syHuBVkhOCJ8JCONKkqFkg==,type:str] mac: ENC[AES256_GCM,data:qYNlokRd1lQnOwNNVbV4PwdYeybIRNrxDKX4RPfHJxvQGHBmISzd52JCnCe7zJ14FP/bSNhQqfuxyjdxid/DVPUvkHP+HlaKUR0SLv6c91ORDoaMRC93hrPXypRGplFSbSjnd3dME43ll3oH8fLe4lP9z9KhGS2lRMdduptfWvg=,iv:/j6OOT1dK94vrPOk1Lbcca8KeWvoD+ZaHoH6nMMo0y8=,tag:syHuBVkhOCJ8JCONKkqFkg==,type:str]

8
mediabox/.sops.yaml Normal file
View File

@@ -0,0 +1,8 @@
keys:
- &mediabox age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
creation_rules:
- path_regex: secrets/[^/]+\.yaml$
key_groups:
- age:
- *mediabox

139
mediabox/configuration.nix
View File

@@ -8,14 +8,13 @@
system, system,
nvim, nvim,
... ...
}: }: {
{ imports = [];
imports = [ ];
system.stateVersion = "23.05"; system.stateVersion = "23.05";
system.autoUpgrade.enable = false; system.autoUpgrade.enable = false;
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
sops.secrets."peerix/private" = { sops.secrets."peerix/private" = {
sopsFile = ./secrets/peerix.yaml; sopsFile = ./secrets/peerix.yaml;
mode = "0400"; mode = "0400";
@@ -27,41 +26,21 @@
sopsFile = ./secrets/wg_privkey.yaml; sopsFile = ./secrets/wg_privkey.yaml;
}; };
sops.secrets."wg_preshared/mediabox" = {
sopsFile = ../common/secrets/wg_preshared.yaml;
};
nix = { nix = {
optimise.automatic = true; optimise.automatic = true;
gc.automatic = true; gc.automatic = true;
gc.options = "--delete-older-than 7d"; gc.options = "--delete-older-than 7d";
package = pkgs.nixVersions.latest; package = pkgs.nixUnstable;
settings = { settings = {
experimental-features = [ experimental-features = ["nix-command" "flakes"];
"nix-command"
"flakes"
];
}; };
}; };
boot = { boot = {
initrd = { initrd.compressor = "zstd";
compressor = "zstd"; kernelModules = ["acpi_call"];
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; kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [ "msr.allow_writes=on" ]; kernelParams = ["msr.allow_writes=on"];
kernel.sysctl = { kernel.sysctl = {
"net.core.default_qdisc" = "fq"; "net.core.default_qdisc" = "fq";
"net.ipv4.tcp_congestion_control" = "bbr"; "net.ipv4.tcp_congestion_control" = "bbr";
@@ -72,7 +51,7 @@
memtest86.enable = true; memtest86.enable = true;
}; };
readOnlyNixStore = true; readOnlyNixStore = true;
supportedFilesystems = [ "btrfs" ]; supportedFilesystems = ["btrfs"];
tmp.useTmpfs = true; tmp.useTmpfs = true;
tmp.tmpfsSize = "80%"; tmp.tmpfsSize = "80%";
}; };
@@ -93,11 +72,7 @@
networking = { networking = {
firewall = { firewall = {
enable = true; enable = true;
allowedTCPPorts = [ allowedTCPPorts = [80 443 51820];
80
443
51820
];
}; };
hostName = "mediabox"; hostName = "mediabox";
@@ -105,11 +80,8 @@
interfaces.wlp3s0.useDHCP = false; interfaces.wlp3s0.useDHCP = false;
useDHCP = false; useDHCP = false;
wireless.enable = false; wireless.enable = false;
wireless.interfaces = [ "wlp3s0" ]; wireless.interfaces = ["wlp3s0"];
nameservers = [ nameservers = ["127.0.0.1" "::1"];
"127.0.0.1"
"::1"
];
dhcpcd.extraConfig = "nohook resolv.conf"; dhcpcd.extraConfig = "nohook resolv.conf";
networkmanager.dns = "none"; networkmanager.dns = "none";
extraHosts = '' extraHosts = ''
@@ -123,13 +95,13 @@
wireguard.interfaces = { wireguard.interfaces = {
wg0 = { wg0 = {
ips = [ "10.100.0.5/24" ]; ips = ["10.100.0.5/24"];
listenPort = 51820;
privateKeyFile = config.sops.secrets."wg_privkey".path; privateKeyFile = config.sops.secrets."wg_privkey".path;
peers = [ peers = [
{ {
publicKey = builtins.readFile ../magpie/wg_pubkey; publicKey = builtins.readFile ../magpie/wg_pubkey;
presharedKeyFile = config.sops.secrets."wg_preshared/mediabox".path; allowedIPs = ["10.100.0.0/24"];
allowedIPs = [ "10.100.0.0/24" ];
endpoint = "5.75.229.224:51820"; endpoint = "5.75.229.224:51820";
persistentKeepalive = 25; persistentKeepalive = 25;
} }
@@ -141,7 +113,7 @@
time.timeZone = "Europe/Sarajevo"; time.timeZone = "Europe/Sarajevo";
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nvim.overlays.${system}.overlay ]; nixpkgs.overlays = [nvim.overlays.${system}.overlay];
environment = { environment = {
homeBinInPath = true; homeBinInPath = true;
variables = { variables = {
@@ -164,13 +136,13 @@
systemd = { systemd = {
services = { services = {
"macchanger-wireless" = { "macchanger-wireless" = {
after = [ "sys-subsystem-net-devices-wlp3s0.device" ]; after = ["sys-subsystem-net-devices-wlp3s0.device"];
before = [ "network-pre.target" ]; before = ["network-pre.target"];
bindsTo = [ "sys-subsystem-net-devices-wlp3s0.device" ]; bindsTo = ["sys-subsystem-net-devices-wlp3s0.device"];
description = "Changes MAC of my wireless interface for privacy reasons"; description = "Changes MAC of my wireless interface for privacy reasons";
stopIfChanged = false; stopIfChanged = false;
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
wants = [ "network-pre.target" ]; wants = ["network-pre.target"];
script = '' script = ''
${pkgs.macchanger}/bin/macchanger -e wlp3s0 || true ${pkgs.macchanger}/bin/macchanger -e wlp3s0 || true
''; '';
@@ -179,8 +151,8 @@
"zremap" = { "zremap" = {
description = "Intercepts keyboard udev events"; description = "Intercepts keyboard udev events";
wants = [ "systemd-udevd.service" ]; wants = ["systemd-udevd.service"];
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
serviceConfig.Nice = -20; serviceConfig.Nice = -20;
script = '' script = ''
sleep 1 sleep 1
@@ -191,16 +163,12 @@
"wakeonlan" = { "wakeonlan" = {
description = "Reenable wake on lan every boot"; description = "Reenable wake on lan every boot";
after = [ "network.target" ]; after = ["network.target"];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp0s25 wol m"; ExecStart = "${pkgs.ethtool}/sbin/ethtool -s enp0s25 wol m";
}; };
wantedBy = [ wantedBy = ["default.target" "suspend.target" "shutdown.target"];
"default.target"
"suspend.target"
"shutdown.target"
];
}; };
/* /*
@@ -328,45 +296,39 @@
windowManager.icewm.enable = true; windowManager.icewm.enable = true;
}; };
udev.packages = [ ]; udev.packages = [];
tlp = { tlp = {
enable = true; enable = true;
settings = { }; settings = {};
}; };
actkbd = { actkbd = {
enable = true; enable = true;
bindings = [ bindings = [
{ {
keys = [ 121 ]; keys = [121];
events = [ "key" ]; events = ["key"];
command = "${pkgs.alsaUtils}/bin/amixer -q set Master toggle"; command = "${pkgs.alsaUtils}/bin/amixer -q set Master toggle";
} }
{ {
keys = [ 122 ]; keys = [122];
events = [ events = ["key" "rep"];
"key"
"rep"
];
command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute"; command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute";
} }
{ {
keys = [ 123 ]; keys = [123];
events = [ events = ["key" "rep"];
"key"
"rep"
];
command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute"; command = "${pkgs.alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute";
} }
{ {
keys = [ 224 ]; keys = [224];
events = [ "key" ]; events = ["key"];
command = "/run/current-system/sw/bin/light -U 5"; command = "/run/current-system/sw/bin/light -U 5";
} }
{ {
keys = [ 225 ]; keys = [225];
events = [ "key" ]; events = ["key"];
command = "/run/current-system/sw/bin/light -A 5"; command = "/run/current-system/sw/bin/light -A 5";
} }
]; ];
@@ -459,39 +421,18 @@
users.users.akill = { users.users.akill = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;
extraGroups = [ extraGroups = ["wireshark" "wheel" "kvm" "tty" "audio" "sound" "adbusers" "transmission"];
"wireshark"
"wheel"
"kvm"
"tty"
"audio"
"sound"
"adbusers"
"transmission"
];
openssh.authorizedKeys.keys = [
(builtins.readFile ../nixy/ssh_pubkey)
];
}; };
users.users.ado = { users.users.ado = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;
extraGroups = [ extraGroups = ["wireshark" "wheel" "kvm" "tty" "audio" "sound" "adbusers" "transmission"];
"wireshark"
"wheel"
"kvm"
"tty"
"audio"
"sound"
"adbusers"
"transmission"
];
}; };
users.users.mediauser = { users.users.mediauser = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.bash; shell = pkgs.bash;
extraGroups = [ ]; extraGroups = [];
}; };
} }

50
mediabox/hardware-configuration.nix
View File

@@ -5,32 +5,20 @@
lib, lib,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
"xhci_pci" boot.initrd.kernelModules = [];
"ehci_pci" boot.kernelModules = ["kvm-intel"];
"ahci" boot.extraModulePackages = [];
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e"; device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=root" "compress=lzo" "noatime"];
"subvol=root"
"compress=lzo"
"noatime"
];
}; };
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/60aa7671-bfee-451b-b871-ac7c5a4a9f3a"; boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/60aa7671-bfee-451b-b871-ac7c5a4a9f3a";
@@ -38,41 +26,25 @@
fileSystems."/home" = { fileSystems."/home" = {
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e"; device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=home" "compress=lzo" "noatime"];
"subvol=home"
"compress=lzo"
"noatime"
];
}; };
fileSystems."/nix" = { fileSystems."/nix" = {
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e"; device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=nix" "compress=lzo" "noatime"];
"subvol=nix"
"compress=lzo"
"noatime"
];
}; };
fileSystems."/persist" = { fileSystems."/persist" = {
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e"; device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=persist" "compress=lzo" "noatime"];
"subvol=persist"
"compress=lzo"
"noatime"
];
}; };
fileSystems."/var/log" = { fileSystems."/var/log" = {
device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e"; device = "/dev/disk/by-uuid/ae774285-60dc-4b08-ab26-8208e8f4e81e";
fsType = "btrfs"; fsType = "btrfs";
options = [ options = ["subvol=log" "compress=lzo" "noatime"];
"subvol=log"
"compress=lzo"
"noatime"
];
neededForBoot = true; neededForBoot = true;
}; };
@@ -82,7 +54,7 @@
}; };
swapDevices = [ swapDevices = [
{ device = "/dev/disk/by-uuid/7b44ab02-84ff-4ffd-be26-58247cf5a982"; } {device = "/dev/disk/by-uuid/7b44ab02-84ff-4ffd-be26-58247cf5a982";}
]; ];
hardware.cpu.intel.updateMicrocode = true; hardware.cpu.intel.updateMicrocode = true;

31
mediabox/secrets/peerix.yaml
View File

@@ -6,23 +6,32 @@ sops:
azure_kv: [] azure_kv: []
hc_vault: [] hc_vault: []
age: age:
- recipient: age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt - recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2Zmc0c1AxMVEzdi94L0Nh YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwMkdLVEFQMVk1allhK2hL
dHJFSHVSbG1vay9NUDBEVkM4ZWNoT3h4Q1c0CkhWdWVzTEJxZENZYXVFT2RhV3pT NXFXc254SmhxK0lFWTd1SUorUGQ0VEJPcXo4ClNYSkhJbnVjUjdFOGtoWFV2VWZC
aDZIUUdWVUVRUDc4ZEFDTkdnaDJxdVkKLS0tIDd6TE56REdjRVdtSXB1dkJrVVNj NmpaRDVhWnRQUmVDWS9WU2pTVlBEQ1EKLS0tIFAydU9aYXJnd1NnRzU2YXpXM1Vq
dUxhRnB4dVFRam9xNlFiY2VOSXpNamcKNzRghHeyPtltKH4GkJQ0ef4apr5gziq9 VWhhbkZTT1kwTEl5VEVWR1A2aW5OUDgKiYcj5Yo42RjQeo1UeUTBV8YBNYL8ccLW
dhXy6Qil48QJd4hnyr7GW1n7eRIq24OWO3WglLbVAUSQr/gzM2TWiA== bQ1655MU/q3LQh14lqwbsOfmGjPc9H0ECltm+V+kNPTRi76qFhcodg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSMjVQZkVVQmZFbCt3Z2ZI YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1eGJCRlhHbk1JQWl2RllZ
Q3NVZUJ0VkZjK0E5SFpqWE50c2dOeFNsUm1jCmdDZGxZYk13emhhanRzWjhvZFM1 R3hkVGtIamJzZlVLazUrVEJnNmU3Z0tLMG5RClp2Z01Fc1p5QzFhUWNzU2NpU0Zo
UWNpNm5malkrU1Rkak9PNWk2bW5nRDQKLS0tIE9UdXg4L0hMRzJuUERIMytvc2pr aTRPMFhPYlA4VmZNUWFsWHZRMUxyaTQKLS0tIG51TW9JRW12RzVmdWpZY3FaVnBR
Y1BBZFJseUNIeTVtTjBGazk5WE1ZcUUKs9pEtDbCYRfSP0Rh9ENo9A6nUFkYHr4D UTZ2YWdQVjRTTUxPUWVwbHI4aklITmMKZQnfJs01D4FX+MF6oU0FmWYQ4reB/X/k
3DvOKSyLL33FBoEddDBd7Si1mpjY2bunueBAe+diDgOrol6tWIMoUw== Lat8FrqerqaCYqYmAKe3HWBR6HEVm0U7I7jkVuoROMqz3uci+5HWbQ==
-----END AGE ENCRYPTED FILE-----
- recipient: age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrNTNhaFVzaWFoTU9GdEZD
Z0JWQlFXc3N3SnAwR09YUmIxZlpvNllmU2tnCkFtVlRXMGV2d1V4S0ZxNlRiVzlC
N3dHSFM2eG02UVQrdGR0SnhUMitvelkKLS0tIFpvQUlIZ05HK3F0a2FkKy9EOURY
YzUwa2s0eTliSmxtajdjYmFsOSs2T1kKg08c1uB0swRSo0R6s6hup5JBfkrCKoxf
SjwBAZtjNhr3hrLy1eoo/dpYG6oAkEs3GvaaZ02ldT872dxZvg6r+g==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2023-09-30T14:18:57Z" lastmodified: "2023-09-30T14:18:57Z"
mac: ENC[AES256_GCM,data:R0TJ/7uihpsCHwPLXFYKi+ZaEUtbZVz02utDF7vO7gYDN1MFa0c5nZ/mAnJJtTJI41GdAu9ezTUiU6H1HTHLxYMeUoNAAvNlSCkvGc/oMQofXidL34hq1X2vG05N3UQlkbAXTlCBkYc20oVVOVmT/lq7USEx29oB/ytxZzKYFvM=,iv:qpz0g+O4kwChct1ddiT3D8rZBg08YUr4Ba5pJ4WQyzo=,tag:pWLFiQWl1QSzveBxnq4uXw==,type:str] mac: ENC[AES256_GCM,data:R0TJ/7uihpsCHwPLXFYKi+ZaEUtbZVz02utDF7vO7gYDN1MFa0c5nZ/mAnJJtTJI41GdAu9ezTUiU6H1HTHLxYMeUoNAAvNlSCkvGc/oMQofXidL34hq1X2vG05N3UQlkbAXTlCBkYc20oVVOVmT/lq7USEx29oB/ytxZzKYFvM=,iv:qpz0g+O4kwChct1ddiT3D8rZBg08YUr4Ba5pJ4WQyzo=,tag:pWLFiQWl1QSzveBxnq4uXw==,type:str]

19
mediabox/secrets/wg_privkey.yaml
View File

@@ -8,20 +8,11 @@ sops:
- recipient: age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt - recipient: age19yrl6pr73cv067ksfz0txp3zm2au25jfyjeerw23ml55ps5cyyfqtm3kmt
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKSGxudng1enhDa281S0pm YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiazVUcmc0YmJzUE5GU2ZE
Q0kwQmc1T2hUK0dHd3B4cUh3RzZPZ1dGaXo4CkdPMzNnQWMyYjJiUWk4WEYyODFp UVNSUkFJakhsRkZua1FvYUJiK2wzT0ZuNzBRClFJVzBHQk5ET1U1SkN1OGFOTVVM
b2FTbnZwMHh6SHhIcjVNbnBKSVk3TWMKLS0tIFBZOW56K2Y5Q3I4dmh5dXBieEF2 a04rSHpHY3NXeUs0bGJYWW5vK1Q2d1kKLS0tIFBNYmJSTE41ZEhJZnVBQnVyR21P
SWQwcmkzQU5aeEliS29QN3Y0V04zNU0KF0WmF8BDvZ2DyJFztKJv8YmDuqVsAoO4 RVhhTUUyL00xT0ZCZkhzMjE3VGM4MFUKR2t9irsBeSGBgTuhNeOVtQQ7QjfXTFMC
QEVLwrJDurRxcNIVGLs5W+60Osa5XMpNc74e23rU7mucB5wPA/84dg== xlRF4YdjQUYhz2rLIgkVMCVCX1IvyUO/KmmTIr1pgtKkpUL9ZDkvlw==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWMUtUYyswV3czWDdXWG1x
cnh5QTZpdlBZYlZ2b2oweXJ5SkZSQldhQmpZCmFrQVlyYnNqZ01kVTVNQTlBRFNR
WDlITEJOUFZGa0U2NG8xMGpkSnNOQTAKLS0tIDNlK0dxWnB3a3dkTnRmTm5oTlFD
eGV1VE1tL1c0a3hUdXM2bExmV1l3RnMK8aOugY3XHTCfeBDJVOyGljuuu6hQGJ7W
ZGoxOz+hhYIHj/04J9DIIOUyt81m8LNCbxcacFKyW7Sqosfj+7N7Gg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-04-14T19:25:26Z" lastmodified: "2024-04-14T19:25:26Z"
mac: ENC[AES256_GCM,data:vcyglyYG93K3KBISpIESGlNCs5ojWZAL0gyDUzBNCxG5H8RKEz1Y7yOtr5EXnnP66qcBHlKhb81Iyrc071pmJL9dIttiqmvjSWf0zZ9RuV0uYcO/42cqk3J4tBJ6iYCi64y58jifDObbRni6jiGVEGEkSk8cXFqR8UXoSTeXWtU=,iv:avpWr8SeHK1VHz9XhkO7Nd7VOfMP7JXcQaXJA8Xiuhs=,tag:ixJsw/snZEWXGhdPLU1cGg==,type:str] mac: ENC[AES256_GCM,data:vcyglyYG93K3KBISpIESGlNCs5ojWZAL0gyDUzBNCxG5H8RKEz1Y7yOtr5EXnnP66qcBHlKhb81Iyrc071pmJL9dIttiqmvjSWf0zZ9RuV0uYcO/42cqk3J4tBJ6iYCi64y58jifDObbRni6jiGVEGEkSk8cXFqR8UXoSTeXWtU=,iv:avpWr8SeHK1VHz9XhkO7Nd7VOfMP7JXcQaXJA8Xiuhs=,tag:ixJsw/snZEWXGhdPLU1cGg==,type:str]

9
modules/nextcloud.nix
View File

@@ -2,8 +2,7 @@
config, config,
pkgs, pkgs,
... ...
}: }: {
{
# Enable Nginx # Enable Nginx
services.nginx = { services.nginx = {
enable = true; enable = true;
@@ -62,7 +61,7 @@
enable = true; enable = true;
# Ensure the database, user, and permissions always exist # Ensure the database, user, and permissions always exist
ensureDatabases = [ "nextcloud" ]; ensureDatabases = ["nextcloud"];
ensureUsers = [ ensureUsers = [
{ {
name = "nextcloud"; name = "nextcloud";
@@ -73,7 +72,7 @@
# Ensure that postgres is running before running the setup # Ensure that postgres is running before running the setup
systemd.services."nextcloud-setup" = { systemd.services."nextcloud-setup" = {
requires = [ "postgresql.service" ]; requires = ["postgresql.service"];
after = [ "postgresql.service" ]; after = ["postgresql.service"];
}; };
} }

27
modules/qbittorrent.nix
View File

@@ -4,13 +4,11 @@
pkgs, pkgs,
... ...
}: }:
with lib; with lib; let
let
cfg = config.services.qbittorrent; cfg = config.services.qbittorrent;
configDir = "${cfg.dataDir}/.config"; configDir = "${cfg.dataDir}/.config";
openFilesLimit = 4096; openFilesLimit = 4096;
in in {
{
options.services.qbittorrent = { options.services.qbittorrent = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;
@@ -69,24 +67,24 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.qbittorrent ]; environment.systemPackages = [pkgs.qbittorrent];
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
qbittorrent = prev.qbittorrent.override { guiSupport = false; }; qbittorrent = prev.qbittorrent.override {guiSupport = false;};
}) })
]; ];
networking.firewall = mkIf cfg.openFirewall { networking.firewall = mkIf cfg.openFirewall {
allowedTCPPorts = [ cfg.port ]; allowedTCPPorts = [cfg.port];
allowedUDPPorts = [ cfg.port ]; allowedUDPPorts = [cfg.port];
}; };
systemd.services.qbittorrent = { systemd.services.qbittorrent = {
after = [ "network.target" ]; after = ["network.target"];
description = "qBittorrent Daemon"; description = "qBittorrent Daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
path = [ pkgs.qbittorrent ]; path = [pkgs.qbittorrent];
serviceConfig = { serviceConfig = {
ExecStart = '' ExecStart = ''
${pkgs.qbittorrent}/bin/qbittorrent-nox \ ${pkgs.qbittorrent}/bin/qbittorrent-nox \
@@ -112,10 +110,7 @@ in
}; };
}; };
users.groups = mkIf (cfg.group == "qbittorrent") { users.groups =
qbittorrent = { mkIf (cfg.group == "qbittorrent") {qbittorrent = {gid = null;};};
gid = null;
};
};
}; };
} }

371
nixy/configuration.nix
View File

@@ -1,94 +1,57 @@
{ {
config, config,
nix-xilinx,
nvim,
pkgs, pkgs,
nix-xilinx,
system, system,
nvim,
zremap, zremap,
... ...
}: }: {
let imports = [];
USER = "akill";
in
{
imports = [ ];
system.stateVersion = "23.05"; system.stateVersion = "23.05";
system.autoUpgrade.enable = false; system.autoUpgrade.enable = false;
system.switch = {
enable = false;
enableNg = true;
};
sops = { sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; sops.secrets."peerix/private" = {
secrets = {
"peerix/private" = {
sopsFile = ./secrets/peerix.yaml; sopsFile = ./secrets/peerix.yaml;
mode = "0400"; mode = "0400";
owner = config.users.users.nobody.name; owner = config.users.users.nobody.name;
group = config.users.users.nobody.group; group = config.users.users.nobody.group;
}; };
"wg_privkey" = { sops.secrets."wg_privkey" = {
sopsFile = ./secrets/wg_privkey.yaml; sopsFile = ./secrets/wg_privkey.yaml;
}; };
"wg_preshared/nixy" = { sops.secrets."borgbase_enc_key" = {
sopsFile = ../common/secrets/wg_preshared.yaml;
};
"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; sopsFile = ./secrets/borgbase_enc_key.yaml;
owner = config.users.users.${USER}.name; owner = config.users.users.akill.name;
}; };
"borgbase_ssh_key" = { sops.secrets."borgbase_ssh_key" = {
sopsFile = ./secrets/borgbase_ssh_key.yaml; sopsFile = ./secrets/borgbase_ssh_key.yaml;
owner = config.users.users.${USER}.name; owner = config.users.users.akill.name;
};
};
}; };
nix = { nix = {
optimise.automatic = true; optimise.automatic = true;
gc.automatic = true; gc.automatic = true;
gc.options = "--delete-older-than 7d"; gc.options = "--delete-older-than 7d";
package = pkgs.nixVersions.latest; package = pkgs.nixUnstable;
settings = { settings = {
sandbox = true; sandbox = true;
experimental-features = [ experimental-features = ["nix-command" "flakes"];
"nix-command"
"flakes"
];
}; };
}; };
boot = { boot = {
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [usbip v4l2loopback];
usbip
v4l2loopback
];
initrd.compressor = "zstd"; initrd.compressor = "zstd";
initrd.kernelModules = [ ]; initrd.kernelModules = ["amdgpu"];
initrd.systemd.enable = true; binfmt.emulatedSystems = ["wasm32-wasi" "x86_64-windows"];
binfmt.emulatedSystems = [
"wasm32-wasi"
"x86_64-windows"
];
kernelParams = [
"psmouse.synaptics_intertouch=0"
"mem_sleep_default=deep"
];
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
kernelParams = ["psmouse.synaptics_intertouch=0" "mem_sleep_default=deep"];
kernel.sysctl = { kernel.sysctl = {
"net.core.default_qdisc" = "fq"; "net.core.default_qdisc" = "fq";
"net.ipv4.tcp_congestion_control" = "bbr"; "net.ipv4.tcp_congestion_control" = "bbr";
@@ -100,9 +63,7 @@ in
memtest86.enable = true; memtest86.enable = true;
}; };
readOnlyNixStore = true; readOnlyNixStore = true;
supportedFilesystems = [ supportedFilesystems = ["btrfs" "nfs"];
"xfs"
];
tmp.useTmpfs = true; tmp.useTmpfs = true;
}; };
@@ -113,7 +74,7 @@ in
doas.enable = true; doas.enable = true;
doas.extraRules = [ doas.extraRules = [
{ {
users = [ USER ]; users = ["akill"];
keepEnv = true; keepEnv = true;
persist = true; persist = true;
} }
@@ -125,22 +86,13 @@ in
}; };
networking = { networking = {
nftables.enable = true;
firewall = { firewall = {
enable = true; enable = true;
allowedTCPPorts = [ allowedTCPPorts = [80 443 51820];
80
443
51820
8020
];
}; };
hostName = "nixy"; hostName = "nixy";
nameservers = [ nameservers = ["127.0.0.1" "::1"];
"127.0.0.1"
"::1"
];
dhcpcd.extraConfig = "nohook resolv.conf"; dhcpcd.extraConfig = "nohook resolv.conf";
extraHosts = '' extraHosts = ''
@@ -171,47 +123,26 @@ in
wireguard.interfaces = { wireguard.interfaces = {
wg0 = { wg0 = {
ips = [ "10.100.0.6/24" ]; ips = ["10.100.0.6/24"];
listenPort = 51820;
privateKeyFile = config.sops.secrets."wg_privkey".path; privateKeyFile = config.sops.secrets."wg_privkey".path;
peers = [ peers = [
{ {
publicKey = builtins.readFile ../magpie/wg_pubkey; publicKey = builtins.readFile ../magpie/wg_pubkey;
presharedKeyFile = config.sops.secrets."wg_preshared/nixy".path; allowedIPs = ["10.100.0.0/24"];
allowedIPs = [ "10.100.0.0/24" ];
endpoint = "5.75.229.224:51820"; endpoint = "5.75.229.224:51820";
persistentKeepalive = 25; persistentKeepalive = 25;
} }
]; ];
}; };
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;
}
];
};
}; };
}; };
time.timeZone = "Europe/Sarajevo"; time.timeZone = "Europe/Sarajevo";
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nixpkgs.overlays = [nix-xilinx.overlay nvim.overlays.${system}.overlay];
nix-xilinx.overlay
nvim.overlays.${system}.overlay
];
environment = { environment = {
etc = {
"firejail/qutebrowser.local".text = ''
whitelist ''${RUNUSER}/qutebrowser
'';
};
extraInit = '' extraInit = ''
unset -v SSH_ASKPASS unset -v SSH_ASKPASS
''; '';
@@ -222,20 +153,10 @@ in
}; };
programs = { programs = {
steam = {
enable = true;
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = false;
localNetworkGameTransfers.openFirewall = true;
};
gnupg.agent = { gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
}; };
appimage = {
enable = true;
binfmt = true;
};
zsh.enable = true; zsh.enable = true;
firejail.enable = true; firejail.enable = true;
adb.enable = true; adb.enable = true;
@@ -243,125 +164,22 @@ in
sway.enable = true; sway.enable = true;
}; };
documentation.dev.enable = true;
# List services that you want to enable: # List services that you want to enable:
systemd = { systemd = {
services = { services = {
"zremap@" = { "zremap" = {
enable = true; description = "Intercepts keyboard udev events";
restartIfChanged = true; wants = ["systemd-udevd.service"];
wantedBy = ["multi-user.target"];
serviceConfig.Nice = -20; serviceConfig.Nice = -20;
unitConfig = { script = ''
Description = "zremap on %I"; sleep 1
ConditionPathExists = "%I"; ${zremap.defaultPackage.${system}}/bin/zremap \
}; /dev/input/by-path/platform-i8042-serio-0-event-kbd
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"
];
};
};
};
coredump.enable = false;
extraConfig = '' extraConfig = ''
DefaultTimeoutStartSec=30s DefaultTimeoutStartSec=30s
DefaultTimeoutStopSec=30s DefaultTimeoutStopSec=30s
@@ -370,13 +188,14 @@ in
services = { services = {
acpid.enable = true; acpid.enable = true;
btrfs.autoScrub.enable = true;
dbus.enable = true; dbus.enable = true;
dbus.implementation = "broker";
fstrim.enable = true; fstrim.enable = true;
fwupd.enable = true; fwupd.enable = true;
ntp.enable = true; ntp.enable = true;
openssh.enable = true; openssh.enable = true;
printing.enable = true; printing.enable = true;
rpcbind.enable = true;
pipewire = { pipewire = {
enable = true; enable = true;
@@ -385,29 +204,21 @@ in
pulse.enable = true; pulse.enable = true;
}; };
avahi = {
enable = true;
nssmdns4 = true;
openFirewall = true;
};
libinput.enable = true;
xserver = { xserver = {
enable = true; enable = true;
dpi = 144; dpi = 144;
libinput.enable = true;
desktopManager.xterm.enable = false; desktopManager.xterm.enable = false;
displayManager = { displayManager = {
lightdm.enable = false; lightdm.enable = false;
startx.enable = true; startx.enable = true;
defaultSession = "none+i3";
}; };
windowManager.i3.enable = false; windowManager.i3.enable = false;
}; };
udev = { udev = {
packages = [ packages = [pkgs.rtl-sdr pkgs.openhantek6022 pkgs.openocd];
pkgs.openhantek6022
pkgs.openocd
];
extraRules = '' extraRules = ''
#Xilinx FTDI #Xilinx FTDI
ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666" ACTION=="add", ATTR{idVendor}=="0403", ATTR{manufacturer}=="Xilinx", MODE:="666"
@@ -418,9 +229,6 @@ in
#Arduino UNO r4 #Arduino UNO r4
SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", MODE:="0666" 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"
''; '';
}; };
@@ -438,38 +246,32 @@ in
enable = true; enable = true;
bindings = [ bindings = [
{ {
keys = [ 113 ]; keys = [113];
events = [ "key" ]; events = ["key"];
command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master toggle'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'";
} }
{ {
keys = [ 114 ]; keys = [114];
events = [ events = ["key" "rep"];
"key" command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'";
"rep"
];
command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%- unmute'";
} }
{ {
keys = [ 115 ]; keys = [115];
events = [ events = ["key" "rep"];
"key" command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'";
"rep"
];
command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%+ unmute'";
} }
{ {
keys = [ 224 ]; keys = [224];
events = [ "key" ]; events = ["key"];
command = "${pkgs.light}/bin/light -U 5"; command = "${pkgs.light}/bin/light -U 5";
} }
{ {
keys = [ 225 ]; keys = [225];
events = [ "key" ]; events = ["key"];
command = "${pkgs.light}/bin/light -A 5"; command = "${pkgs.light}/bin/light -A 5";
} }
]; ];
@@ -480,27 +282,22 @@ in
settings = { settings = {
ipv6_servers = true; ipv6_servers = true;
require_dnssec = true; require_dnssec = true;
require_nolog = true;
require_nofilter = true;
http3 = true;
sources.public-resolvers = { sources.public-resolvers = {
urls = [ urls = [
"https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md" "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md" "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
]; ];
cache_file = "/var/lib/dnscrypt-proxy/public-resolvers.md"; cache_file = "/var/lib/dnscrypt-proxy2/public-resolvers.md";
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"; minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
}; };
}; };
}; };
borgbackup.jobs."borgbase" = borgbackup.jobs."borgbase" = let
let user = config.users.users.akill;
user = config.users.users.${USER};
home = user.home; home = user.home;
in in {
{
user = user.name; user = user.name;
paths = [ paths = [
(home + "/pic/priv") (home + "/pic/priv")
@@ -537,23 +334,6 @@ in
logind.extraConfig = '' logind.extraConfig = ''
KillUserProcesses=yes 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 = { fonts = {
@@ -562,7 +342,7 @@ in
allowBitmaps = true; allowBitmaps = true;
useEmbeddedBitmaps = true; useEmbeddedBitmaps = true;
defaultFonts = { defaultFonts = {
monospace = [ "JetBrainsMono" ]; monospace = ["JetBrainsMono"];
}; };
}; };
@@ -571,36 +351,27 @@ in
dina-font dina-font
fira-code fira-code
fira-code-symbols fira-code-symbols
font-awesome_6 font-awesome
font-awesome_4
inconsolata inconsolata
iosevka iosevka
jetbrains-mono jetbrains-mono
liberation_ttf liberation_ttf
libertine
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk
noto-fonts-color-emoji
noto-fonts-emoji noto-fonts-emoji
proggyfonts proggyfonts
siji siji
terminus_font terminus_font
terminus_font_ttf terminus_font_ttf
ubuntu_font_family ubuntu_font_family
vistafonts
]; ];
}; };
virtualisation = { virtualisation = {
libvirtd = {
enable = true;
allowedBridges = [
"virbr0"
"br0"
];
};
spiceUSBRedirection.enable = true;
containers.storage.settings = { containers.storage.settings = {
storage = { storage = {
driver = "btrfs";
graphroot = "/var/lib/containers/storage"; graphroot = "/var/lib/containers/storage";
runroot = "/run/containers/storage"; runroot = "/run/containers/storage";
}; };
@@ -612,6 +383,8 @@ in
}; };
}; };
sound.enable = true;
hardware = { hardware = {
bluetooth = { bluetooth = {
enable = true; enable = true;
@@ -622,11 +395,12 @@ in
}; };
}; };
graphics = { opengl = {
enable = true; enable = true;
extraPackages = [ ]; driSupport = true;
driSupport32Bit = true;
extraPackages = with pkgs; [];
}; };
rtl-sdr.enable = true;
}; };
zramSwap = { zramSwap = {
@@ -634,18 +408,9 @@ in
algorithm = "zstd"; algorithm = "zstd";
}; };
users.users.${USER} = { users.users.akill = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;
extraGroups = [ extraGroups = ["wireshark" "kvm" "tty" "audio" "sound" "adbusers" "dialout" "wheel"];
"wireshark"
"kvm"
"tty"
"audio"
"sound"
"adbusers"
"dialout"
"wheel"
];
}; };
} }

88
nixy/hardware-configuration.nix
View File

@@ -4,62 +4,74 @@
{ {
config, config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.luks.devices."crypt_dev".device = boot.initrd.availableKernelModules = ["nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
"/dev/disk/by-uuid/e10821b9-5426-4f03-b716-1645a64fcd6a"; boot.initrd.kernelModules = [];
boot.initrd.luks.devices."crypt_dev".allowDiscards = true; boot.kernelModules = ["kvm-amd" "amdgpu"];
boot.initrd.availableKernelModules = [ boot.extraModulePackages = [];
"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."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/c461c971-54ca-4fb7-91e8-6ac70de53ef2"; device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
fsType = "xfs"; fsType = "btrfs";
options = ["subvol=root" "compress=lzo" "noatime"];
};
boot.initrd.luks.devices."sys_enc".device = "/dev/disk/by-uuid/682d030d-189e-4b47-a60a-62cf1f3729d3";
fileSystems."/home" = {
device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
fsType = "btrfs";
options = ["subvol=home" "compress=lzo" "noatime"];
}; };
fileSystems."/nix" = { fileSystems."/nix" = {
device = "/dev/disk/by-uuid/eeaa6fab-d67d-400f-b6d4-b1f44c2e0047"; device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
fsType = "xfs"; fsType = "btrfs";
options = ["subvol=nix" "compress=lzo" "noatime"];
}; };
fileSystems."/home" = { fileSystems."/persist" = {
device = "/dev/disk/by-uuid/aeaa71ca-a439-4ef3-9ab8-db7ae8f59376"; device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
fsType = "xfs"; fsType = "btrfs";
options = ["subvol=persist" "compress=lzo" "noatime"];
};
fileSystems."/var/log" = {
device = "/dev/disk/by-uuid/f06ac545-07c1-4b2b-8c0b-eeac43892933";
fsType = "btrfs";
options = ["subvol=log" "compress=lzo" "noatime"];
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/828E-F3C3"; device = "/dev/disk/by-uuid/3F3E-9833";
fsType = "vfat"; fsType = "vfat";
options = [
"fmask=0022"
"dmask=0022"
];
}; };
swapDevices = [ ]; fileSystems."/opt/xilinx" = {
device = "/dev/disk/by-uuid/f5c27ef2-8053-4d96-9f8f-c6a50d6193b9";
fsType = "erofs";
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; swapDevices = [
hardware.cpu.amd.updateMicrocode = true; /*
hardware.enableRedistributableFirmware = true; {
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;
} }

25
nixy/secrets/borgbase_enc_key.yaml
View File

@@ -1,21 +1,30 @@
borgbase_enc_key: ENC[AES256_GCM,data:AD+JghEOX25tBGYhoU1ge1fqrA+5AK8N4yg=,iv:u05GVeWbL3xdZQgGkXSPkxlATd2M9MX4uSZiLOHMMRE=,tag:pmTQIJWmz+ePmSNzO/EO4Q==,type:str] borgbase_enc_key: ENC[AES256_GCM,data:HBjoQkV3wDor8olcM4cejfi+1HDZWsjypL0=,iv:cgKsWfPY0+IvgobxVbz/IN4ujNLJzBZ0iGx7D4hj4YM=,tag:M2EC1eWtCYuTvgrauzJ7JQ==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
azure_kv: [] azure_kv: []
hc_vault: [] hc_vault: []
age: age:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrTTFkWkkxK3hsa3p4NnZY
MEUvZ1N3VUozZ1dtSmRldVR1YTFCdU1Nd2hjCndHenR1d2sxcjhVN2NVZlQ2R1Br
VmdhMWlSaStDSmpNSmVpMmd2dkpEZ1kKLS0tIFlDdEx5RWxjKytXWlFLeEVmNmtk
TVhYVkRuM1pIbXdiMEc5eW1EQi9nWHcKIDT3i5UWvL/2T8TvBNSITdl77BamTwNK
2OjhkvGtM+L7LSniO8OYm/i+CjsfiSmFScWbDr9JsjFPUpedt96mHg==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEaDhSZVVibVl1NU84NG9U YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVNlBzMUJBTW5kMVU2R1Z1
aEVQbThIcC9CajNHS25SVW1SMFFwMUsvMmxJCkpTVThpZ0JZdEpLTnJlQWFqM244 VXBlRmxndHFEMTFRMXZRZnBpSzBOOVhzcmtRCkZCL20wend0cDFDNlNsemdwclRt
LzFaUFVvWWxIcU4wRlhXalF5TkNpVHMKLS0tIExXMUx5cDBBbDloQ0sxbEY0eGdj TUJTNjVrUVljS3VRandST3lqclM2MFkKLS0tIEc1ZCsyNFViQmhUZ0xOTVNza3B2
bE5vNHVHekI2RzY5M3JNcTdCa3pNeUUK8C04wF1te6epA97sNrhoz0VUn+MC7SML Y0ROa0Y4M2YzbjduYjJqRW9pUEVpMWMKMR4gJdaVW/ke7wV+9lq3vR/FzkY+Kgs/
6N1CZK3MuRARBqcj4c/W1aXuTysvuV1o/Fl5xOk/gbumcfwnDYj28A== qm0MwdSJSEcUnYUyyH6YL1yW/I/LqIuLLYozgD8DgNZFPMta38T9hA==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-04-21T08:14:25Z" lastmodified: "2024-04-06T19:19:16Z"
mac: ENC[AES256_GCM,data:7M+akGH09E2JYyKLmwpjx0VCEBmXqO6bNHFNRCO+9LdSIqsEw8MD4WGO0zwHOD9ls7+1OPFeoU+MVbtfMhmvN4g6rg+tFkXbxPSXCPkTA4tL90ZLXoBIpUBxKKhFMxtdOnjXxES3rTzjXGAvxocFOiNv/7pKbzeqMJUnH9FgAcM=,iv:h0+OpLmutMyPN3YFhyuHFgWSqxVK5WmBAE0k5ezEo9A=,tag:UKOXnTOjWaLDEOYk5YK4Aw==,type:str] mac: ENC[AES256_GCM,data:dAMQvSiNQASgtT807D1104P1/yYGazqEBKXJ/W69kLPh75sxIz8tFs6A6qzp3XW750OFHqwItaFZXBDXqAOt1/513bZAN8Nvy+NN9/mwbkHzsYY1ygpuq/YHjXAa0VSiWNigwrNLejMmk58k3TWukUYQ7QnR64ARXRSWFtJji1Y=,iv:111Wzv0qYS+EdRd+byNGJFumVyp/sIhlYGVkzOJZhjo=,tag:4xR8LZTRlfYQsbgYnm1t2g==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1

25
nixy/secrets/borgbase_ssh_key.yaml
View File

@@ -1,21 +1,30 @@
borgbase_ssh_key: ENC[AES256_GCM,data:lLHIBmw/03An3SRJUjYS2pn0g7XEW0kTXtSObhIGwjBwlRypU7uQDz4JseOA2GbSm+GqsGK8U3Ifgirb7t8AsGy6DPxO+2sm+ByJ1S46G6cwkO2GateJw4Zg0mmhUBBuB/eXQMLuBLKZM2WGta5+6O0SWxDtsrTsBhlo5qbwwYILu0gg2zsBWFSn1OBGgvjYYRTd7N85WX8+S7oNYVAL2HjCmhHHtYrLnua4ajBY9dQEzrKdZaQW4v39HV9MyoilEz17fFLU8S2KbJ1iw8HgoAc9W81hpQNNd8fWKY+e0iWxD9X5H7UTs8YP/bsKeWyG4OAwr99zIZ1Lqzi0EuZI+PYkIz4Q4WBmv1wD6Py274iug3kr1OqvaIOmIT/9j2C3mOZTqxuFaF5T4NMkcIeViCBmRwUMTl/8a36X+n/MYxRoznHCQmg8zKubDuykVJfBmFwxbUc9tx8PeodnWeiASOV7FvBie47yq+NyBGItJXAK14SxLE9T2sxRchJWcrQBcekZdZ5Mej20lfUlcAGkwfUc0e54xsv1K3oY,iv:5157BQmbfuF5EYbDHCy/TmnTYErIwmgXO8RaX6f18xs=,tag:T2eZN46Qd6RgLWk4kbYgPQ==,type:str] borgbase_ssh_key: ENC[AES256_GCM,data:3DweTqDZP5TCmgq7aH3ZIgXFKEKdFmpntLhOSTinjkfmldx3vumWLpRu5r2FChOptfsA0iBj1S8semA0b4pdZthDKQwixsf9k0sg4YZOiPkSewwgyQqigoiO6mug2yHetZNYYVfxFaEGLLNqdLHqVEYa7UPtxH4XzFKARs0lv1dNGq6i8Vd4ZZWgd2zMohMlLQT8frR/CZPYk5SsRzbZ44AkyVlb80ktDn7SDs48H/aJvdlQ3VPkyPO/SIAaTm9BxzNPVApzksdsydvVUnUjlnugKtp9a4rwX0rFxvDORzNu/wPCX7OGaHJxwEczLlQmYckpxGh7Cpt1YqwobrSl8BU3vhywrYtOulBhdJuCnHZL+mQ2WpLspm5nuo6w3LmaEGe+/rMu6GxYFcLeSxSnON8kqNg0Nfe4jLokf15CADmXoMAgqd3Kax+s8xJQL/bgpHvY38qIoDJ1fS30jwCXImWRZzOozmgpFwP42fT/a5N4x/m7BvYFLzBRve3SLMRuQf3iWS44IKo0Zvm+2T22ECK72h4a2YpfcKQu,iv:WWUs/yHYbHVWwyXgmkBP1585N4AsthD4u6atug0L3nM=,tag:x+unGowhm8IbpEg3scQ5CA==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
azure_kv: [] azure_kv: []
hc_vault: [] hc_vault: []
age: age:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6ZmMwY0JVdjlmYkJNbjF0
ZmM3MXNzakI0cDlmZk5KYmd0K2N3SXJMTlhZCjNQSURBN1JuMk40NXlsVG5aZzRq
NnprYm9jTVZwWGdSOElEM1JGVFRyRDAKLS0tIEEybnpQci9YL3F3NTRod1VQWmVG
MkMvSC8rcDZkaUFJU2E2dGRHUE0wVHMK5KypL9Yx/fpwRMc4gKVXLLXOyHpdqS+S
OWywZxSRd7dRG7If3ZDRCtvZ34XGKwOrAHoZrCc4lAa4drXmBrP3Iw==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5b2YzSDdaU3R5TUdqS3Nv YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrYk5EVHU5emVVVEc0elhZ
eUYraFBiZlZ1TXBqYzlWNUNYOFlyMzJvWEE4ClJ6R25CRXRUZ2FDTFY2ZmJIRkRX M1ZOYTNPU1B3OUFJc3N3b1hEUlFIYjlOUkVJCjhka01LSW1lMENLanplcUxPZHhM
WVJCSy83N2JUNzRuT3VuSUF1OTV2TUkKLS0tIEZ5cVg1V2o0MkdmWEx1emJVdjZ0 WDU1ZDB4enloUDlMNHo1dDU2SFA5ZUEKLS0tIGFJU2k1WHcyT3NTeFZkRi9pUHNy
RkZFL2tRNW9RdnAwalE2ZzVQcnljRFUKRyN8ahv9ZI63m8ycl74GZ59lyAXUsKmi Tm5UbTY5U0xmMUUweHZNWHlOMU1maTAK6NEU4Bl7uY8NcgrzJtIRjtusoggreIHc
tfPqQvL1oTtJr3hzwy2bkctXQLYjGvsMyZt2tiWpy5vLc1MrxlqVDQ== +xDRaROFCzpWkwNh1m5olPSP1C/fdUbKaGJ35if+Pj5Rt8GwaUdcRg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-04-21T08:16:40Z" lastmodified: "2024-04-06T19:18:12Z"
mac: ENC[AES256_GCM,data:VkXpCPQB4RypDrK31pYWXeOcl8ulis6fMF1q/SLCg2wXnL0jFrmAFp78C+ers9xFhbnUnMbVc/ZJIVKfa0g94WV3jJbn4+HB0GPWQCz7LwhmG5XEY5O5sFLuDCcHb/epZvDbCsEQeiq+TGDHp6TtdL8qDF+hE2k8qfsy570wocU=,iv:HQleJtHWQ5uk4+Witn2aaqh0SvXqomfiSO/ExgPzVag=,tag:hlBmboddR8GDAmBpETi0Ow==,type:str] mac: ENC[AES256_GCM,data:0B25mCDuyw7Ts98GZZ1+MukEwE3Ud8ytyC0VNJ5FuHG78h1uIEuWLBhw8YoYDsaMegiQBalJwK8oCGKnEI0uVHmoaktrGQoqsxAwMfC2vr/PhckJGx/5uILDrIW+/wCJz18evGB7/yGk6Sgvtk0oGqZDKXbNgUXvUQKByxZ+Id0=,iv:0eFOkVPnDohf79yMGepLmwHusV7T13mUbyXGapq4eYc=,tag:6PDerYjQOf9bss+tdvQDlA==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1

27
nixy/secrets/peerix.yaml
View File

@@ -1,22 +1,31 @@
peerix: peerix:
private: ENC[AES256_GCM,data:Oi8H5nqJ0Bf45wQepCjdZNHBOv4AlPxNN7L5Th3gcRQlW1FS77nusIWGSUvlmL2a5LTN0FV36o2GFPrrhiwmvnkQwuSZKc9VeDTf7SX0RRL1NLmRR/zy4WsRNJFxlqtjahieqg==,iv:6hJwqcdPayZaYZhJ0OfYLAtmeVndLEfeYZjUq5/3qJE=,tag:MiAfg8aZAHNYbB0JwcdStg==,type:str] private: ENC[AES256_GCM,data:767u5KKjk2lMr70vtBvX06t8n/1r5xpCrRNKc9QvypJmbPS+vS8vij8JYJZDKKFBh5xUazSLQC1ga2mpb+hEO2rgD0Aa70p22wwfOP+qCJQNYwlEf0MLWhlblTCE9Cr/eQSX7g==,iv:tPEB4NWbLMvzrUIvosj9PfinMhdWNBu5btjElvbDzxg=,tag:wzxaBzW0R6HKCyP5zlMPRw==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
azure_kv: [] azure_kv: []
hc_vault: [] hc_vault: []
age: age:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRbi9uTGVPYlhYYWdFb25u
SGhSUm9rNmEzSkNVUEVIOGNLb1Z3VFdjNERFCjVEYXlXTlRCV2dLMW1VMWgzcXBR
OWxSOUZjZ2VCTzRycDhZRGRXWS9KRTAKLS0tIG8yMkZNeFRtdHVPTTJOM2tRSk5F
OXp3Wmh0b1lYQnJBWlMxeGZaZXdnY2MKftJPaUc9sDM8YmvUo1eVDNXWX4scr1rH
SMAod/Oq0BvQfyGIpvVBfL5T7RxlF1DwOedg/p3PSfMPjok7QLyv+A==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBSMEIyck1xbVJ4Zm56Z3dM YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxdU9WSjZkWUd6NXFpdXNp
OGsxa1p0TGIvRE5DYXZzTDM3YUZFVTAxbUUwCllPd0FOUlRiZW5wT2QvLzZXYjRr R2huUXZQOGZzb0Z0ekN2WkdRdEFJYk54RmhnCmo0ampNK01VR3lQM0RGYWlNQ3cx
S1A5WjZxLzNYQ1ZWVFFQTzRwMFQweFEKLS0tIHNoZUpHS2dDNmFKc3ZVNFZuUFU4 Rk1BK1lIUHJPZ2R5YVd6RTlYbXJDVWcKLS0tIGV0Yy8ySnFMQ25PQUNBL3dPdmc3
L0M0MitMeDg1ZWYxcDNCQlVGUjRKeFkKvD2SKnuh517o2knPr2SOWq3kubMyI7UV WjhldWNVL0h6T1lUSEdXeHFQemRBVEEKJzh1HExRoy/iyTtBNaVdNgolWyFHaaLV
j6HgXVbHUDjmKl2dY+YVTnmxrK54E+Q6iiu7mQnvLdzxYBK/EiNt9w== VTDZYEHq+eEIrVAG5xefG/nPpj2K6FRItA6+4PcKtyARG+gKYwp2tw==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-04-21T08:17:51Z" lastmodified: "2023-07-28T11:55:00Z"
mac: ENC[AES256_GCM,data:v4KQq3Y5ZxsyMxR+FS1BZkH/bPTIIHfQu800U44odaNycIbWnuwCnLWGyJK6Por76bWALycGppDbHPKKW/N1I1XLy/EAXo02+nhHNvKVi2cXSXciuEPc/Cl+6TbP39lx4+EOM8CZoNZ8HAiS3QPy2bwZdMjEw/OHl8TqlN07q9s=,iv:PIcv/b6t+54/yCTZj+12Yep15ors/wXNUnaXjLjpVbM=,tag:JxO5M3OYaWzqgf4gUhCzzg==,type:str] mac: ENC[AES256_GCM,data:ieNyjQlo1tQ8qxFMyIN5XGgUiclYIfJe6WUyWiR3qJKKOTnx5MBWNUuHfUMkpm2ToNpaxiDUih2Hhqv5S0Bq1zoExMLjqE36GgaOivha6DeoQn5+WH8bMdMAoc1PlCQkj6Fxw2sdZlrIKcswADk4MfDzdaY/vKoQ5AtK5Bdkgok=,iv:JaOfWEwbLhOTquQVIG6Ll38jkGOCzbtD8h5c7SOAzik=,tag:m4Fmor24Q9GDoe7nu2VnEA==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.7.3

21
nixy/secrets/wg_preshared.yaml
View File

@@ -1,21 +0,0 @@
wg_preshared: ENC[AES256_GCM,data:k+aFYDNMojf5kktn6KJ4F5mH5oGdqxdF0MO88NcYpai9USnH394XRL9ASvs=,iv:L5LIXbADhrivKjK/V0E5QpRT7BDsktwIuKHgY+2qr84=,tag:pCW1naU/ygxAIDYWV2hHPQ==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age:
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZSHZvYy9TTmVEb2ZSTncy
ckJ1bXZGWVdJSkVHMGx2Vk5ZNlZ3Q2wzVFQ0Cmg1M3hKNFhnZk5nTE54RTdyR0Vs
NVRiTEltSnkxdmhhdGlycHNPWjFLbncKLS0tIE02NVJRZTd0VmowT1c4cjhKNlZk
Q01BQWNSVWtIMnFXRWpxR3JDMU8zYTAKIbfpM8uUb09cUlA8YWtgEOL5zvWf5omv
baZINiAu0/f1avYmW6Qb+aLa2ALrSZaotj46Uwd9Lb5mtjJ/8v9IOg==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-04-20T18:12:20Z"
mac: ENC[AES256_GCM,data:4PWjwxOO0UuNsevCbzCLaiW7C+So4mEGivd9GzyLKx2JlkNFVB8wqPrY1Rl1ANMrT+7LKc8tVOA4zbweNc9idFG4y5DcvnDSieqKu9v1MeEMHqNpz5TTLbCP81g7qegjI/WKul2kaWIdPaioI/f5x2E6rEYnzFv+Di2mc3W+Qcc=,iv:iE9sali0O3sQIhOw30RGR/4ZQsAPcSxq1qxosfasojU=,tag:+9AOwph5A4oDXsK6Z3YeZA==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.8.1

25
nixy/secrets/wg_privkey.yaml
View File

@@ -1,21 +1,30 @@
wg_privkey: ENC[AES256_GCM,data:XL9FU1kZXvBJfwyt3HpQe8k8zg9HT6Xm0BdjNMduSu9uAgcHbglpLc/qTB0=,iv:QgX1VsmLUsDozFXmzDVPukjPNTa4Lnh806AQ4qdgpa8=,tag:RNVlDbtx8vAAbG0rinLVOw==,type:str] wg_privkey: ENC[AES256_GCM,data:HcOkr+leeB6QmEx77KHWgFlp2m2qr4TvakoHyy0SaPpML2o/51IDYjcu2H4=,iv:8nHJIqz3+LmL4rM7idXbvbQKdhkDqmoY/TAvAf/Zfvw=,tag:VSHRKjVgottVC0uPsC0JgA==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
azure_kv: [] azure_kv: []
hc_vault: [] hc_vault: []
age: age:
- recipient: age153y8mz6gqy5t54q4fnrdvjj4v5ls9cgp3hhpd2hzf5tvkcnncf6q4xns0j
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzaTRxUDZJREhyYjQraUsw
T1p2UlpkSjBnbjZTWUJDM2lHUVN5Z1ZQQWdvCnFmV1RRazBpTHhrTHpQelpjcnlq
NnJ0dUNwZTB0V0hOdTJJamY3azBUbXcKLS0tIGpZUG5KUFhPbW1LWWQ1RUd2OFVq
WlBMd0tGcnBHSFk4SHhkVkZPZXJPY28Keh/k5yQ/iJgy9S9rf2DhCr3M2ozgMBRp
NJrCKJuiDugeK8q29x6a+4pyg2zSwlA6Q2lxGDca3m3TX45QImLt3g==
-----END AGE ENCRYPTED FILE-----
- recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s - recipient: age1geqqmsnng2e9sja6uxxmtlwlm4c6e5v6ch3l3yjenstq6tjq4fusr0305s
enc: | enc: |
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBSnkyM1ZrcnEvM3VHL0Nk YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEelBJaCtJVnVZcHQ4V1Nz
THhUUDdGU2s5UFgrVGZ3WXhkYTRIVTlaeGs4CjR4eVpmRy9qUkZSWkpFZDZHRDZI ZDV4T21VZGNjanpRbERxOWx1RXNZZ2hwTFdrCmg4MHdWTnVTd0hiL2F2VXRxUk5P
ZWRXSmMzL2RWZkVrSlFPcC9ueGpDVFkKLS0tIDZWbENyS2hrSCtlNlBHaE56QTha eHRrRTduZjZ6T3dCcW0yMENKMHg5TVkKLS0tIDVSMFJqQU1uTEpzTElIN3RZNi95
eFJmWXk1SVJEbDJOc1Q1VFlzVS8yODgKFXRAtR+67x0dkQTqZPtMT0Hd+aW+5K17 S2Y2dFROYkJCOTVlS00rZWZDeWlGV2sKWKV7lMoLQbDBTql5+xWW+uOKxS6FG7jT
S/lhuHRhITt3woQnecVPMYklgJJlsyQ6blKhJw8dvhbVWWThZ853rQ== BtAMbL2YfTCEcV7nimzco649UUtoY9oOk2635uoToIxBI1mr9UVlNw==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-04-21T08:18:59Z" lastmodified: "2024-04-04T19:26:58Z"
mac: ENC[AES256_GCM,data:xPKsGZD5RKT/WMRupe4YTgoiUQRFq77KQyGaazeY1GEPI117gWxRHEpiyCLnfhZWcaekPWoXosm32wRLwDAXM/Femk567i5uKKG2wAqApWbc+FXTQ71w/CFr9uEWFApBjpEHpuBBaFV23qJfylsqeMp9r52d9Sp5eDQC4RJead0=,iv:oiNoZ/bqQUe+luqeuldw1M0KB2d4C5T7kXy+mLFZNZQ=,tag:5pK22TYGwbBNyWlfd/Ufxw==,type:str] mac: ENC[AES256_GCM,data:ZA1Rc1sMvIwEQBZ6d+u4RZ00KzLxjMW/Tzr3ZlHMduuJmvDXjPjobpALwbJoEraa3yBwwJyf0b0Grwhlz1kvoWYjos3rTk8noy4UiEjav5Dxf8aZP5j6YL5HSzHgwWvRkzYvIAaaVGVpUM7Wl2llDSCeQluIw0R3kUXEiRW10RU=,iv:/fq3S0kmo9IZNvnP2o4kT2beaRgEMtJIMlQNCqSotd0=,tag:eMOrWijXQsc8agWGJmyLjw==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1

22
nixy/secrets/wg_privkey_proton.yaml
View File

@@ -1,22 +0,0 @@
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
View File

@@ -1 +0,0 @@
eoYSDh27qQFpvOcDmuVFzSTuPnrHQYXDMqatKmDAth0=

2
packages/bubblewrap/default.nix
View File

@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
description = "Unprivileged sandboxing tool"; description = "Unprivileged sandboxing tool";
homepage = "https://github.com/containers/bubblewrap"; homepage = "https://github.com/containers/bubblewrap";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with maintainers; [ dotlambda ]; maintainers = with maintainers; [dotlambda];
platforms = platforms.linux; platforms = platforms.linux;
mainProgram = "bwrap"; mainProgram = "bwrap";
}; };

20
packages/viber/default.nix
View File

@@ -44,16 +44,16 @@
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "viber"; pname = "viber";
version = "23.2.0.3"; version = "21.8.0.11";
src = fetchurl { src = fetchurl {
# Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb
url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM="; hash = "sha256-RrObmN21QOm5nk0R2avgCH0ulrfiUIo2PnyYWvQaGVw=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [makeWrapper];
buildInputs = [ dpkg ]; buildInputs = [dpkg];
dontUnpack = true; dontUnpack = true;
@@ -115,8 +115,7 @@ stdenv.mkDerivation {
xorg.libxkbfile xorg.libxkbfile
]; ];
installPhase = installPhase = let
let
viberWrap = writeShellScriptBin "viberWrap" '' viberWrap = writeShellScriptBin "viberWrap" ''
${bubblewrap}/bin/bwrap --bind / / \ ${bubblewrap}/bin/bwrap --bind / / \
--dev /dev \ --dev /dev \
@@ -125,8 +124,7 @@ stdenv.mkDerivation {
--bind $HOME/Downloads/ $HOME/Downloads \ --bind $HOME/Downloads/ $HOME/Downloads \
$@ $@
''; '';
in in ''
''
dpkg-deb -x $src $out dpkg-deb -x $src $out
mkdir -p $out/bin mkdir -p $out/bin
@@ -163,9 +161,9 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = "https://www.viber.com"; homepage = "https://www.viber.com";
description = "An instant messaging and Voice over IP (VoIP) app"; description = "An instant messaging and Voice over IP (VoIP) app";
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; sourceProvenance = with lib.sourceTypes; [binaryNativeCode];
license = lib.licenses.unfree; license = lib.licenses.unfree;
platforms = [ "x86_64-linux" ]; platforms = ["x86_64-linux"];
maintainers = with lib.maintainers; [ jagajaga ]; maintainers = with lib.maintainers; [jagajaga];
}; };
} }