mirror of
https://git.sr.ht/~rouven/nixos-config
synced 2025-01-18 17:11:39 +01:00
some agdsn related changes
This commit is contained in:
parent
b81a7a669a
commit
0a2b482244
GPG key ID:
B95E8FE6B11C4D09
8 changed files with 109 additions and 48 deletions
60
flake.lock
60
flake.lock
|
|
@ -236,11 +236,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695886142,
|
||||
"narHash": "sha256-5g5meWSsNT2lTRu6CJyOBFEzHe3GomjSDQyIwUm39AU=",
|
||||
"lastModified": 1696761261,
|
||||
"narHash": "sha256-JZgJJU2rxnenCmt0z1WIl8iVhgbeH3zsoHOWnq/OB9M=",
|
||||
"owner": "helix-editor",
|
||||
"repo": "helix",
|
||||
"rev": "77fe8f214b15b8297a9f2f8ed929994559604d6c",
|
||||
"rev": "bdf7937a599058daa168fa24b0f52c06d4259cf7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -255,11 +255,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695738267,
|
||||
"narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=",
|
||||
"lastModified": 1696737557,
|
||||
"narHash": "sha256-YD/pjDjj/BNmisEvRdM/vspkCU3xyyeGVAUWhvVSi5Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486",
|
||||
"rev": "3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -275,11 +275,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1693308856,
|
||||
"narHash": "sha256-PnUsLLiO1qyGbNR5v9fNEf/PxDTYLI+3Ye2OzQxLeqE=",
|
||||
"lastModified": 1695887080,
|
||||
"narHash": "sha256-LaLn0edsKq66xYgLq2xLBTcUZV0ZcXFyyKNQjpWpN2E=",
|
||||
"owner": "therealr5",
|
||||
"repo": "TruckSimulatorBot-images",
|
||||
"rev": "d5cfb66fd8ebd499d1f4037c9a13374e994de2ae",
|
||||
"rev": "9a0a72077a90232ecf0de26dec25f7aadc692feb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -356,11 +356,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695526222,
|
||||
"narHash": "sha256-/NwZz3QcVplrfiDKk1thYg1EIHLSNucVHNUi2uwO3RI=",
|
||||
"lastModified": 1696736548,
|
||||
"narHash": "sha256-Dg0gJ9xVXud55sAbXspMapFYZOpVAldQQo7MFp91Vb0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "25d6369c232bbea1ec1f90226fd17982e7a0a647",
|
||||
"rev": "2902dc66f64f733bfb45754e984e958e9fe7faf9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -371,11 +371,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1695887975,
|
||||
"narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=",
|
||||
"lastModified": 1696614066,
|
||||
"narHash": "sha256-nAyYhO7TCr1tikacP37O9FnGr2USOsVBD3IgvndUYjM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "adcfd6aa860d1d129055039696bc457af7d50d0e",
|
||||
"rev": "bb2db418b616fea536b1be7f6ee72fb45c11afe0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -432,11 +432,11 @@
|
|||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1694908564,
|
||||
"narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=",
|
||||
"lastModified": 1696717752,
|
||||
"narHash": "sha256-qEq1styCyQHSrw7AOhskH2qwCFx93bOwsGEzUIrZC0g=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "596611941a74be176b98aeba9328aa9d01b8b322",
|
||||
"rev": "2f3b6b3fcd9fa0a4e6b544180c058a70890a7cc1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -448,11 +448,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1695830400,
|
||||
"narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
|
||||
"lastModified": 1696604326,
|
||||
"narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
|
||||
"rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -519,11 +519,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1693549723,
|
||||
"narHash": "sha256-44VdV79IVnHeM9npfzPMzrYFCzsjOMw50NViAyBbTqE=",
|
||||
"lastModified": 1696139730,
|
||||
"narHash": "sha256-Y7EIcrDVm6ACc9e8rXygXJkeODy1RzvlqI33ReV5Zug=",
|
||||
"owner": "therealr5",
|
||||
"repo": "purge",
|
||||
"rev": "5564156ed380db5619a5cf166467168ed23f701c",
|
||||
"rev": "bf9d45d1ee3bec6232ddc1028a25b433df32c85a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -607,11 +607,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1695284550,
|
||||
"narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=",
|
||||
"lastModified": 1696734395,
|
||||
"narHash": "sha256-O/g/wwBqqSS7RQ53bE6Ssf0pXVTCYfN7NnJDhKfggQY=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78",
|
||||
"rev": "d7380c38d407eaf06d111832f4368ba3486b800e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -657,11 +657,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1693549594,
|
||||
"narHash": "sha256-gXWdnVGC2vPjxrA9h7mdATFoNFj6JmCrswR2VBlZVVM=",
|
||||
"lastModified": 1696139715,
|
||||
"narHash": "sha256-iR455di8qCGvZjut4aXQbCBipl+s6hwVH/pme+RTziw=",
|
||||
"owner": "therealr5",
|
||||
"repo": "TruckSimulatorBot",
|
||||
"rev": "8865519845ba8099c529bb8b553d83ee2bc15bdd",
|
||||
"rev": "71bdfba7f79d091f47f9301e84f9f6982a7ddcc5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
owner = config.users.users.systemd-network.name;
|
||||
};
|
||||
};
|
||||
services.lldpd.enable = true;
|
||||
services.resolved = {
|
||||
fallbackDns = [
|
||||
"9.9.9.9"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
agdsn = {
|
||||
auth = ''
|
||||
eap=TTLS
|
||||
anonymous_identity="anonymous@agdsn.de"
|
||||
anonymous_identity="wifi@agdsn.de"
|
||||
ca_cert="/etc/ssl/certs/ca-certificates.crt"
|
||||
domain_suffix_match="radius.agdsn.de"
|
||||
identity="r5"
|
||||
|
|
|
|||
|
|
@ -44,13 +44,4 @@ in
|
|||
gnome-break-timer = callPackage ../pkgs/gnome-break-timer { };
|
||||
jmri = callPackage ../pkgs/jmri { };
|
||||
adguardian-term = callPackage ../pkgs/adguardian-term { };
|
||||
# some newer version
|
||||
nix-output-monitor = prev.nix-output-monitor.overrideAttrs (_: {
|
||||
src = fetchFromGitHub {
|
||||
owner = "maralorn";
|
||||
repo = "nix-output-monitor";
|
||||
rev = "7118a0149cfa379dc8e83485aa78270121c112f2";
|
||||
hash = "sha256-VZFeNxu6wF1wWrLODpYmovQ9FZ2GY0ibgFdvca72ziI=";
|
||||
};
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ email:
|
|||
rfive: ENC[AES256_GCM,data:j51G8LkEu3e3HPhZVTrBDsjJkDGIMZ3PPw==,iv:FtcO97LF57h4p8ZyvZPQ7gsLlQUyg+RzyIPlPYhLYK0=,tag:XbDBwcvWAlbuLvvV0I+2LA==,type:str]
|
||||
google: ENC[AES256_GCM,data:044yUHWp8PvtTytFwfCAhg==,iv:nRWzcxXCogombevZQxYsMuLL4us1kv6WKfChRphLR48=,tag:fnHxnweczc5bElK8kGa6rw==,type:str]
|
||||
ifsr: ENC[AES256_GCM,data:debmpTL+VYNE3InslDyV0FW1sKjBFA==,iv:ZKwyOMsfQivesFoEJeDCNnPzOgwlP0xmJ0GNsA57njM=,tag:CJZhWTb2MfsR+rv2VY6Xmw==,type:str]
|
||||
agdsn: ENC[AES256_GCM,data:ark7+PHOOd5IwkGOSShVnrwQ1g0tQuJ5,iv:d+rj8C3FUHg+bSjDAYd4bQ20vvocTpyjcQKwXEHVY/o=,tag:VC1ISQsA/u0iDY0DgJ6yfA==,type:str]
|
||||
spotify: ENC[AES256_GCM,data:J9j4aIyXIRZcjcjYH1+J,iv:fEiMS+BiXiq8O/fHV1nBPhQ+mv83Qx2SzntkSGd5aVg=,tag:1BZtXH9szEOJBs83LXhrOw==,type:str]
|
||||
ssh:
|
||||
git:
|
||||
|
|
@ -23,8 +24,8 @@ sops:
|
|||
N08rUm1KNCtOaHlYVnFZUFViZnNHeUkKvQTAtOKQqCJP54eV6bxxCWX5CKACPJQP
|
||||
MBkKw0jbgjBI4SuDdPQVaXE0gEllJPjENUjqXGVatYbhBStbIraZQQ==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2023-07-29T09:14:57Z"
|
||||
mac: ENC[AES256_GCM,data:yyNh1dMMhx+wJFZlbIEqPGlyzV7Y5hOdqio6xrf23y5h7AbOwCPHcNvOQE+liM8Hee3L8pVMULISN1PdisAmGfDq0a7gqdSHVCifQwbzi+/CY/X9mN8/ics3sGxQQpZS6ty9Tn5KPkBwLpQIHZlcUmf89hveya1gPYvIz5gXQvI=,iv:xWWpBSihcx5l0mEcZu6UVP2kJkpiLdzUYZhGjVRzaSk=,tag:vRuBoISmmKhSvozLFL2/Pw==,type:str]
|
||||
lastmodified: "2023-10-07T17:21:49Z"
|
||||
mac: ENC[AES256_GCM,data:sDuLHYDAaK13cW24xKSpPRAzmhT825PpJiQ56Yc+N1vrpcD2VtPBPniATGTfN4FeRw9SMqKs5AexyYgDu4NmXzCIGKx2qrIWOZPKrNyWKpxhzsm6rCK1MomFQsY8x5Hxlay3iGw180M7DANin6wYRumZT+G9VoF2FKjtWo0Tqxw=,iv:s35j6pvH9Sud+nnDqmin6wEEW4UytDCQTD+m9eWqoY8=,tag:uuILTZQbGubKo903aPgr+w==,type:str]
|
||||
pgp:
|
||||
- created_at: "2023-02-25T23:44:24Z"
|
||||
enc: |-
|
||||
|
|
@ -47,4 +48,4 @@ sops:
|
|||
-----END PGP MESSAGE-----
|
||||
fp: 116987A8DD3F78FF8601BF4DB95E8FE6B11C4D09
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.7.3
|
||||
version: 3.8.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
users.users.rouven = {
|
||||
description = "Rouven Seifert";
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "video" "libvirtd" "tss" "input" ];
|
||||
extraGroups = [ "wheel" "video" "libvirtd" "tss" "input" "_lldpd" ];
|
||||
initialHashedPassword = "$6$X3XERQv28Nt1UUT5$MjdMBDuXyEwexkuKqmNFweez69q4enY5cjMXSbBxOc6Bq7Fhhp7OqmCm02k3OGjoZFXzPV9ZHuMSGKZOtwYIk1";
|
||||
};
|
||||
home-manager.useUserPackages = true;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ in
|
|||
"email/rfive" = { };
|
||||
"email/tu-dresden" = { };
|
||||
"email/ifsr" = { };
|
||||
"email/agdsn" = { };
|
||||
"email/google" = { };
|
||||
};
|
||||
home.packages = with pkgs; [
|
||||
|
|
@ -269,6 +270,65 @@ in
|
|||
extraMailboxes = lib.lists.forEach [ c.root c.ese c.github c.reports c.sent c.trash c.junk c.drafts ] (x: x.nearPattern);
|
||||
};
|
||||
};
|
||||
"agdsn" = rec {
|
||||
address = "r5@agdsn.me";
|
||||
# gpg.key = gpg-default-key;
|
||||
realName = "Rouven Seifert";
|
||||
userName = "r5@agdsn.me";
|
||||
passwordCommand = "${pkgs.coreutils}/bin/cat $XDG_RUNTIME_DIR/secrets/email/agdsn";
|
||||
imap = {
|
||||
host = "imap.agdsn.de";
|
||||
port = 993;
|
||||
};
|
||||
smtp = {
|
||||
host = "smtp.agdsn.de";
|
||||
port = 465;
|
||||
};
|
||||
mbsync = {
|
||||
enable = true;
|
||||
create = "maildir";
|
||||
expunge = "both";
|
||||
groups.ifsr = {
|
||||
channels.inbox = {
|
||||
nearPattern = "INBOX";
|
||||
farPattern = "INBOX";
|
||||
extraConfig.Create = "near";
|
||||
};
|
||||
channels.trash = {
|
||||
nearPattern = "Trash";
|
||||
farPattern = "Trash";
|
||||
extraConfig.Create = "near";
|
||||
};
|
||||
channels.sent = {
|
||||
nearPattern = "Sent";
|
||||
farPattern = "Sent";
|
||||
extraConfig.Create = "near";
|
||||
};
|
||||
channels.junk = {
|
||||
nearPattern = "Junk";
|
||||
farPattern = "Junk";
|
||||
extraConfig.Create = "near";
|
||||
};
|
||||
channels.drafts = {
|
||||
nearPattern = "Drafts";
|
||||
farPattern = "Drafts";
|
||||
extraConfig.Create = "near";
|
||||
};
|
||||
};
|
||||
extraConfig = {
|
||||
account = {
|
||||
AuthMechs = "Login";
|
||||
};
|
||||
};
|
||||
};
|
||||
thunderbird.enable = true;
|
||||
neomutt = let c = mbsync.groups.ifsr.channels; in
|
||||
{
|
||||
enable = true;
|
||||
mailboxName = " AG DSN";
|
||||
extraMailboxes = lib.lists.forEach [ c.sent c.trash c.junk c.drafts ] (x: x.nearPattern);
|
||||
};
|
||||
};
|
||||
"gmail" = rec {
|
||||
address = "seifertrouven@gmail.com";
|
||||
realName = "Rouven Seifert";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,13 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
tex = (pkgs.texlive.combine {
|
||||
inherit (pkgs.texlive) scheme-full
|
||||
dvisvgm dvipng# for preview and export as html
|
||||
wrapfig amsmath ulem hyperref capt-of;
|
||||
# (setq org-latex-compiler "lualatex")
|
||||
#(setq org-preview-latex-default-process 'dvisvgm)
|
||||
});
|
||||
in
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
||||
|
|
@ -6,10 +15,12 @@
|
|||
wpa_supplicant_gui
|
||||
pcmanfm
|
||||
xdg-utils # used for xdg-open
|
||||
tex
|
||||
|
||||
# graphics
|
||||
evince # pdf viewer
|
||||
gimp
|
||||
krita
|
||||
ffmpeg
|
||||
drawio
|
||||
leafpad
|
||||
|
|
@ -58,6 +69,7 @@
|
|||
jq
|
||||
logseq
|
||||
xournalpp
|
||||
libreoffice
|
||||
|
||||
# programming languages
|
||||
cargo
|
||||
|
|
@ -77,10 +89,6 @@
|
|||
indicator = true;
|
||||
};
|
||||
|
||||
programs.texlive = {
|
||||
enable = true;
|
||||
extraPackages = tpkgs: { inherit (tpkgs) collection-basic xetex collection-fontsrecommended; };
|
||||
};
|
||||
programs.obs-studio.enable = true;
|
||||
programs.firefox.enable = true;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue