rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2025-04-11 09:16:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: rouven.seifert:5def708423e174acc902e5f14526e6d65099dcc5
Branches Tags
rouven.seifert:main
rouven.seifert:push-vxnoqsltyuxy
...
compare: rouven.seifert:d14f499783f8cfaf4d2cbaf04cefa8ae1b2954f0
Branches Tags
rouven.seifert:main
rouven.seifert:push-vxnoqsltyuxy

3 commits
5def708423 ... d14f499783

Author SHA1 Message Date
Rouven Seifert
d14f499783
dns: switch to dns.nix 2024-04-17 22:04:08 +02:00
Rouven Seifert
eacec7d6ff
treewide: smaller cleanups 2024-04-17 16:13:17 +02:00
Rouven Seifert
0e7abe56cf
ssh & packages: cleanup 2024-04-17 16:12:09 +02:00
7 changed files with 119 additions and 89 deletions
Show stats Expand all files Collapse all files

69
flake.lock generated
View file

@ -96,6 +96,27 @@
"type": "github" "type": "github"
} }
}, },
"dns": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1635273082,
"narHash": "sha256-EHiDP2jEa7Ai5ZwIf5uld9RVFcV77+2SUxjQXwJsJa0=",
"owner": "nix-community",
"repo": "dns.nix",
"rev": "c7b9645da9c0ddce4f9de4ef27ec01bb8108039a",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "dns.nix",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -134,6 +155,21 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1614513358,
"narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5466c5bbece17adaab2d82fae80b46e807611bf3",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
}, },
@ -180,11 +216,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712759992, "lastModified": 1713294767,
"narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -233,7 +269,7 @@
"crane": "crane", "crane": "crane",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -281,11 +317,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712459390, "lastModified": 1713067146,
"narHash": "sha256-e12bNDottaGoBgd0AdH/bQvk854xunlWAdZwr/oHO1c=", "narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "4676d72d872459e1e3a248d049609f110c570e9a", "rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -296,11 +332,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712791164, "lastModified": 1713248628,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,24 +450,25 @@
"river": { "river": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1712665127, "lastModified": 1713357595,
"narHash": "sha256-uACc9Cb1tSw3I0fMlEMX74NfU+Tg3It74tb+nc51AZ4=", "narHash": "sha256-LGqP2HBrMKGGTnqFDjmZRKXN88SQMgfLm2plVAzan8c=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "14e941bae16b1ca478c32198c131c4297157f888", "rev": "6b86af4f85f66697a0ffc504c4fcc1db05bfbb80",
"revCount": 1238, "revCount": 1246,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/riverwm/river" "url": "https://codeberg.org/river/river"
}, },
"original": { "original": {
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/riverwm/river" "url": "https://codeberg.org/river/river"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"dns": "dns",
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",

12
flake.nix
View file

@ -18,9 +18,12 @@
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
home-manager = { home-manager = {
inputs = { inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.follows = "nixpkgs"; };
};
dns = {
url = "github:nix-community/dns.nix";
inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-colors.url = "github:Misterio77/nix-colors"; nix-colors.url = "github:Misterio77/nix-colors";
@ -44,7 +47,7 @@
}; };
river = { river = {
url = "https://github.com/riverwm/river"; url = "https://codeberg.org/river/river";
flake = false; flake = false;
type = "git"; type = "git";
submodules = true; submodules = true;
@ -56,6 +59,7 @@
{ self { self
, nixpkgs , nixpkgs
, home-manager , home-manager
, dns
, nix-index-database , nix-index-database
, agenix , agenix
, impermanence , impermanence

85
hosts/falkenstein/modules/dns/default.nix
View file

@ -1,53 +1,52 @@
{ pkgs, config, ... }: { pkgs, lib, config, dns, ... }:
let let
secondary = "185.181.104.96"; secondary = "185.181.104.96";
zonefile = pkgs.writeText "rfive.de.zone.txt" '' zonefile = with dns.lib.combinators; pkgs.writeText "rfive.de.zone.txt" (dns.lib.toString "rfive.de" {
$TTL 3600 TTL = 3600;
$ORIGIN rfive.de. SOA = {
nameServer = "ns.rfive.de.";
adminEmail = "hostmaster@rfive.de";
serial = 2024041709;
refresh = 10800;
retry = 3600;
expire = 604800;
minimum = 3600;
};
NS = [
"ns.inwx.de."
"ns2.inwx.de."
"ns3.inxw.eu."
];
A = [ "23.88.121.184" ];
AAAA = [ "2a01:4f8:c012:49de::1" ];
rfive.de. 86400 IN SOA ns.rfive.de. hostmaster.rfive.de. ( CAA = letsEncrypt "ca@rfive.de";
2024040800 ; serial
10800 ; refresh
3600 ; retry
604800 ; expire
3600 ) ; negatives caching, ehem. minimum
@ NS ns.inwx.de.
@ NS ns2.inwx.de.
@ NS ns3.inwx.eu.
@ A 23.88.121.184 MX = [{ preference = 1; exchange = "mail.rfive.de."; }];
@ AAAA 2a01:4f8:c012:49de::1
@ CAA 0 iodef "mailto:ca@rfive.de" TXT = [
@ CAA 0 issue "letsencrypt.org" (spf.soft [ "mx" ])
@ CAA 0 issuewild ";" ];
ns A 23.88.121.184 subdomains = lib.attrsets.mergeAttrsList [
ns AAAA 2a01:4f8:c012:49de::1 rec {
nuc = {
A = [ "141.30.227.6" ];
};
falkenstein = {
A = [ "23.88.121.184" ];
AAAA = [ "2a01:4f8:c012:49de::1" ];
};
ns = falkenstein;
mail = falkenstein;
_dmarc.TXT = [ "v=DMARC1; p=none; adkim=s; fo=1; rua=mailto:dmarc@rfive.de; ruf=mailto:dmarc@rfive.de" ];
_domainkey.subdomains.rspamd.TXT = [ "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoirUMubro4nlmY6a8JMwK9QB2agAXiJzexDU/7ba6KCggONfoSTfUHlrM/XeM1GG/9oKpngApxDPP97adJuxc8/EELyo4HjTyYD8GBFZhg0AN7V8IPaJ1o5k6dGDk8ZLh41ZCnlAVWkhVSKs5pYtzkrlJIfUSzyuoe8nuFsVe3QIDAQAB" ];
nuc A 141.30.227.6 }
falkenstein A 23.88.121.184 (lib.attrsets.genAttrs [ "cache" "chat" "matrix" "seafile" "vault" ] (label: { CNAME = [ "nuc.rfive.de." ]; }))
falkenstein AAAA 2a01:4f8:c012:49de::1 (lib.attrsets.genAttrs [ "purge" "rspamd" "trucks" ] (label: { CNAME = [ "falkenstein.rfive.de." ]; }))
];
@ MX 1 mail.rfive.de. });
mail A 23.88.121.184
mail AAAA 2a01:4f8:c012:49de::1
@ TXT "v=spf1 mx ~all"
rspamd._domainkey TXT "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoirUMubro4nlmY6a8JMwK9QB2agAXiJzexDU/7ba6KCggONfoSTfUHlrM/XeM1GG/9oKpngApxDPP97adJuxc8/EELyo4HjTyYD8GBFZhg0AN7V8IPaJ1o5k6dGDk8ZLh41ZCnlAVWkhVSKs5pYtzkrlJIfUSzyuoe8nuFsVe3QIDAQAB"
_dmarc TXT "v=DMARC1; p=none; adkim=s; fo=1; rua=mailto:dmarc@rfive.de; ruf=mailto:dmarc@rfive.de"
cache CNAME nuc.rfive.de.
chat CNAME nuc.rfive.de.
matrix CNAME nuc.rfive.de.
seafile CNAME nuc.rfive.de.
vault CNAME nuc.rfive.de.
purge CNAME falkenstein.rfive.de.
rspamd CNAME falkenstein.rfive.de.
trucks CNAME falkenstein.rfive.de.
'';
in in
{ {
services.bind = rec { services.bind = rec {

1
shared/nix.nix
View file

@ -11,7 +11,6 @@
experimental-features = [ "nix-command" "flakes" "repl-flake" ]; experimental-features = [ "nix-command" "flakes" "repl-flake" ];
substituters = [ substituters = [
"https://cache.rfive.de" "https://cache.rfive.de"
# temp disabled until logging error is resolved
"https://cache.ifsr.de" "https://cache.ifsr.de"
]; ];
trusted-public-keys = [ trusted-public-keys = [

4
shared/zsh.nix
View file

@ -11,7 +11,9 @@
iperf iperf
]; ];
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;
programs.fzf.enable = true; programs.fzf = {
keybindings = true;
};
programs.zsh = { programs.zsh = {
enable = true; enable = true;
shellAliases = { shellAliases = {

7
users/rouven/modules/packages.nix
View file

@ -17,7 +17,6 @@
(zathura.override { plugins = [ zathuraPkgs.zathura_pdf_mupdf ]; }) (zathura.override { plugins = [ zathuraPkgs.zathura_pdf_mupdf ]; })
gimp gimp
ffmpeg ffmpeg
imv
# bluetooth # bluetooth
blueman blueman
@ -39,12 +38,10 @@
bitwarden-cli bitwarden-cli
# misc # misc
neofetch # obligatory
xournalpp xournalpp
libreoffice libreoffice
mosh mosh
typst typst
typst-preview
hut hut
# programming languages # programming languages
@ -73,8 +70,6 @@
]; ];
programs.obs-studio.enable = true;
programs.firefox.enable = true; programs.firefox.enable = true;
programs = { programs = {
thunderbird = { thunderbird = {
@ -98,7 +93,7 @@
enable = true; enable = true;
defaultApplications = defaultApplications =
let let
image-viewers = [ "imv.desktop" "gimp.desktop" "swappy.desktop" "org.qutebrowser.qutebrowser.desktop" "google-chrome.desktop" ]; image-viewers = [ "google-chrome.desktop" "gimp.desktop" "swappy.desktop" "org.qutebrowser.qutebrowser.desktop" ];
browsers = [ "google-chrome.desktop" "firefox.desktop" "org.qutebrowser.qutebrowser.desktop" ]; browsers = [ "google-chrome.desktop" "firefox.desktop" "org.qutebrowser.qutebrowser.desktop" ];
in in
{ {

30
users/rouven/modules/ssh/default.nix
View file

@ -16,7 +16,7 @@ in
VisualHostKey = yes VisualHostKey = yes
''; '';
matchBlocks = { matchBlocks = {
# personal use # Personal
"git@github.com" = { "git@github.com" = {
match = "Host github.com User git"; match = "Host github.com User git";
identityFile = git; identityFile = git;
@ -25,6 +25,16 @@ in
match = "Host git.sr.ht User git"; match = "Host git.sr.ht User git";
identityFile = git; identityFile = git;
}; };
"*.vpn.rfive.de" = {
user = "root";
};
# TU Dresden
"tud" = {
hostname = "login.zih.tu-dresden.de";
user = "rose159e";
};
# iFSR # iFSR
"fsr" = { "fsr" = {
hostname = "ifsr.de"; hostname = "ifsr.de";
@ -33,27 +43,14 @@ in
"quitte" = { "quitte" = {
hostname = "quitte.ifsr.de"; hostname = "quitte.ifsr.de";
user = "root"; user = "root";
extraOptions = {
RequestTTY = "yes";
RemoteCommand = "zsh -i";
};
};
"quitte-notty" = {
hostname = "quitte.ifsr.de";
user = "root";
}; };
"tomate" = { "tomate" = {
hostname = "tomate.ifsr.de"; hostname = "tomate.ifsr.de";
user = "root"; user = "root";
extraOptions = { extraOptions = {
RequestTTY = "yes"; ProxyJump = "tud";
RemoteCommand = "zsh -i";
}; };
}; };
"tomate-notty" = {
hostname = "tomate.ifsr.de";
user = "root";
};
"git@ifsr.de" = { "git@ifsr.de" = {
match = "Host ifsr.de User git"; match = "Host ifsr.de User git";
identityFile = git; identityFile = git;
@ -74,9 +71,6 @@ in
VerifyHostKeyDNS = "yes"; VerifyHostKeyDNS = "yes";
}; };
}; };
"*.vpn.rfive.de" = {
user = "root";
};
"git@git.agdsn.de" = { "git@git.agdsn.de" = {
match = "Host git.agdsn.de User git"; match = "Host git.agdsn.de User git";
identityFile = git; identityFile = git;