moritz/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

style formatting

Browse source
This commit is contained in:
Moritz Böhme 2021-12-14 12:21:41 +01:00
parent d699675386
commit b0b9a4e5f0
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/editors/emacs.nix
View file

@ -4,7 +4,8 @@ let
emacs = with pkgs; emacs = with pkgs;
((emacsPackagesNgGen emacsUnstableGcc).emacsWithPackages ((emacsPackagesNgGen emacsUnstableGcc).emacsWithPackages
(epkgs: [ epkgs.vterm epkgs.emacsql-sqlite3 ])); (epkgs: [ epkgs.vterm epkgs.emacsql-sqlite3 ]));
in { in
{
fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ]; fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ];
home-manager.users.moritz = { home-manager.users.moritz = {

6
modules/services/diskstation/default.nix
View file

@ -4,12 +4,14 @@
fileSystems."/media/media" = { fileSystems."/media/media" = {
device = "//192.168.0.2/media"; device = "//192.168.0.2/media";
fsType = "cifs"; fsType = "cifs";
options = let options =
let
# this line prevents hanging on network split # this line prevents hanging on network split
automount_opts = automount_opts =
"x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"; "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
in [ in
[
"${automount_opts},credentials=/run/agenix/smbMedia,uid=1000,gid=100" "${automount_opts},credentials=/run/agenix/smbMedia,uid=1000,gid=100"
]; ];
}; };