From 6afab6aa13291148d989a5e3067235ff8b7aff86 Mon Sep 17 00:00:00 2001
From: Alexander Szczepanski <alexander@szczepan.ski>
Date: Mon, 20 Sep 2021 08:09:55 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8D=E2=9C=8B=F0=9F=8D=86=F0=9F=A9=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 configs/gui.nix      | 36 -------------------------------
 configs/user-gui.nix | 51 +++++++++++++++++++++++++++++++++++++-------
 machine/desktop.nix  |  1 -
 machine/thinkpad.nix |  7 ++++++
 4 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/configs/gui.nix b/configs/gui.nix
index 914e6c6..dd5e2a4 100644
--- a/configs/gui.nix
+++ b/configs/gui.nix
@@ -16,47 +16,19 @@
   };
 
   environment.systemPackages = with pkgs; [
-    barrier
-    bspwm
     chromium
-    cura
-    cypress
-    dunst
-    etcher
-    evince
-    firefox
-    font-manager
-    fslint
     fswebcam
     glxinfo
     gparted
-    insomnia
-    jellyfin-media-player
-    jellyfin-mpv-shim
-    kdenlive
-    keepassxc
-    libnotify
-    libreoffice
     libsecret
     lightlocker
-    mangohud
-    meld
-    mpv
     networkmanager-openconnect
-    nextcloud-client
     openconnect
     pantheon.elementary-gtk-theme
     pantheon.elementary-icon-theme
-    pinta
     ponymix
-    prusa-slicer
     pulseaudio-ctl
     python39Packages.pyyaml
-    solaar
-    sxhkd
-    virtmanager
-    vulkan-tools
-    winetricks
   ];
 
   programs = {
@@ -157,14 +129,6 @@
         };
         defaultSession = "xsession";
         session = [{
-          manage = "desktop";
-          name = "bspwm";
-          start = ''
-            ${pkgs.bspwm}/bin/bspwm -c /etc/bspwmrc &
-            ${pkgs.sxhkd}/bin/sxhkd -c /etc/sxhkdrc &
-            ${pkgs.xfce.xfce4-session}/bin/xfce4-session
-          '';
-        } {
            manage = "desktop";
            name = "xsession";
            start = ''exec $HOME/.xsession'';
diff --git a/configs/user-gui.nix b/configs/user-gui.nix
index 5d9e87f..1b6782f 100644
--- a/configs/user-gui.nix
+++ b/configs/user-gui.nix
@@ -1,4 +1,8 @@
 { config, pkgs, lib, ... }:
+
+let
+  unstable = import <nixos-unstable> { config.allowUnfree = true; };
+in
 {
   imports = [ <home-manager/nixos> ];
 
@@ -10,27 +14,51 @@
           source = ./.bin/rofi-default-sink.sh;
         };
       };
-      packages =  with pkgs; [
+      packages =  with unstable.pkgs; [
         arandr
         baobab
+        barrier
         bitwarden
         blueberry
+        cura
+        cypress
+        discord
+        etcher
+        evince
+        firefox
+        font-manager
+        fslint
         gnome.cheese
         gnome.eog
         gnome.file-roller
         gnome.gnome-calculator
         gnome.seahorse
         homebank
+        insomnia
+        jellyfin-media-player
+        jellyfin-mpv-shim
+        kdenlive
+        keepassxc
+        libnotify
+        libreoffice
         lutris
+        lxrandr
+        mangohud
+        meld
+        nextcloud-client
+        pinta
+        prusa-slicer
         rpi-imager
         signal-desktop
+        solaar
         spotify
         steam
-        discord
-        lxrandr
         teams
         unrar
+        virtmanager
+        vulkan-tools
         wine
+        winetricks
       ];
     };
 
@@ -94,14 +122,17 @@
     programs = {
       vscode = {
         enable = true;
-        package = pkgs.vscode;
-        extensions = with pkgs.vscode-extensions; [
-          bbenoist.Nix
+        package = unstable.pkgs.vscode;
+        extensions = with unstable.pkgs.vscode-extensions; [
+          bbenoist.nix
+          eamodio.gitlens
           editorconfig.editorconfig
           ms-azuretools.vscode-docker
           ms-vsliveshare.vsliveshare
-          #hsnazar.hyper-term-theme
-          eamodio.gitlens
+          ms-vscode.cpptools
+          mskelton.one-dark-theme
+          ms-kubernetes-tools.vscode-kubernetes-tools
+          ryu1kn.partial-diff
         ];
         # userSettings = {
         #   #"terminal.integrated.fontFamily" = "Hack";
@@ -264,6 +295,10 @@
         };
       };
 
+      barrier.client = {
+        enable = true;
+      };
+
       nextcloud-client = {
         enable = true;
         startInBackground = true;
diff --git a/machine/desktop.nix b/machine/desktop.nix
index 5a21288..f120742 100644
--- a/machine/desktop.nix
+++ b/machine/desktop.nix
@@ -97,7 +97,6 @@ in
     fswatch
   ];
 
-
   services.xserver.videoDrivers = [ "amdgpu" ];
   services.hardware.xow.enable = true;
   services.printing.enable = true;
diff --git a/machine/thinkpad.nix b/machine/thinkpad.nix
index 841e5fa..f1e685e 100644
--- a/machine/thinkpad.nix
+++ b/machine/thinkpad.nix
@@ -23,6 +23,7 @@ in
       ../configs/common.nix
       ../configs/user.nix
       ../configs/user-gui.nix
+      <home-manager/nixos>
     ];
 
   # boot.initrd.luks.devices = {
@@ -154,6 +155,12 @@ in
     };
   };
 
+  home-manager.users.alex.services.barrier.client = {
+    enable = true;
+    name = "thinkpad";
+    server = "192.168.0.150:24800"
+  };
+
   environment.systemPackages = with pkgs; [
     nvidia-offload
     xorg.xf86videointel