From 78efe4597917778938acadd2363d34eac1432b73 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 26 May 2025 16:31:58 +0200 Subject: [PATCH 1/2] add tmp wlan add autocon wlan --- hosts/thinkpad/modules/networks/default.nix | 8 ++++++++ secrets/thinkpad/wireless.age | Bin 715 -> 763 bytes 2 files changed, 8 insertions(+) diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix index 9df47ea..60f83a8 100644 --- a/hosts/thinkpad/modules/networks/default.nix +++ b/hosts/thinkpad/modules/networks/default.nix @@ -81,6 +81,14 @@ 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 1b0610cab1b14f535ef3ed7c09a4bc7c6135c747..cf028840bead408c7ef368fa9b0bc334b025626a 100644 GIT binary patch delta 731 zcmV<10wn#*1^We%EPpw8H%dZ8Z+0^W=LmgPESE+3R6%@VoY{QV=-<^Qf@FpFnB|0buUPGNM|%NI5T)=K}|4ARd!5o zcS1F13N0-yAbK}sbaqupH#TiocVcE&R%BU9FGf}|Mo4UIM^R3BIBaJ~W@1%DOD|(V z3dwJt#Qfv>?SBqk_V=fvz|Q_0QjW=k`h#dv33^KQn-be=4h&rlB+)YsnVUA zeBi8N6^33S9^<)}neK$WkS>iIj-;w-3A0(1dG$ETL@{%+Fo8`$d1(&U-{E9|?c(^?=5SW1Z{~lwsv@$mAS9)Ot2oa+3D!eMm=9w$Yjuys}BNKfv z7I}FieXe`r*#CD|1|ReBdUjCp0M&igCTh$73UL&EC48Xx^u;PA#LXtfU(tM;aemHR8s4U&&gi9;8xTL1s(eS7b}{?;r8 zrW;-oqD%^>IGuu@v5~{LWm%ng&s%jW_M$u)rq=siWX*Pu;U*LUcDAE=7Fz19O+bbQ zfr8izRe}MpFU_XuE@$%ncFQT)wnmKynlx+uW>mbRGspS$fY{(#h=2tPct=d{mODM} zn+uDCFSnvVv4LbGT2si|S$^H2R{ruL*GQu4Y>aG^W)Y~R@6iZE(~w6kB_QPaM#B>x Nj2N8*T`Pw-XnS8MMqmH{ delta 683 zcmV;c0#yC`1PE%!OIBPOaXijxeZBTPZI5Jre`NR%$CUXF_30MoceMFLQ5qHA8qzFbXX` zAaiqQEoEdfH8n9gAVpSsbU9HVW@cwfcX(P&M`u_tXKhboYJXyPK~!*IFjp&hSZ!i! zYkF{DL}^uYY)?gV3UEtEcUmzqaAkNoQE)jzb#_lfaadDwZ*_M~Swc)lc5g>mb7gmS zN^x{|3N0-yATlp)Zb~$HGGTf_dN*Q1OfYmZHF8x*Z*OT%IA=;~G<8r^No;Occ~dY= z3L%2nKUj(H|9{y8cV0E^y;Gkb`XQ=K-lr1y7wPZ>w+ zcf*&w{C|YI97or`!p5Z$>_(!f6Feu3vl{f)pY@t-%hms8(^}H8ATO1iRP-gLTqNX0rrdRbZxd;WCKs>NZ_5sTZ3hwE R`$(FDl;!>aTU0WM5MKmLF=_w+ From 3acab44bd445cd0e166b6cc44a08a1f44c0c172f Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Tue, 27 May 2025 17:33:54 +0200 Subject: [PATCH 2/2] thinkpad: clean up old stuff --- hosts/thinkpad/default.nix | 98 -------------------------------------- 1 file changed, 98 deletions(-) diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index cdc53f4..b55e440 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -8,17 +8,10 @@ ./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" @@ -28,12 +21,6 @@ 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; }; @@ -62,90 +49,6 @@ }; 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 @@ -187,5 +90,4 @@ }; environment.systemPackages = [ pkgs.man-pages ]; system.stateVersion = "22.11"; - # programs.java.enable = true; }