From e04c6c454cebed3dd62b8ab58f0b65755b431433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sat, 18 Apr 2020 11:59:42 +0100
Subject: [PATCH] refresh home

---
 nixos/common-services.nix                       | 2 +-
 nixos/gui.nix                                   | 3 +--
 nixos/home-other-os.nix                         | 1 +
 nixos/i3/home.nix                               | 4 ++++
 nixos/i3/polybar/openweathermap-fullfeatured.sh | 2 +-
 nixos/i3/polybar/polybar.nix                    | 8 ++++----
 nixos/programs.nix                              | 3 +++
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/nixos/common-services.nix b/nixos/common-services.nix
index d94aeef1..474c377f 100644
--- a/nixos/common-services.nix
+++ b/nixos/common-services.nix
@@ -41,7 +41,7 @@
       repository = "rest:http://brix.local:8000/";
       timerConfig = { OnCalendar = "hourly"; };
     };
-
+    geoclue2.enable = true;
     xserver = {
       enable = true;
       layout = "pl";
diff --git a/nixos/gui.nix b/nixos/gui.nix
index 310d3292..3f76bade 100644
--- a/nixos/gui.nix
+++ b/nixos/gui.nix
@@ -11,10 +11,9 @@
     unstable.tor-browser-bundle-bin
     jetbrains.goland unstable.jetbrains.clion jetbrains.idea-ultimate unstable.android-studio
     yubico-piv-tool yubikey-personalization yubikey-personalization-gui yubikey-manager-qt
-    slack discord obs-studio gnome3.nautilus gnome3.eog
+    slack discord gnome3.nautilus gnome3.eog
     hopper
     unstable.qemu unstable.aqemu unstable.foldingathome
     spotify shotwell
   ];
-
 }
diff --git a/nixos/home-other-os.nix b/nixos/home-other-os.nix
index 2d354fa4..257653f9 100644
--- a/nixos/home-other-os.nix
+++ b/nixos/home-other-os.nix
@@ -18,6 +18,7 @@ in
       PASSWORD_STORE_ENABLE_EXTENSIONS="true";
     };
 
+    targets.genericLinux.enable = true;
     home.file.".gitconfig".source = ~/dev/dotfiles/.gitconfig.linux.form3;
 
     imports = [
diff --git a/nixos/i3/home.nix b/nixos/i3/home.nix
index bc1401a2..993af136 100644
--- a/nixos/i3/home.nix
+++ b/nixos/i3/home.nix
@@ -21,6 +21,10 @@
     pasystray.enable = true;
   };
 
+  services.udiskie.enable = true;
+  services.redshift.enable = true;
+  services.redshift.provider = "geoclue2";
+
   xsession = {
     enable = true;
   };
diff --git a/nixos/i3/polybar/openweathermap-fullfeatured.sh b/nixos/i3/polybar/openweathermap-fullfeatured.sh
index f6e56e47..c94137d1 100755
--- a/nixos/i3/polybar/openweathermap-fullfeatured.sh
+++ b/nixos/i3/polybar/openweathermap-fullfeatured.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 source $HOME/.open-secrets.sh
 
diff --git a/nixos/i3/polybar/polybar.nix b/nixos/i3/polybar/polybar.nix
index e5f12396..0d8762da 100644
--- a/nixos/i3/polybar/polybar.nix
+++ b/nixos/i3/polybar/polybar.nix
@@ -25,8 +25,8 @@
         module-margin-left = 1;
         module-margin-right = 1;
         modules-left = "i3";
-        modules-center = "date weather";
-        modules-right = "memory swap cpu temperature battery1 battery0";
+        modules-center = "date ";
+        modules-right = "memory swap cpu battery1 battery0";
         tray-position = "right";
       };
 
@@ -41,7 +41,7 @@
       "module/weather" = {
         type = "custom/script";
         interval = 600;
-        exec = "~/dev/dotfiles/nixos/i3/polybar/openweathermap-fullfeatured.sh";
+        exec = "${pkgs.bash}/bin/bash -c 'source ~/dev/dotfiles/nixos/i3/polybar/openweathermap-fullfeatured.sh'";
         label-font = 2;
       };
 
@@ -58,7 +58,7 @@
       "module/temperature" = {
         type = "custom/script";
         interval = 5;
-        exec = "~/dev/dotfiles/nixos/i3/polybar/cpu-temp.sh";
+        exec = "${pkgs.bash}/bin/bash -c 'source ~/dev/dotfiles/nixos/i3/polybar/cpu-temp.sh'";
       };
 
       "module/memory" = {
diff --git a/nixos/programs.nix b/nixos/programs.nix
index 815cde71..8fec4bb0 100644
--- a/nixos/programs.nix
+++ b/nixos/programs.nix
@@ -16,5 +16,8 @@
     go.enable = true;
     bat.enable = true;
     browserpass.enable = true;
+    obs-studio.enable = true;
+    lsd.enable = true;
+    lsd.enableAliases = true;
   };
 }