From 0cd107a09d7ec06fa8915d9b83c69a1cf50a7380 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Sat, 24 Oct 2020 16:03:39 -0500
Subject: [PATCH] Work on lightdm/sway stuff

---
 apps/shell/bash/aliases.bash     |  4 ----
 apps/shell/fish/aliases.fish     |  4 ----
 bin/vman                         |  8 --------
 env/nix/modules/de/base.nix      |  2 ++
 env/nix/modules/de/sway.nix      |  2 ++
 env/nix/modules/docker.nix       |  8 +++++++-
 env/nix/modules/lightdm.nix      | 22 ++++++++++++++++++++++
 env/nix/modules/neovim.nix       |  6 ++++--
 env/nix/modules/users/daniel.nix |  1 -
 9 files changed, 37 insertions(+), 20 deletions(-)
 delete mode 100755 bin/vman
 create mode 100644 env/nix/modules/lightdm.nix

diff --git a/apps/shell/bash/aliases.bash b/apps/shell/bash/aliases.bash
index 5a98b69..3578b55 100644
--- a/apps/shell/bash/aliases.bash
+++ b/apps/shell/bash/aliases.bash
@@ -140,10 +140,6 @@ alias pa="pulsemixer"
 # this sometimes fixes steam dynamic library issues?
 alias lsteam="LD_PRELOAD='/usr/$LIB/libstdc++.so.6 /usr/$LIB/libgcc_s.so.1 /usr/$LIB/libxcb.so.1 /usr/$LIB/libgpg-error.so' steam"
 
-# override the man commands with vim
-alias _man="\\man"
-alias man="vman"
-
 # neomutt is better
 alias mutt="neomutt"
 
diff --git a/apps/shell/fish/aliases.fish b/apps/shell/fish/aliases.fish
index 91efb4d..943bd4d 100755
--- a/apps/shell/fish/aliases.fish
+++ b/apps/shell/fish/aliases.fish
@@ -171,10 +171,6 @@ alias vd vdiff
 # this sometimes fixes steam dynamic library issues?
 alias lsteam "env LD_PRELOAD='/usr/$LIB/libstdc++.so.6 /usr/$LIB/libgcc_s.so.1 /usr/$LIB/libxcb.so.1 /usr/$LIB/libgpg-error.so' steam"
 
-# override the man commands with vim
-alias _man "\\man"
-alias man "vman"
-
 # neomutt is better
 alias mutt "neomutt"
 alias mail "mutt"
diff --git a/bin/vman b/bin/vman
deleted file mode 100755
index 0e608fa..0000000
--- a/bin/vman
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-
-# our vim config is setup to not auto-load sessions if we set the
-# `asmanviewer` variable, so launch vim that way when using vim as our man
-# page viewer
-
-"$EDITOR" --cmd "let asmanviewer=1" -c "SuperMan $*" || \
-	( echo "No manual entry for $*" && exit 1 )
diff --git a/env/nix/modules/de/base.nix b/env/nix/modules/de/base.nix
index 1b5f7ce..794bcdd 100644
--- a/env/nix/modules/de/base.nix
+++ b/env/nix/modules/de/base.nix
@@ -1,4 +1,5 @@
 { config, pkgs, ... }: {
+  imports = [ ../lightdm.nix ];
   fonts.fonts = with pkgs; [ iosevka ];
 	hardware.opengl = {
 		enable = true;
@@ -7,6 +8,7 @@
 	};
 	environment = {
 		systemPackages = with pkgs; [
+			glxinfo
 			firefox-devedition-bin
 			pavucontrol
 			brightnessctl
diff --git a/env/nix/modules/de/sway.nix b/env/nix/modules/de/sway.nix
index abf884d..847a0c8 100644
--- a/env/nix/modules/de/sway.nix
+++ b/env/nix/modules/de/sway.nix
@@ -12,6 +12,8 @@
 			wl-clipboard
 			slurp
 			grim
+			font-awesome
     ];
   };
+	# services.xserver.displayManager.defaultSession = "sway-lytedev";
 }
diff --git a/env/nix/modules/docker.nix b/env/nix/modules/docker.nix
index 8092545..c38dee1 100644
--- a/env/nix/modules/docker.nix
+++ b/env/nix/modules/docker.nix
@@ -1,3 +1,9 @@
 { config, pkgs, ... }: {
-  imports = [ /etc/nixos/hardware-configuration.nix ];
+	virtualisation.docker = {
+		enable = true;
+		enableOnBoot = false;
+	};
+	environment.systemPackages = with pkgs; [
+		docker docker-compose
+	];
 }
diff --git a/env/nix/modules/lightdm.nix b/env/nix/modules/lightdm.nix
new file mode 100644
index 0000000..aad1fe0
--- /dev/null
+++ b/env/nix/modules/lightdm.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }: {
+	# services.xserver.displayManager.defaultSession
+	services.xserver = {
+		enable = true;
+		displayManager.lightdm = {
+			enable = true;
+			greeter = {
+				enable = true;
+			};
+			greeters.gtk = {
+				enable = true;
+				theme = {
+					package = pkgs.arc-theme;
+					name = "Arc-Dark";
+				};
+				clock-format = "%H:%M:%S";
+			};
+			# background = "";
+		};
+	};
+	environment.systemPackages = with pkgs; [ lightdm lightdm_gtk_greeter ];
+}
diff --git a/env/nix/modules/neovim.nix b/env/nix/modules/neovim.nix
index 162bf31..368b0dd 100644
--- a/env/nix/modules/neovim.nix
+++ b/env/nix/modules/neovim.nix
@@ -3,10 +3,12 @@
 		systemPackages = [ pkgs.neovim ];
 		variables = {
 			EDITOR = "nvim";
+			MANPAGER = "nvim +Man!";
+			MANWIDTH = "80";
 		};
 		shellAliases = {
-			vim = "neovim";
-			vi = "neovim";
+			vim = "nvim";
+			vi = "nvim";
 		};
 	};
 }
diff --git a/env/nix/modules/users/daniel.nix b/env/nix/modules/users/daniel.nix
index 921cbd0..d154d5e 100644
--- a/env/nix/modules/users/daniel.nix
+++ b/env/nix/modules/users/daniel.nix
@@ -25,7 +25,6 @@
 			strongswan
 			gnumake
 			elixir
-			docker docker-compose
 			postgresql
 			htop
 			google-cloud-sdk