From bbc5d87701ac17370b315d280767f4e70861ca04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sat, 25 Jul 2020 08:26:12 +0100
Subject: [PATCH] change skinny as well

---
 nixos/boxes/foureighty/home.nix       | 32 ++++++++------------------
 nixos/boxes/skinnyv/configuration.nix | 12 ++++++++++
 nixos/boxes/skinnyv/home.nix          | 33 ++++++++-------------------
 nixos/links.nix                       |  2 +-
 4 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/nixos/boxes/foureighty/home.nix b/nixos/boxes/foureighty/home.nix
index ec5527d3..84a24dcf 100644
--- a/nixos/boxes/foureighty/home.nix
+++ b/nixos/boxes/foureighty/home.nix
@@ -1,26 +1,12 @@
 { config, pkgs, ... }:
 
-let
-  unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
-  dotfiles = "/home/cyryl/dev/dotfiles";
-in
-  {
-    nixpkgs.config = {
-      allowUnfree = true;
-      packageOverrides = pkgs: {
-        unstable = import unstableTarball {
-          config = config.nixpkgs.config;
-        };
-      };
-    };
+{
+  home.file.".config/i3/status.toml".source = ../../../.config/i3/status-double-bat.toml;
 
-    home.file.".config/i3/status.toml".source = /home/cyryl/dev/dotfiles/.config/i3/status-double-bat.toml;
-
-    imports = [
-      ../../home-common.nix
-      ../../programs/git.nix
-      ../../gui.nix
-      ../../gnome/home.nix
-    ];
-
-  }
+  imports = [
+    ../../home-common.nix
+    ../../programs/git.nix
+    ../../gui.nix
+    ../../gnome/home.nix
+  ];
+}
diff --git a/nixos/boxes/skinnyv/configuration.nix b/nixos/boxes/skinnyv/configuration.nix
index c947a573..cda29584 100644
--- a/nixos/boxes/skinnyv/configuration.nix
+++ b/nixos/boxes/skinnyv/configuration.nix
@@ -20,7 +20,19 @@
     };
     time.timeZone = "Europe/London";
 
+    fonts.fontconfig.enable = true;
+    home-manager.users.cyryl = {...}: {
+      imports = [
+        ./home.nix
+      ];
+      home.stateVersion = config.system.stateVersion;
+
+      nixpkgs.overlays = config.nixpkgs.overlays;
+      nixpkgs.config = config.nixpkgs.config;
+    };
+
     imports = [
+      <home-manager/nixos>
       /etc/nixos/hardware-configuration.nix
       ../../boot.nix
       ../../common.nix
diff --git a/nixos/boxes/skinnyv/home.nix b/nixos/boxes/skinnyv/home.nix
index e383dc4c..0112cb72 100644
--- a/nixos/boxes/skinnyv/home.nix
+++ b/nixos/boxes/skinnyv/home.nix
@@ -1,26 +1,11 @@
 { config, pkgs, ... }:
+{
+  home.file.".config/i3/status.toml".source = ../../../.config/i3/status-single-bat.toml;
 
-let
-  unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
-  dotfiles = "/home/cyryl/dev/dotfiles";
-in
-  {
-    nixpkgs.config = {
-      allowUnfree = true;
-      packageOverrides = pkgs: {
-        unstable = import unstableTarball {
-          config = config.nixpkgs.config;
-        };
-      };
-    };
-
-    home.file.".config/i3/status.toml".source = ~/dev/dotfiles/.config/i3/status-single-bat.toml;
-
-    imports = [
-      ../../home-common.nix
-      ../../programs/git.nix
-      ../../gui.nix
-      ../../i3/home.nix
-    ];
-
-  }
+  imports = [
+    ../../home-common.nix
+    ../../programs/git.nix
+    ../../gui.nix
+    ../../i3/home.nix
+  ];
+}
diff --git a/nixos/links.nix b/nixos/links.nix
index c141b634..acc6761a 100644
--- a/nixos/links.nix
+++ b/nixos/links.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  home.file.".config/nixpkgs/config.nix".source = /home/cyryl/dev/dotfiles/nixos/shell-config.nix;
+  home.file.".config/nixpkgs/config.nix".source = ./shell-config.nix;
   home.file.".gdbinit".text = ''
     set auto-load python-scripts on
     add-auto-load-safe-path /home/cyryl/dev/dotfiles/.gdbinit