diff --git a/instances/freya/configuration.nix b/instances/freya/configuration.nix index fe27d64..6934d17 100644 --- a/instances/freya/configuration.nix +++ b/instances/freya/configuration.nix @@ -93,5 +93,18 @@ }; }; + systemd.services.bertof-garage = { + description = "Mount S3 bucket in bertof's home"; + wantedBy = [ "default.target" ]; + wants = [ "network.target" "network-online.target" ]; + after = [ "network.target" "network-online.target" "local-fs.target" ]; + serviceConfig = { + AssertPathIsDirectory = "/home/bertof/s3"; + ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=/home/bertof/s3_secret,use_path_request_style,url=http://localhost:3900"; + Type = "exec"; + User = "bertof"; + }; + }; + system.stateVersion = "22.11"; } diff --git a/instances/loki/configuration.nix b/instances/loki/configuration.nix index d0677ac..e0bfec1 100644 --- a/instances/loki/configuration.nix +++ b/instances/loki/configuration.nix @@ -519,5 +519,18 @@ with lib; { Defaults pwfeedback ''; + systemd.services.bertof-garage = { + description = "Mount S3 bucket in bertof's home"; + wantedBy = [ "default.target" ]; + wants = [ "network.target" "network-online.target" ]; + after = [ "network.target" "network-online.target" "local-fs.target" ]; + serviceConfig = { + AssertPathIsDirectory = "/home/bertof/s3"; + ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=/home/bertof/s3_secret,use_path_request_style,url=http://localhost:3900"; + Type = "exec"; + User = "bertof"; + }; + }; + system.stateVersion = "22.11"; } diff --git a/instances/odin/common_configuration.nix b/instances/odin/common_configuration.nix index ed9b1e5..9a7c931 100644 --- a/instances/odin/common_configuration.nix +++ b/instances/odin/common_configuration.nix @@ -93,6 +93,19 @@ with lib; { keyMap = "it"; }; + systemd.services.bertof-garage = { + description = "Mount S3 bucket in bertof's home"; + wantedBy = [ "default.target" ]; + wants = [ "network.target" "network-online.target" ]; + after = [ "network.target" "network-online.target" "local-fs.target" ]; + serviceConfig = { + AssertPathIsDirectory = "/home/bertof/s3"; + ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=/home/bertof/s3_secret,use_path_request_style,url=http://localhost:3900"; + Type = "exec"; + User = "bertof"; + }; + }; + # X11 windowing system. services.xserver = { enable = true; @@ -105,7 +118,8 @@ with lib; { windowManager.bspwm.enable = true; # Configure keymap in X11 - layout = "it,us"; + layout = " + it,us"; xkbOptions = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle"; libinput.enable = true; @@ -182,7 +196,7 @@ with lib; { # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = - builtins.attrValues { inherit (pkgs) tmux helix vim git ntfs3g; }; + builtins.attrValues { inherit (pkgs) tmux helix vim git ntfs3g s3fs; }; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. @@ -331,3 +345,4 @@ with lib; { # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "22.11"; # Did you read the comment? } +