diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index b55e440..cdc53f4 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -8,10 +8,17 @@ ./modules/graphics ./modules/greetd ./modules/networks + # ./modules/printing ./modules/security ./modules/sound ./modules/virtualisation ]; + + + # services.influxdb2 = { + # enable = true; + # }; + nix.settings.system-features = [ "gccarch-tigerlake" ]; systemd.additionalUpstreamSystemUnits = [ "soft-reboot.target" @@ -21,6 +28,12 @@ boot = { kernelModules = [ "v4l2loopback" ]; kernelPackages = pkgs.linuxPackages_latest; + # extraModulePackages = [ + # config.boot.kernelPackages.v4l2loopback + # ]; + # extraModprobeConfig = '' + # options v4l2loopback exclusive_caps=1 card_label="Virtual Camera" + # ''; tmp.useTmpfs = true; }; @@ -49,6 +62,90 @@ }; console.keyMap = "dvorak"; + + + # services.openldap = { + # enable = true; + # urlList = [ "ldap:///" ]; + # settings = { + # attrs = { + # olcLogLevel = "conns config"; + # }; + # children = { + # "cn=schema".includes = [ + # "${pkgs.openldap}/etc/schema/core.ldif" + # # attributetype ( 9999.1.1 NAME 'isMemberOf' + # # DESC 'back-reference to groups this user is a member of' + # # SUP distinguishedName ) + # "${pkgs.openldap}/etc/schema/cosine.ldif" + # "${pkgs.openldap}/etc/schema/inetorgperson.ldif" + # "${pkgs.openldap}/etc/schema/nis.ldif" + # # "${pkgs.writeText "openssh.ldif" '' + # # dn: cn={4}openssh + # # objectClass: olcSchemaConfig + # # cn: {4}openssh + # # attributetype ( 9999.1.2 NAME 'sshPublicKey' + # # DESC 'SSH public key used by this user' + # # SUP name ) + # # ''}" + # "${pkgs.writeText "openssh.ldif" '' + # dn: cn=openssh,cn=schema,cn=config + # objectClass: olcSchemaConfig + # cn: openssh + # olcAttributeTypes: ( 1.3.6.1.4.1.24552.500.1.1.1.13 NAME 'sshPublicKey' + # DESC 'MANDATORY: OpenSSH Public key' + # EQUALITY octetStringMatch + # SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 ) + # ''}" + # ]; + + # "olcDatabase={1}mdb".attrs = { + # objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ]; + + # olcDatabase = "{1}mdb"; + # olcDbDirectory = "/var/lib/openldap/data"; + + # olcSuffix = "dc=ifsr,dc=de"; + + # /* your admin account, do not use writeText on a production system */ + # olcRootDN = "cn=portunus,dc=ifsr,dc=de"; + # olcRootPW = "test"; + + # olcAccess = [ + # /* custom access rules for userPassword attributes */ + # ''{0}to attrs=userPassword + # by self write + # by anonymous auth + # by * none'' + + # /* allow read on anything else */ + # ''{1}to * + # by * read'' + # ]; + # }; + + # "olcOverlay={3}memberof,olcDatabase={1}mdb".attrs = { + # objectClass = [ "olcConfig" "olcOverlayConfig" "olcMemberOf" "top" ]; + # olcOverlay = "{3}memberof"; + # olcMemberOfRefInt = "TRUE"; + # olcMemberOfDangling = "ignore"; + # olcMemberOfGroupOC = "groupOfNames"; + # olcMemberOfMemberAD = "member"; + # olcMemberOfMemberOfAD = "memberOf"; + # }; + + # "olcOverlay={4}refint,olcDatabase={1}mdb".attrs = { + # objectClass = [ "olcOverlayConfig" "olcRefintConfig" "top" ]; + # olcOverlay = "{4}refint"; + # olcRefintAttribute = "memberof member manager owner"; + # }; + + + # }; + # }; + # }; + + services = { envfs.enable = true; #usr/bin fixes blueman.enable = true; # bluetooth @@ -90,4 +187,5 @@ }; environment.systemPackages = [ pkgs.man-pages ]; system.stateVersion = "22.11"; + # programs.java.enable = true; } diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix index 60f83a8..9df47ea 100644 --- a/hosts/thinkpad/modules/networks/default.nix +++ b/hosts/thinkpad/modules/networks/default.nix @@ -81,14 +81,6 @@ pskRaw = "ext:C3D2_PSK"; authProtocols = [ "WPA-PSK" ]; }; - "Apartment6" = { - pskRaw = "ext:APARTMENT6"; - authProtocols = [ "WPA-PSK" ]; - }; - "Autocon3" = { - pskRaw = "ext:AUTOCON"; - authProtocols = [ "WPA-PSK" ]; - }; "WIFI@DB" = { authProtocols = [ "NONE" ]; }; diff --git a/secrets/thinkpad/wireless.age b/secrets/thinkpad/wireless.age index cf02884..1b0610c 100644 Binary files a/secrets/thinkpad/wireless.age and b/secrets/thinkpad/wireless.age differ