From b1199c76bd7b164e73372ccca643a6f39d62c233 Mon Sep 17 00:00:00 2001 From: Dmitriy Holkin Date: Sat, 28 Sep 2019 02:24:58 +0400 Subject: [PATCH] Fixes --- modules/filesystems.nix | 25 +++++++++++++++++++++++++ modules/samba.nix | 4 ++-- modules/services.nix | 3 ++- modules/workspace/barrier.nix | 2 -- secret.nix.gpg | Bin 1182 -> 1042 bytes 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/modules/filesystems.nix b/modules/filesystems.nix index 4b579b2..29b2dfa 100644 --- a/modules/filesystems.nix +++ b/modules/filesystems.nix @@ -65,6 +65,7 @@ with deviceSpecific; { "gid=${toString config.users.groups.smbgrp.gid}" ]; }; + # Samba Windows "/media/windows/files" = lib.mkIf (!isHost) { fsType = "cifs"; device = "//192.168.0.100/Files"; @@ -88,6 +89,30 @@ with deviceSpecific; { "gid=${toString config.users.groups.users.gid}" ]; }; + # Samba Linux + "/media/linux/files" = lib.mkIf (!isHost) { + fsType = "cifs"; + device = "//192.168.0.100/files"; + options = [ + "user=${secrets.linux-samba.user}" + "password=${secrets.linux-samba.password}" + # "nofail" + "uid=${toString config.users.users.alukard.uid}" + "gid=${toString config.users.groups.users.gid}" + ]; + }; + "/media/linux/data" = lib.mkIf (!isHost) { + fsType = "cifs"; + device = "//192.168.0.100/data"; + options = [ + "ro" + "user=${secrets.linux-samba.user}" + "password=${secrets.linux-samba.password}" + # "nofail" + "uid=${toString config.users.users.alukard.uid}" + "gid=${toString config.users.groups.users.gid}" + ]; + }; }; swapDevices = [ { diff --git a/modules/samba.nix b/modules/samba.nix index 341edd4..870df4a 100644 --- a/modules/samba.nix +++ b/modules/samba.nix @@ -32,7 +32,7 @@ with deviceSpecific; { disable netbios = yes smb ports = 445 - [Data] + [data] path = /shared/data browsable = yes read only = yes @@ -40,7 +40,7 @@ with deviceSpecific; { force directory mode = 2770 valid users = @smbgrp - [Files] + [files] path = /shared/files browsable = yes read only = no diff --git a/modules/services.nix b/modules/services.nix index 1ebe189..9fcf4e4 100644 --- a/modules/services.nix +++ b/modules/services.nix @@ -40,10 +40,11 @@ services.accounts-daemon.enable = true; services.avahi.enable = true; - services.avahi.ipv6 = true; + # services.avahi.ipv6 = true; services.avahi.nssmdns = true; services.avahi.publish.enable = true; services.avahi.publish.addresses = true; + services.avahi.publish.domain = true; systemd.services.systemd-udev-settle.enable = false; diff --git a/modules/workspace/barrier.nix b/modules/workspace/barrier.nix index f2f6a50..7f02ae5 100644 --- a/modules/workspace/barrier.nix +++ b/modules/workspace/barrier.nix @@ -68,7 +68,6 @@ in config = mkMerge [ (mkIf cfgC.enable { - environment.systemPackages = with pkgs; [ (barrier.override { avahiWithLibdnssdCompat = true; }) ]; systemd.user.services."barrier-client" = { after = [ "network.target" "graphical-session.target" ]; description = "Barrier client"; @@ -79,7 +78,6 @@ in }; }) (mkIf cfgS.enable { - environment.systemPackages = with pkgs; [ (barrier.override { avahiWithLibdnssdCompat = true; }) ]; systemd.user.services."barrier-server" = { after = [ "network.target" "graphical-session.target" ]; description = "Barrier server"; diff --git a/secret.nix.gpg b/secret.nix.gpg index 97358f1f8941d6617ebd64420a4d93a07a936ffa..29c425c0fe979aec7221ff40f8034ec55bc3f1f4 100644 GIT binary patch literal 1042 zcmV+t1nv8U0Sp5t#%vKxT`Ri*2mf1iPoxuZBqMEsa+7cTk`ETsBl=Kpry&n0C5Q&r zDSZikQUnXL7fI~#jQOz`j$h+EiyaC|;BkMr$_L~hBA=jjcPo_RjmVa(xv^#Jh-iYq z^$yJKf-NuKb?PQg7y)GZuBou4vsI@;WD#5Bs7b!p98`YwhSH_C^yBZfDwrRIp_q~j zAg^Hpm2(wOUGV4IW~rX_E#@M)^=@Pi}xs@2?8RQlHA*Pv3Fk=edljDLnP1@ zm624sZSAftb3CI7feg1zN@O zhZ3auH=2b+M@tkVra-gxHfeCfzU<_)UwavMhw_-F%S|f+HVOykx01M~e~n{`KXght zV7Xeawvgj|fE~fVj@iyAPWzkY#|e@^>d7wn8!)*Aw}w0)Rhwm8TNv?CSjZ^t=k;Va z`=MKaCNylP>;9QV`Pl#TwLdL10NoVwv}-G93e1i}H+83Nxla1kW^p)AFbc9LF)SB-Bjx zO!v0OGqBJ|V4zs4pd)dNw9Q1j-7`=pOhYnx2nU$3*XeKejBnxS_~&{Y^EA-WLPQ(O ztI4&|Ck*z?HMHsR=giTuLPd>_0>@Mz8}&+1zBQfGEwWBeg1l`_`|@+A>XAq5ZO&h! zDnFy1K%YFpXxoNsz&|xz>E|@bR8`vF!fHJm3ekE$l<0UV1jrJ-^0Ww4zOaZ$=q9Ib zcJVH?cpBH9ob6sv$3b+we+k?Hw*{p#{L4?`=uBk;C?-GgB)qO*^c-o^rrmC)hdJ6w zk^d#X;K3qZOVk@FmX$&Cpg5$F^B<~eJT;t%Mp1xTwWh=7%u_1vig$?KRRzJ$d`MeZ zGy#@;!zLuB)hl(x0`;$AwyUBRO&(O#}R0r60HME3MrFWbnM=^G}UNQ@W|(W`=fc$ M0KoZY(?loj%J-l7ApigX literal 1182 zcmV;P1Y!Gy0Sp5t#%vKxT`Ri*2meY6@v%_<1A$+i*GUy&l1`_v(mMT~r7?ZIJay zLsX7ZX?V*iw{=0+926)_X3I^=hn&GyQ$nhuIogBjcDYdYc2R}6+N^ctq#Iy}7IP?n zNDn$4i2qk@wj&Q~e?4eV*1W02GuUKujDRIQ?9iKsqQ2$TvpY=8JH~OZEEnb@712<@ z;sLot)8(F>X5-`Oz!S*-BL+X%A=l5QRrs@OW5-gez!!ma)-j=YyBX{g+jF|B6LfJ6 ztu7s@RP>#jblc7}4waV^h9%PJ0i!4`;rYrtKPI3y!TbW{Hr(gm7m*ezmhk78ayJ>W z{D0aIDU1Tr%1YfAdJ5Yoxc{Uub69eYaH4-s3I}JslZZRh%v4nm^0 z#3m|Ka!2TJG=|U`tT-?pA}mcgaMcY11!@p4wXen17DN`JUVrUM)wlWDgz(Y!>Fk+l zZ6UDNZR!ea1(PWp4=wsLFW;YvAK^nIwb7>PC!Qa>?6eZfQ>*z*CSTA95mJRTmA%iI zj*3;eq|-=m-d$;qo}II20LundUi*7YA85TCXo{SFk6oBQ=ARN5TrK5oX=S)p{c`f4 zprp9E&uSL6QFT@3-XG3j9-hXAN2}-eM-eyA9yf9~@j+a8*-^j|t&;d{a^Ol7tP@?Q;^%I^%r_ZtjYwF}q3SIkNx_69?&x4)IXmE2tt# z4ED~Nv8#wq+9}LY1I}?dCq7^`T7r3Ddq4644cw}?GM}v{5W`Uf5$qVI=>h9o^ z71xL2N2-{M_pL==Uh59{V?+m$;yn_OG@uS2)mfDI9nwV!V;toR-kS^pPGB#t^OaXMX%- z_#~wHsJ|0YtOsWg2b~6m;1VHIow=WeQn%Y=u>c9u<&xlzH9D`}`9;+R zZ2xtd^tj?Ed!1nTw+39=SE}#csZfql%dKyP`cG0&loiPjz0ke$m=XXom8!g14fJm} w6gLr803)DH$}&Yx3~Hzr?p-;axqZEHW-p6L2Bw<4>d0e93Uw+0g$$PjM+Rv|0ssI2