From 7229ccbf66e3bb238941d36d80f08c274684c51f Mon Sep 17 00:00:00 2001 From: nx2 Date: Sun, 10 Mar 2024 14:16:33 +0100 Subject: [PATCH] no hsmw-vpn --- configuration.nix | 17 +++++++++++++---- home.nix | 10 +++++----- secrets/passwords-and-certificates.nix | Bin 1372 -> 1449 bytes 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/configuration.nix b/configuration.nix index 66acb51..29f9571 100644 --- a/configuration.nix +++ b/configuration.nix @@ -24,7 +24,10 @@ networking.hostName = "NxXPS"; # Define your hostname. - networking.networkmanager.enable = true; + networking.networkmanager = { + enable = true; + # enableStrongSwan = true; + }; environment.etc = { # easyroam HSMW "ssl/certs/easyroam_client_cert.pem".source = ./secrets/easyroam-hsmw/easyroam_client_cert.pem; @@ -82,7 +85,6 @@ jack.enable = true; }; - # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable = true; hardware.uinput.enable = true; @@ -114,6 +116,9 @@ git-crypt wget curl + zip + unzip + p7zip killall nano micro @@ -197,6 +202,11 @@ }; ### END OLLAMA + + + + + # List services that you want to enable: @@ -235,5 +245,4 @@ nix.settings.experimental-features = [ "nix-command" "flakes" ]; -} - +} \ No newline at end of file diff --git a/home.nix b/home.nix index 1da9cd5..b4fc625 100644 --- a/home.nix +++ b/home.nix @@ -118,11 +118,11 @@ home.file = { - ".ssl/ljk-pnx-cert.pem".text = secrets.pnxVpn.cert; - ".ssl/ljk-pnx-cert.key".text = secrets.pnxVpn.certKey; - ".ssl/ljk-pnx-ca.pem".text = secrets.pnxVpn.ca; - ".ssl/ljk-pnx.ovpn".text = secrets.pnxVpn.ovpn; - ".ssl/ljk-pnx-pass.txt".text = secrets.pnxVpn.pass; + ".vpn/ljk-pnx-cert.pem".text = secrets.pnxVpn.cert; + ".vpn/ljk-pnx-cert.key".text = secrets.pnxVpn.certKey; + ".vpn/ljk-pnx-ca.pem".text = secrets.pnxVpn.ca; + ".vpn/ljk-pnx.ovpn".text = secrets.pnxVpn.ovpn; + ".vpn/ljk-pnx-pass.txt".text = secrets.pnxVpn.pass; # ".config/libinput/gestures".text = '' diff --git a/secrets/passwords-and-certificates.nix b/secrets/passwords-and-certificates.nix index 6fc13dee836bd6e7cfc10d2b437474cbc318f933..c773a2593187d1aab63122261c6f6306717cb7e4 100644 GIT binary patch literal 1449 zcmZQ@_Y83kiVO&0V2X7sui*Uhf9rMzeV_C=vocM6Iq7nFd0#dA`@c<`-yHT;j$L*4 z(T|^cryN3*Q~6cqN+$j_KeDr~b6v5pPG;XD@szymM12#x$Fu&N3w^@C8yuXx#OwVM zo{I9EnBzXnn;4iSoQhmt*sYzj^6w83>5!LSg9AU=?5z4T@y3?r3;(v?_ExsMG%x-B zC80A8IprY+o!r;k%AU=R^xtmu^zW2CPG_t4&MM$qy!h>}_^rQ0A8&o&eu&R8%XQzx zU5BoHdY#m+=~5SOyCW%Mb!GRQWBjXEXRO|nd*qe!v)FBkz7ZGZU+FURkP^}H(kNLW z=pN;icF8O5_->sK6DH2s$+h8T_o+g*DIabB75nilq9=c>A^T{E~Q zyu3Gi-L(ok!T21-xhv1KFt>(go-C?so_2-v2FK)|uWU0Cm)#b2R~LQFqu*7)cDIg^ zqv7__56|L{f4}rLc5B1Y-CGJJ^Oj6E7P+rz8xeb5#bILb?KPoQ*8_{im3&n1$*xbn z)%E^d-b??6|t{e_xnzWieDSZVjwuD^=(x7y3IT{j5kZk$yjFnsn|39v(>t| zYQAif|8f8K)G5z4x9Ixi^LSpi-;H|vu(Zle?_R0p{Fk_vs93z={x|VALBFgr*bW*T z3oK;&oxJB`rux4ZSKe;WytdG+dn^YxFhhg5F-XT;AF6xsX$LiV#m+<(a0; zpZ4F)wjOwvajtjXq*)yj61Tz_GyLSLmCkSD-91TOzVK1KOoy0H;7T2jAG3ePW$!R! zd#$?9EvSCMVN;P73AXpLGG(Hwx!<*9W-n$w$-7U{ad(;1O_cQ7!7R| z_PO%3TdA*^dupL0U&x)XO6}ErCJw1aFRW&TK~sq6;r%g@hmP@Z=@b)}F~R7h0k{QFIQ*Hdezi~E~AGHpydvD=n4 zZFTFh3r|ij)jRkr%|)I0OUF&_;;P${%M^v&Enm4~HaoPvE~6xA1cDqpQ^tXC^G} z6)$7FclEZI;FB2lfI}C9GfMhcFJ}vE*}ivW=7i5H=L_dm6+2GY6aDbgmHGb-T(5k{ z5D$ED--~DG<_)#ae>H}?6l`W($hWxYRrB6%u|Io!4F6s@=Xg+-m$6Xny1|5B3m?t$ z3zeC^XB$UG`x)J7jT8T@J1~3ootui)JJizZmNdk_y0SENnyG<*kkMm%&6USIm-u)6 zvpV-ca)I)m`D!y?*H8B^O^{j4@>exSB3Q~SRB}xQ!@~!LiRIg^KPP@zcd=Y^|D?T^ zy-JHzU+Zi+|DmzF(mr>Iw1=pSxasWQmln_2vaU^J$^VC66dm78J2{g*bnc7YhE*?= z?T*)dz04pj#<}q3N|n~Q%XP~g(v6coF0t6UCW>v@T-Fjxex8?(nZZ{!$)9~!{Cdt_ z=O0IAmI{V<%;~(s957+Eq5@ArNyCb|_Qi6yZbWC+2F3rH$Z5ENfizicwVfNEc5vM;rj8BYgi2(zME8Vr`()qR!Ln&{{q5adAxVdR XpJgfbnHsvGORVo|(_aIv>J97w2QI-% literal 1372 zcmZQ@_Y83kiVO&0=s0-xS25#StL;Wt1U9UzWJ!D!HvjvQhl`xM@9pqdQGCwVrTTp9 z>Kv^HPSX{RyWM#{A$^vJk4{ecmb&1bT{6$_JDlK8R^B3O7#MqQ&5SRf%yg_y#NFpg z3aB>tF>m2nZT7i(U#1ml?NTxi%RGBz(H80EEAMz#?cM$EqTe=?zAhIpqpO_~xA}F- z<}f#M^k%00SooyBM@Zz=9b@|w3Oiu#J2 zHrQA$6d?bDOMQizr^3~p&l&#~Bnpf9Kl5hhdH2sdGRykwmHG2|qZ$gPKUq_@GEQ^8 z?ZYKDjS`PL90v!*u0`P95)yYF6pz2Lo>({VLValNR2iqDyS zr=M-=I(mGYbFa0uV?oBht=zNzi*Q*k)t)B3`})7{@^4sQCp#aqj!|DW;a04cK99W3 z1kQv6raa@jn<6J|JF@bs9x8=sBEoT-?=c))ex^3E$<=bccmnn67 zT6Wm_G~@gSjxi2SQU$!VUU4!1cf`2q`d=0)HNGZW=2h9PP@HtU&N+ASwU7U|OmJF| zDW+)gmdoBD>&@!+qZN(6R!dsB@7%4euOa=3f5WD>r(xYc{~Za{Iregj>cc;wtB!f9 zJ-!*q`*NqdsMt>C4W7%U-Fw~0I*mi`+tO*zpI@7%@BRILgIgNY%L{?`Gdpt=1Ct#4 zB=$QQox9c~xwWxtt^c`sYF}icD^p6mMdVJeza84(_-49u(kq*&gSXe7H~3ldf6luJ zdp#AeU-a8;-~Ozx!gf!TuuePQ+J)@@oo8KV_heI^z&SYb1lNarPau+x%+zsnDsh{e4&arJ`PEdhuA#V()p- z75!alThG+D)3iK7w>{i^CH2Ik9~*<0GJMT>N7P@%Hqd%e{0u+z>pZo8MbuX6O> zah;#ni^b?hUafdE=kNAL3xUY4z$ZVSuX$p6|MRL3Djoc*=dGW1{F=jEEloDV^Zk3n zwjC~?Rj1xpt6EZV4dO)al4m8&4~roi9TKe(>RRjo4<&1LB}O#Aq1*SG3- zJO^ga^jkE2zrb_zu9$;IpKaD@&1hVGzf7Ea@w5Mxn~o$O+q3qjvz_!erYrS3YR}$3 z!JEr&Sz03YYjyca1@GodZ^T3lW#{f&^4jj=_ntYDPc8^~%NX1Xzb>_4?veH`{!Nlq zdlxvcODXxb%g9}cPI@-w$5Jbu*57g6R?`-y+>bwdWZ!$sOPE?PkN<2fr4tY!v6eTDLp(!q-Fp z)n^*Mxqf|uO?$#z&vlUn5p4|-Jr&cZR<~aK7rsbLM=DoqG5^$&W}{2*}QA{-&+1|Aza6xvaj?6g`H^yKj6C zS@hT}i*bK&Sl-9}eNK&?!gg=}wpsNr%DijU&+s=!_B4ac*JaNy?mq0Id+$~6qg$Gv ze0Fd}E)9z?-12kkPqWW<`xgc7u-pCgtn-GX14m3mtBd|#FpY8E7N0hM*Afq z#E$m;l9|`tT)lD4M!QoP70TgLs$Xp0aEXtLsWL6`@QR1~othQ2-LE-v-k+a40RTiv Bw;=!k