From d1ac6436c1b83b827d4c66e6ecd15c9c58e196a2 Mon Sep 17 00:00:00 2001
From: Alexander Szczepanski <alexander@szczepan.ski>
Date: Sun, 1 Aug 2021 23:23:57 +0200
Subject: [PATCH] moved desktop to bspwm and added picom

---
 configs/common.nix   | 29 -----------------------------
 configs/desktop.nix  | 17 ++++++++---------
 configs/user-gui.nix |  9 +++++++++
 machine/desktop.nix  | 22 +---------------------
 4 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/configs/common.nix b/configs/common.nix
index 03f3cd9..011c10e 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -6,35 +6,6 @@
       (fetchTarball "https://github.com/msteen/nixos-vscode-server/tarball/master")
     ];
 
-  programs.zsh = {
-    enable = true;
-
-    # enableCompletion = true;
-    # autosuggestions.enable = true;
-    # syntaxHighlighting.enable = true;
-
-    # ohMyZsh = {
-    #   enable = true;
-    #   theme = "agnoster";
-    #   customPkgs = [
-    #     pkgs.zsh-autosuggestions
-    #     pkgs.zsh-syntax-highlighting
-    #     pkgs.zsh-powerlevel10k
-    #   ];
-    #   plugins = [
-    #     "cp"
-    #     "common-aliases"
-    #     "docker "
-    #     "systemd"
-    #     "wd"
-    #     "kubectl"
-    #     "git"
-    #     # "zsh-autosuggestions"
-    #     # "zsh-syntax-highlightin"
-    #   ];
-    # };
-  };
-
   services = {
     vscode-server.enable = true;
     openssh = {
diff --git a/configs/desktop.nix b/configs/desktop.nix
index 58d9d88..679d13b 100644
--- a/configs/desktop.nix
+++ b/configs/desktop.nix
@@ -3,7 +3,6 @@
 {
   environment.systemPackages = with pkgs; [
     elementary-xfce-icon-theme
-    gnomeExtensions.appindicator
     sxhkd
     bspwm
     polybar
@@ -16,14 +15,14 @@
     text = ''
       #!/usr/bin/env bash
       # spread desktops
-      # desktops=5
-      # count=$(xrandr -q | grep -c ' connected')
-      # i=1
-      # for m in $(xrandr -q | grep ' connected' | awk '{print $1}'); do
-      #   sequence=$(seq -s ' ' $(((1+(i-1)*desktops/count))) $((i*desktops/count)))
-      #   bspc monitor "$m" -d $(echo ''${sequence//10/0})
-      #   i=$((i+1))
-      # done
+      desktops=10
+      count=$(xrandr -q | grep -c ' connected')
+      i=1
+      for m in $(xrandr -q | grep ' connected' | awk '{print $1}'); do
+        sequence=$(seq -s ' ' $(((1+(i-1)*desktops/count))) $((i*desktops/count)))
+        bspc monitor "$m" -d $(echo ''${sequence//10/0})
+        i=$((i+1))
+      done
       # if [ -e "/etc/X11/Xresources" ]; then
       #   xrdb /etc/X11/Xresources
       # fi
diff --git a/configs/user-gui.nix b/configs/user-gui.nix
index 925136b..9c0f8ca 100644
--- a/configs/user-gui.nix
+++ b/configs/user-gui.nix
@@ -109,6 +109,15 @@
       };
     };
 
+    services = {
+      picom = {
+        enable = true;
+        blur = false;
+        shadow = true;
+        vSync = true;
+      };
+    };
+
     # manuals not needed
     manual.html.enable = false;
     manual.json.enable = false;
diff --git a/machine/desktop.nix b/machine/desktop.nix
index 3e6695e..66a9ab7 100644
--- a/machine/desktop.nix
+++ b/machine/desktop.nix
@@ -13,6 +13,7 @@ in
       ../configs/common.nix
       ../configs/user-gui.nix
       ../configs/user.nix
+      ../configs/desktop.nix
     ];
 
   # Use the systemd-boot EFI boot loader.
@@ -92,32 +93,17 @@ in
   };
 
   environment.systemPackages = with pkgs; [
-    elementary-xfce-icon-theme
-    gnomeExtensions.appindicator
     cpu-x
     hwinfo
-    zenmonitor
     hardinfo
     phoronix-test-suite
     fswatch
   ];
 
-  services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
 
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-  # services.xserver.desktopManager.pantheon.enable = true;
-  # services.xserver.desktopManager.pantheon.extraWingpanelIndicators = [ pkgs.pantheon.wingpanel-indicator-nightlight ];
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
   services.xserver.videoDrivers = [ "amdgpu" ];
-
   services.hardware.xow.enable = true;
-
-  # Enable CUPS to print documents.
   services.printing.enable = true;
-
-  # Enable sound.
   sound.enable = true;
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -128,11 +114,5 @@ in
   #   enableSSHSupport = true;
   # };
 
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
   system.stateVersion = "21.05";
 }