From 3d4698b95454caa174b2f0d20855ce1fde8e153e Mon Sep 17 00:00:00 2001
From: horhik <horhik@tuta.io>
Date: Thu, 26 Aug 2021 09:47:50 +0300
Subject: [PATCH] return to nixos

---
 home/xmonad/.xmonad/lib/DraculaColors.hi | Bin 1368 -> 0 bytes
 home/xmonad/.xmonad/lib/GruvboxColors.hi | Bin 1572 -> 0 bytes
 nix/README.md                            |  43 +++++++++++++++++++++++
 nix/configuration.nix                    |   5 +--
 nix/flake.nix                            |   3 ++
 nix/hardware-configuration.nix           |   6 ++--
 nix/modules/bspwm.nix                    |   5 +++
 nix/modules/picom.nix                    |   2 +-
 nix/modules/tmux.nix                     |   4 +--
 9 files changed, 60 insertions(+), 8 deletions(-)
 delete mode 100755 home/xmonad/.xmonad/lib/DraculaColors.hi
 delete mode 100755 home/xmonad/.xmonad/lib/GruvboxColors.hi
 create mode 100644 nix/README.md
 create mode 100644 nix/modules/bspwm.nix

diff --git a/home/xmonad/.xmonad/lib/DraculaColors.hi b/home/xmonad/.xmonad/lib/DraculaColors.hi
deleted file mode 100755
index 565408633aca26f4ef2029e991679a187a37dbe4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1368
zcmZvaT}%{L6vxk<1=(d;L9Mml4^1DM7`C<{O&|JFu_{TeZTi%tFXQaEP8?=7v$Lfn
zeONwZUBQ(PK@hfpwD<vv#f7y5Hp>#R$YQZ7Dl9CBUCW0Qh)|Gq+k1zmX_J{`{yF!Y
z-#Pc*bI+rinPiCj;N2Z*8dJ6apc%%0B>)1bd01ZGJsk{wTjZ_liIm+O+HqyF>tyFx
zuxR_#gXRgZzqjfZ%5UoOHJ@-bbfN02rB~;RU3Z#L@JYqYNq0;6J5@gn1lxOyMn83S
zx6g;$>O*B{!8a7kFFn3CfcgU0+b-r77hXgTfADBw)7jHIfqb2yp^ygRfC4HWs0~`6
z5`e<011b?HJy1zN8GzbI;QRQTRC3f&5gJ+Z2EMw{>{%K)bH$McNjQjb2~sE?Hb4Ss
zK?jMTe=;-i{M_TAbJeJJA{6m1tvU*E4Gb$8o51jW^}uXwzUV3ATg_`K=<FU^MWh;f
zKR#x+&uW#{<SifVnGIC9I?#!!zd~~*zTDyUA_wC=c6$Uv5MR7*AkxZvmlnefgOU0O
zS~<NExO2P1xtF+6xjH@>aGx0q^yNH2NBYC#<6%#2HMt9*YwG;N>AACx1$V)hKbCu%
zesPY6ml3`=pr`71>G<sQ{DsL@5Bm9b|Il!>QHPrZ)SK$`c>mOIj(a78Nj;upwXr|E
z$4U|IC{UlP<AaN?%O&pi`wi%)%WG9RRnCDl+<u_!>UhD}t-C7=b*J9@eZ(~wtc*=}
zApBN9wW#BDq37Yj$Hh6^Xuk7V-nAPYeuN(us4;cCU@qEw-nZDgzoqB6Ggjli*@o~G
zfX1MX7ccupbG>;jZWMmx>5F<t``*SQ1DX%j@u~CnXTL`8`e)Fo#^uuJcR5RI2=tie
z)p;^z8Y^61{c|cm+*r$9>RcE*;?HY+gR~!qTtv!<RDyxbSqhO&L^c!ILgWP^TZz0#
zWE+u}h`dbX6(X+^dF}PMOqvr6yCj;i@pQV#i;^|&0BvQp=0i-XMdC73I6-F3tdyF?
zNvtWA6Lfp_rW<$jA}wo)wG+cz(nUd*MBez3#lmw8EpuP9hJSsMBxY^iMa#5tw@qMV
zQ8MC?Ro?nPSB8ldWKPc3E8cygAabT{iv0zf$(be5W-(^qlSl&1Cy{;kumUS_j5UQU
zGWHuk{)S;KGA9ZNpGholGqK4BXy!0U6imv!k{B^F6K|p{QW%>g;l(GMz$y+MlT8bX
zm3&Z?*#G1unkAN959vjT7R>)7SUBOZlAyQPBn!Xp)#4s0&W%=<XBl#ybtaqTc`-||
Ob#KYiKG9_3*}nmq>iYr!

diff --git a/home/xmonad/.xmonad/lib/GruvboxColors.hi b/home/xmonad/.xmonad/lib/GruvboxColors.hi
deleted file mode 100755
index dea79972567548072c1432bf5ee8ea079460c970..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1572
zcmZvcYfu|i6vxlqKuLHMY(?<V*0Izt4p>K>>gWe8waAQBN51+cB-^;M>}HmvG=ADr
z-lZX>Sb@kWP!tFOh5|<9RVq+uu!SkFh6X7Qd9)0O2muM+yL5ca?9S|e&OP^c&%NjD
zxjX&!Vleo;@ygNH6<QMq;A6yZ1ONg^^E8*-bI*>7=-0mXJ1MTh?m6VJSJW&nE#;cF
z?$u1W@7C44nQCiotIjo-wIZt{&#`PV-?bs<qbrN~#kF6)Tv*=kZ0gRr|6$hkrsavo
zlJU!ErES=ons;%lAN6+jG}==v7wjmb!<l)(_I=TDAWthOD5L-%pn&oPYL5~qKcKLx
zfbs__0H{Eqf`Hmf;4yqqD!6pyhdS$};qioY>-Ntn8@9PmAsA009D)S$g+1U0N>G76
z1VA7J!QPbZ$*PHkmGni_zp&%<{&cfp8b`uQ_7e$*kg358Z{H2i$QNDbW_CPIOPQX8
zL~r|gMe(7M#D;8d`i{jlYmM8iZogJinbG@_6ybB<22q^F2>4od4MgbNj*|YIwCTxX
z`R?tCyuseyBgBge<mvS0mgPULch(<EYb*Qx+*WnlFi8ebk362WnzJx}%T=hG`E4*Y
z%XzEl1)MmbHF<g<JH2niYV*7!7B5;yA6)f@<01idSe{<UT<sd___qEvdu_u)x241}
zhj2xK`a~XYyT3f|>J-gvl~^wJm2M0l#nlH&l&3e%EtU2m%cc{pUK{BhS-!dELik$&
zRVUA{Gz^q@$}_7@KPa?TbUVstwD`LM<(8+*i<;eQ4`(|MG`BhP8}hF-nGtRRPz1^2
z1?$d*Qp@<|!`^K3pPe%oi;v)j0mWPLbp4nsL%cfL73TQGv$SDvA9@it7bqBc+UCBL
zb)&L9rwKLobZt2be(V`RxD`QBD9<miu6{MvRoy;>YHQDX)*I6L1`uvsQ1r_4lNq_0
z+Xa8sy*ibD=k{&)n)nC-z9EVYd7N~rVh4IW>+`7--+jZ>w5+((I?mT0B%OeN0nZRQ
zL?i-2NViM!1hMuJ!Pf-AlSD#^JVhjoNH~$FiQo_jo+a`ekpn~y5;^p|PokRPf?@>Y
znRxzeG|%!vl25!kiB{@9(?se8CNYHJ4783GB9j?`)<!a%D(3y@sFN(OHYka89K-vg
zdCnm4Y}C7YJ<Dj+2IdSM^p8&v_~d;j)CP6bNh7B*@In-xN-~80&lRhsIRj%b1xVgg
zJjXNIFv*Ui6B(Vr8}(7K_#^_SW&_E-F*HXDj3z0B3}Qcudhe`;)*Bd}^ZQt!S)-N?
zj#q0E$U;sl<rS#m6BF?!(jY`*6a+l@fZ=G#q0*StoMZ)`<^}pc>q7q>$I%-8aWs`q
zP@5#)UnkJ??$Qv+JfRj6XhE6_-~~0Od%T05;SzSedZVCccfCqnRLQwFiDqdHNnn>T
T(Jad+OSUS)Ae`d0Mwb2?mXt!C

diff --git a/nix/README.md b/nix/README.md
new file mode 100644
index 0000000..3c11607
--- /dev/null
+++ b/nix/README.md
@@ -0,0 +1,43 @@
+# NixOS setup
+
+1. Backup your old config
+```bash
+$ sudo mv /etc/nixos /etc/nixos.old
+```
+
+2. Copy repo and symlink new config from dotfiles
+```bash
+$ git clone https://github.com/horhik/dotfiles
+$ cd dotfiles
+$ sudo ln -s $HOME/dotfiles/nix /etc/nixos
+```
+
+3. Past your hardware-configuration
+```bash
+$ sudo cp /etc/nixos.old/hardware-configuration.nix /etc/nixos/
+```
+
+4. Install home-manager
+```bash
+$ nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
+$ nix-channel --update
+
+$ nix-channel --add https://github.com/nix-community/home-manager/archive/release-21.05.tar.gz home-manager
+$ nix-channel --update
+
+export NIX_PATH=$HOME/.nix-defexpr/channels${NIX_PATH:+:}$NIX_PATH
+
+$ nix-shell '<home-manager>' -A install
+```
+
+5. Copy dotfiles
+	  ```bash
+	  stow --adopt -vt ~ $HOME/dotfiles/home/*
+	  ```
+6. Build nixos
+```bash
+  cd /etc/nixos
+  sudo nixos-rebuild build --flake "#."
+```
+
+
diff --git a/nix/configuration.nix b/nix/configuration.nix
index 001b110..298830c 100755
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -121,7 +121,7 @@
     mononoki fontmatrix
     firefox 
     connman
-    wpa_supplicant python3 xkblayout-state acpi yaru-theme
+    wpa_supplicant python3 xkblayout-state acpi yaru-theme xkb-switch
     pipewire  pulsemixer nerdfonts
     feh compton ninja meson cmake 
     anki clang_12 zathura redshift rustup neofetch tree
@@ -131,6 +131,7 @@
     spotify obsidian discord
     nfs-utils cifs-utils
     nfs-ganesha
+    transmission
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
@@ -219,7 +220,7 @@
   nixpkgs.overlays = [
     (import (builtins.fetchTarball {
       url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
-      sha256 = "0c2p2ycx6c50rzfd5k56cc411cb0ilhc3zyhhxlwcjnz1ysn5laj";
+      sha256 = "039kk45r6pqsfd865lgfiwbaqlpll4p9pmndbzhi6l5w5r8dbabm";
     }))
   ];
 }
diff --git a/nix/flake.nix b/nix/flake.nix
index 95865de..0fb5cd4 100755
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -74,9 +74,12 @@
               imports = [
                 ./modules/picom.nix
                 ./modules/tmux.nix
+                ./modules/bspwm
               ];
             };
           })
+
+          { nixpkgs.overlays = overlays; }
         ];
         inherit pkgs;
       };
diff --git a/nix/hardware-configuration.nix b/nix/hardware-configuration.nix
index 0ef6ae0..e5525c2 100755
--- a/nix/hardware-configuration.nix
+++ b/nix/hardware-configuration.nix
@@ -14,17 +14,17 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/1dd41f8e-142f-4799-a5e5-cc916cf016c1";
+    { device = "/dev/disk/by-uuid/906b2b92-4e31-4a91-938f-14ac752dffe7";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/7555-74BA";
+    { device = "/dev/disk/by-uuid/8200-D543";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/4d03f0d2-c4d2-4f50-9b0c-86ab4df15cfd"; }
+    [ { device = "/dev/disk/by-uuid/98b5b158-730a-470c-95f1-d8a32ebff9ad"; }
     ];
 
 }
diff --git a/nix/modules/bspwm.nix b/nix/modules/bspwm.nix
new file mode 100644
index 0000000..b33c2cc
--- /dev/null
+++ b/nix/modules/bspwm.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+{
+  services.xserver.windowManager.bspwm.enable = true;
+  home.packages =  [pkgs.sxhdkd];
+}
diff --git a/nix/modules/picom.nix b/nix/modules/picom.nix
index b8e228f..eb0e73a 100755
--- a/nix/modules/picom.nix
+++ b/nix/modules/picom.nix
@@ -74,7 +74,7 @@
     rounded-corners-exclude = [
         "window_type = 'dock'",
         "_NET_WM_STATE@:32a *= '_NET_WM_STATE_FULLSCREEN'",
-        "class_g = 'keynav'",
+        "class_g = 'keynav'"
     ];
     round-borders = 0;
     round-borders-exclude = [
diff --git a/nix/modules/tmux.nix b/nix/modules/tmux.nix
index a5642cd..8c704bf 100644
--- a/nix/modules/tmux.nix
+++ b/nix/modules/tmux.nix
@@ -1,8 +1,8 @@
 {config, pkgs, ...}:
-programs.tmux = {
+ {
   enable = true;
   clock24 = true;
-  extraPackages = tmuxPlugins : [tmux-gruvbox.gruvbox ];
+  home.packages =  [pkgs.tmuxPlugins.gruvbox ];
   extraTmuxConf = '' 
     set -g @plugin 'egel/tmux-gruvbox'
     set -g @tmux-gruvbox 'dark' # or 'light'