Commit cb5b2bdf13d6

@@ -1,10 +1,35 @@
 { pkgs, prefix, ... }:
 
 {
-  imports = [ ./fish.nix ./base.nix ];
-  programs.firefox = {
-    enable = true;
+  imports = [ ./fish.nix ./ssh.nix ./i3.nix ./base.nix ];
+  home.keyboard = {
+    layout = "fr(bepo),fr";
+    variant = "oss";
+    options = ["grp:menu_toggle" "grp_led:caps" "compose:caps"];
   };
+  xsession = {
+    enable = true;
+    initExtra = ''
+      ${pkgs.xlibs.xmodmap}/bin/xmodmap ~/.Xmodmap &
+    '';
+    pointerCursor = {
+      package = pkgs.vanilla-dmz;
+      name = "Vanilla-DMZ";
+    };
+  };
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+  };
+  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";
@@ -16,5 +41,11 @@
   home.packages = with pkgs; [
     xdg-user-dirs
     xdg_utils
+    youtube-dl
+    spotify
+    i3lock-color
   ];
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
 }

@@ -1,37 +1,10 @@
 { pkgs, prefix, ...}:
 
 {
-  imports = [ ./ssh.nix ./dev.nix ./i3.nix ];
-  home.keyboard = {
-    layout = "fr(bepo),fr";
-    variant = "oss";
-    options = ["grp:menu_toggle" "grp_led:caps" "compose:caps"];
-  };
-  xsession = {
-    enable = true;
-    initExtra = ''
-      ${pkgs.xlibs.xmodmap}/bin/xmodmap ~/.Xmodmap &
-    '';
-    pointerCursor = {
-      package = pkgs.vanilla-dmz;
-      name = "Vanilla-DMZ";
-    };
-  };
+  imports = [ ./dev.nix ];
   programs.autorandr = {
     enable = true;
   };
-  services.gpg-agent = {
-    enable = true;
-    enableSshSupport = true;
-  };
-  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;
-  };
   services.redshift = {
     enable = true;
     brightness = { day = "1"; night = "0.9"; };
@@ -49,13 +22,6 @@
   home.packages = with pkgs; [
     slack
     vscode
-    spotify
     zoom-us
-    youtube-dl
-    i3
-    i3lock-color
   ];
-  nixpkgs.config = {
-    allowUnfree = true;
-  };
 }