From d682b59bc9ecac812359bf30eff3b74e3de76091 Mon Sep 17 00:00:00 2001
From: eeva <eeva@era>
Date: Tue, 28 Feb 2017 22:55:14 +0100
Subject: [PATCH] Moving comments

---
 configuration.nix | 51 ++++++++++++++++-------------------------------
 vim.nix           |  7 +------
 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 49dd323..121482a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -80,7 +80,6 @@
   security = {
     sudo.wheelNeedsPassword = false;
     pki.certificates = [ 
-      #(builtins.readFile ./MarvidCA.crt)
       ''
       -----BEGIN CERTIFICATE-----
       MIIDPTCCAiWgAwIBAgIJAMbx5WIu+oU+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
@@ -114,7 +113,7 @@
     nixosManual.enable = false;
     printing = {
       enable = true;
-    #  drivers = [ pkgs.hplip ];  # Pas testé depuis un an :D
+    #  drivers = [ pkgs.hplip ];
     };
 
     compton = {
@@ -123,7 +122,7 @@
     };
     redshift = {
       enable = true;
-      latitude = "48.8534100";  # La force de la main
+      latitude = "48.8534100";
       longitude = "2.3488000";
     };
 
@@ -167,41 +166,25 @@
   };
 
 
-  #systemd.mounts = [
-  #  { what = "/dev/sdb1";
-  #    where = "/mnt/usb1";
-  #    mountConfig = {
-  #      TimeoutSec = "1";
-  #      Options = "uid=1000";
-  #    };
-  #  }
-  #];
-  #systemd.automounts = [  # Marche bueno, I recommend hotly
-  #  { where = "/mnt/usb1";
-  #    automountConfig = { TimeoutIdleSec = "1"; };
-  #    wantedBy = [ "default.target" ];
-  #  }
-  #];
-
-  #systemd.user.services = {
-    #backup = {
-    #  description = "backup: Backup the Candies.";
-    #  path = [ pkgs.rsync pkgs.openssh ];
-    #  script = "rsync -az /home/eeva/Candies eeva@protonpack:";
-    #  startAt = "*:0/30";
-    #  wantedBy = [ "timers.target" ];
-    #};
-  #};
+  systemd.mounts = [
+    { what = "/dev/sdb1";
+      where = "/mnt/usb1";
+      mountConfig = {
+        TimeoutSec = "1";
+        Options = "uid=eeva";
+      };
+    }
+  ];
+  systemd.automounts = [
+    { where = "/mnt/usb1";
+      automountConfig = { TimeoutIdleSec = "1"; };
+      wantedBy = [ "default.target" ];
+    }
+  ];
 
   time.timeZone = "Europe/Paris";
 
   users = {
-    extraGroups = {
-      eeva.gid = 1000;
-      vboxusers.members = [ "eeva" ];
-      vboxsf.members = [ "eeva" ];
-    };
-
     extraUsers.eeva = {
       isNormalUser = true;
       home = "/home/eeva";
diff --git a/vim.nix b/vim.nix
index eeb6cff..5a267d9 100644
--- a/vim.nix
+++ b/vim.nix
@@ -1,15 +1,11 @@
+# Largely adapted from: https://www.mpscholten.de/nixos/2016/04/11/setting-up-vim-on-nixos.html
 with import <nixpkgs> {};
 
 vim_configurable.customize {
-    # Specifies the vim binary name.
-    # E.g. set this to "my-vim" and you need to type "my-vim" to open this vim
-    # This allows to have multiple vim packages installed (e.g. with a different set of plugins)
     name = "vim";
     vimrcConfig.vam.knownPlugins = pkgs.vimPlugins;
     vimrcConfig.vam.pluginDictionaries = [
       { names = [
-        # Here you can place all your vim plugins
-        # They are installed managed by `vam` (a vim plugin manager)
         "vim-nix"
         "Solarized"
         "fugitive"
@@ -106,5 +102,4 @@ vim_configurable.customize {
       " Normal backspace
       set backspace=indent,eol,start
     '';
-
 }