home

commit eb9f6bce718874647090d2bc94feb29d00273c6a
parent 8bd14a5ba859be00b4b04392d73464bcda302dfb
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Sun,  5 Aug 2018 15:36:50 +0200

Reorganize desktop.nix file

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
desktop.nix
 | 
51
++++++++++++++++++++++++++++-----------------------
M
hokkaido.nix
 | 
4
----

2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/desktop.nix b/desktop.nix
@@ -23,27 +23,35 @@
   xdg.configFile."xorg/parens.compose".source = ./xorg/parens.compose;
   xdg.configFile."xorg/modletters.compose".source = ./xorg/modletters.compose;
   xdg.configFile."user-dirs.dirs".source = ./xorg/user-dirs.dirs;
-  services.gpg-agent = {
-    enable = true;
-    enableSshSupport = true;
-    defaultCacheTtlSsh = 7200;
-  };
-  services.dunst.enable = true;
-  services.udiskie.enable = true;
-  services.network-manager-applet.enable = true;
-  services.screen-locker = {
-    enable = true;
-    lockCmd = "i3lock-color --clock -i $HOME/.background-lock --tiling";
-    inactiveInterval = 15;
-  };
-  programs.firefox.enable = true;
-  programs.termite = {
-    enable = true;
-    font = "Ubuntu Mono 16";
-    sizeHints = true;
+  services = {
+    gpg-agent = {
+      enable = true;
+      enableSshSupport = true;
+      defaultCacheTtlSsh = 7200;
+    };
+    dunst.enable = true;
+    udiskie.enable = true;
+    network-manager-applet.enable = true;
+    screen-locker = {
+      enable = true;
+      lockCmd = "i3lock-color --clock -i $HOME/.background-lock --tiling";
+      inactiveInterval = 15;
+    };
+    random-background = {
+      enable = true;
+      imageDirectory = "/home/vincent/desktop/pictures/wallpapers/Unsplashed";
+    };
   };
-  programs.rofi = {
-    enable = true;
+  programs = {
+    firefox.enable = true;
+    termite = {
+      enable = true;
+      font = "Ubuntu Mono 16";
+      sizeHints = true;
+    };
+    rofi = {
+      enable = true;
+    };
   };
   home.packages = with pkgs; [
     alacritty # create a `programs.alacritty`
@@ -62,7 +70,4 @@
     xdg_utils
     youtube-dl
   ];
-  nixpkgs.config = {
-    allowUnfree = true;
-  };
 }
diff --git a/hokkaido.nix b/hokkaido.nix
@@ -17,10 +17,6 @@ with pkgs; {
     longitude = "7.5";
     tray = true;
   };
-  services.random-background = {
-    enable = true;
-    imageDirectory = "/home/vincent/desktop/pictures/wallpapers/Unsplashed";
-  };
   xdg.configFile."fish/conf.d/docker.fish".text = ''
     set -gx TESTKIT_AWS_KEYNAME "vdemeester-wakasu"
     set -gx DOCKER_BUILDKIT 1