rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2024-11-15 05:13:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

updates and fixes

Browse source
This commit is contained in:
Rouven Seifert 2024-08-13 11:38:01 +02:00
parent efe00fc184
commit f7e581f792
15 changed files with 75 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
flake.lock
View file

@ -12,11 +12,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1722339003,
"narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=",
"lastModified": 1723293904,
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
"owner": "ryantm",
"repo": "agenix",
"rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7",
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"type": "github"
},
"original": {
@ -32,9 +32,7 @@
"flake-parts": "flake-parts",
"flake-utils": "flake-utils",
"napalm": "napalm",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs": "nixpkgs",
"poetry2nix": "poetry2nix"
},
"locked": {
@ -299,11 +297,11 @@
]
},
"locked": {
"lastModified": 1723015306,
"narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=",
"lastModified": 1723399884,
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e",
"rev": "086f619dd991a4d355c07837448244029fc2d9ab",
"type": "github"
},
"original": {
@ -447,11 +445,11 @@
]
},
"locked": {
"lastModified": 1722740924,
"narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=",
"lastModified": 1723352546,
"narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "97ca0a0fca0391de835f57e44f369a283e37890f",
"rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
"type": "github"
},
"original": {
@ -462,17 +460,18 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1722813957,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
"lastModified": 1720542800,
"narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
"rev": "feb2849fdeb70028c70d73b848214b00d324a497",
"type": "github"
},
"original": {
"id": "nixpkgs",
"owner": "NixOS",
"ref": "nixos-unstable",
"type": "indirect"
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
@ -518,6 +517,21 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1723362943,
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"pfersel": {
"inputs": {
"nixpkgs": [
@ -623,7 +637,7 @@
"lanzaboote": "lanzaboote",
"nix-colors": "nix-colors",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"pfersel": "pfersel",
"purge": "purge",
"trucksimulatorbot": "trucksimulatorbot"

2
flake.nix
View file

@ -27,7 +27,7 @@
nix-colors.url = "github:Misterio77/nix-colors";
authentik = {
url = "github:nix-community/authentik-nix";
inputs.nixpkgs.follows = "nixpkgs";
# inputs.nixpkgs.follows = "nixpkgs";
};
purge = {

1
hosts/thinkpad/default.nix
View file

@ -107,6 +107,7 @@
services = {
# envfs.enable = true; #usr/bin fixes
blueman.enable = true; # bluetooth
devmon.enable = true; # automount stuff
upower.enable = true;

2
hosts/thinkpad/modules/graphics/default.nix
View file

@ -37,7 +37,7 @@
colors.base07
];
};
hardware.opengl.extraPackages = with pkgs; [
hardware.graphics.extraPackages = with pkgs; [
intel-compute-runtime
intel-media-driver
];

4
hosts/thinkpad/modules/networks/default.nix
View file

@ -66,6 +66,10 @@
authProtocols = [ "SAE" ];
extraConfig = "disabled=1";
};
"LKG-Gast" = {
psk = "@LKGDD_GUEST_PSK@";
authProtocols = [ "WPA-PSK" ];
};
"@PIXEL_SSID@" = {
psk = "@PIXEL_PSK@";
authProtocols = [ "WPA-PSK" ];

15
hosts/thinkpad/modules/networks/uni.nix
View file

@ -15,7 +15,8 @@
configFile.path = config.age.secrets.dyport-auth.path;
};
# ugly way to add more interfaces
"enp0s13f0u2u1" = enp0s31f6;
# "enp0s13f0u2u1" = enp0s31f6;
# "enp0s13f0u3u1" = enp0s31f6;
};
wireless.networks = {
eduroam = {
@ -59,6 +60,7 @@
password="@AGDSN_AUTH@"
phase2="auth=PAP"
'';
extraConfig = "disabled=1";
authProtocols = [ "WPA-EAP" ];
};
agdsn_fritzbox = {
@ -105,6 +107,17 @@
compression = "stateless";
};
};
iFSR = {
protocol = "anyconnect";
gateway = "vpn2.zih.tu-dresden.de";
user = "rose159e@apb-ifsr-vpn";
passwordFile = config.age.secrets.tud.path;
autoStart = false;
extraOptions = {
authgroup = "A-Tunnel-TU-Networks";
compression = "stateless";
};
};
};
};
systemd.services = {

8
hosts/thinkpad/modules/printing/default.nix
View file

@ -1,10 +1,10 @@
{ pkgs, ... }:
{
# environment.systemPackages = with pkgs; [ cups ];
services.avahi = {
enable = true;
nssmdns4 = true;
};
# services.avahi = {
# enable = true;
# nssmdns4 = true;
# };
services.printing = {
enable = true;
stateless = true;

6
hosts/thinkpad/modules/security/default.nix
View file

@ -45,9 +45,9 @@
};
};
# broken again
# services = {
# fprintd.enable = true; # log in using fingerprint
# };
services = {
fprintd.enable = true; # log in using fingerprint
};
environment.systemPackages = with pkgs; [
agenix.packages.x86_64-linux.default
tpm2-tools

8
hosts/thinkpad/modules/virtualisation/default.nix
View file

@ -1,10 +1,10 @@
{ pkgs, ... }:
{
virtualisation = {
podman = {
enable = true;
defaultNetwork.settings.dns_enabled = true;
};
# podman = {
# enable = true;
# defaultNetwork.settings.dns_enabled = true;
# };
libvirtd = {
enable = true;
qemu = {

2
pkgs/adguardian-term/default.nix
View file

@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
rev = version;
hash = "sha256-r7dh31fZgcUBffzwoBqIoV9XhZOjJRb9aWZUuuiz7y8=";
};
cargoSha256 = "sha256-GB3CQ9VPBkKbT5Edq/jJlGEkVGICWSQloIt+nkHRDJU=";
cargoHash = "sha256-GB3CQ9VPBkKbT5Edq/jJlGEkVGICWSQloIt+nkHRDJU=";
meta = with lib; {
description = "Terminal-based, real-time traffic monitoring and statistics for your AdGuard Home instance Resources";

4
pkgs/ianny/default.nix
View file

@ -1,4 +1,4 @@
{ rustPlatform, fetchFromGitHub, lib, ninja, dbus, pkg-config, gettext }:
{ rustPlatform, fetchFromGitHub, lib, ninja, dbus, pkg-config }:
rustPlatform.buildRustPackage rec {
pname = "ianny";
version = "unstable-2023-12-16";
@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec {
rev = "370bea372c35610e65426f5a1c45db99584dfb9a";
hash = "sha256-oWwRCQSP0g6IJh3cEgD32AIBF/pfN9QGJ9LANjCthMw=";
};
cargoSha256 = "sha256-5/Sb2ds+xfcYFqTF3RObPScDzK4FdBNk8T1Z5YcQgCM=";
cargoHash = "sha256-5/Sb2ds+xfcYFqTF3RObPScDzK4FdBNk8T1Z5YcQgCM=";
buildInputs = [
dbus
ninja

BIN
secrets/thinkpad/wireless.age
View file

Binary file not shown.

30
users/rouven/fixes.nix
View file

@ -1,6 +1,5 @@
{ pkgs, lib, ... }:
{
# fixes qt and themes
environment.variables = {
"QT_STYLE_OVERRIDE" = lib.mkForce "kvantum";
@ -9,10 +8,10 @@
"GTK_THEME" = "Dracula";
};
# open ports for kde connect
networking.firewall = rec {
allowedTCPPortRanges = [{ from = 1714; to = 1764; }];
allowedUDPPortRanges = allowedTCPPortRanges;
};
# networking.firewall = rec {
# allowedTCPPortRanges = [{ from = 1714; to = 1764; }];
# allowedUDPPortRanges = allowedTCPPortRanges;
# };
# enable xdg portals for sway
xdg.portal = {
enable = true;
@ -37,24 +36,7 @@
# home manager needs dconf
programs.dconf.enable = true;
# fixes pam entries for swaylock
# auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so
security.pam.services.swaylock.text = ''
# Account management.
account required pam_unix.so
# Authentication management.
auth sufficient pam_unix.so nullok likeauth try_first_pass
auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so
auth required pam_deny.so
# Password management.
password sufficient pam_unix.so nullok sha512
# Session management.
session required pam_env.so conffile=/etc/pam/environment readenv=0
session required pam_unix.so
'';
security.pam.services.swaylock = { };
# global wrapper for ausweisapp
programs.ausweisapp = {
enable = true;
@ -64,5 +46,5 @@
programs.steam.enable = true;
# enable java black magic
programs.java.enable = true;
# programs.java.enable = true;
}

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

@ -50,6 +50,7 @@
hut
wine
ansible
ansible-lint
# programming languages
cargo

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

@ -11,7 +11,7 @@ in
controlPersist = "10m";
extraConfig = ''
CanonicalizeHostname yes
CanonicalDomains agdsn.network vpn.rfive.de
CanonicalDomains agdsn.network vpn.rfive.de net.tu-dresden.de
PKCS11Provider /run/current-system/sw/lib/libtpm2_pkcs11.so
IdentityFile ~/.ssh/id_ed25519
SetEnv TERM=xterm-256color