Merge branch 'master' of github.com:IvanMalison/dotfiles

nixos/cachix.nix

@@ -0,0 +1,12 @@
+{
+  nix = {
+    binaryCaches = [
+      "https://cache.nixos.org/"
+      "https://hie-nix.cachix.org"
+    ];
+    binaryCachePublicKeys = [
+      "hie-nix.cachix.org-1:EjBSHzF6VmDnzqlldGXbi0RM3HdjfTU3yDRi9Pd0jTY="
+    ];
+    trustedUsers = [ "root" "imalison" "kat" ];
+  };
+}

nixos/configuration.nix

@@ -175,6 +175,7 @@ in
     patchelf
     plasma-workspace
     powertop
+    pscircle
     python-with-my-packages
     qt5.qttools
     rcm
@@ -215,6 +216,7 @@ in
 
 
   programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
+  programs.adb.enable = true;
   services.openssh.enable = true;
   services.avahi = {
     enable = true;
@@ -271,7 +273,13 @@ in
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.extraUsers = let
     extraGroups = [
-      "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal"
+      "audio"
+      "adbusers"
+      "disk"
+      "networkmanager"
+      "systemd-journal"
+      "video"
+      "wheel"
     ];
     userDefaults = {
       inherit extraGroups;
@@ -295,5 +303,5 @@ in
     };
   };
 
-  system.nixos.stateVersion = "18.03";
+  system.stateVersion = "18.03";
 }

nixos/machines/imalison-home.nix

@@ -5,6 +5,7 @@
     <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     ../configuration.nix
     ../games.nix
+    ../cachix.nix
     ../extra.nix
   ];