From 654914d8ee0b7a3fec8169272675030b0bbdc00d Mon Sep 17 00:00:00 2001
From: mediocregopher <mediocregopher@gmail.com>
Date: Sat, 6 Jan 2024 12:27:30 +0100
Subject: [PATCH] Import full awesome env into root env

---
 awesome/config/gtk-3.0/bookmarks    |  3 --
 awesome/config/gtk-3.0/settings.ini |  2 -
 awesome/default.nix                 | 79 ++++++++++-------------------
 default.nix                         | 13 +++--
 zsh/default.nix                     |  3 ++
 5 files changed, 40 insertions(+), 60 deletions(-)
 delete mode 100644 awesome/config/gtk-3.0/bookmarks
 delete mode 100644 awesome/config/gtk-3.0/settings.ini

diff --git a/awesome/config/gtk-3.0/bookmarks b/awesome/config/gtk-3.0/bookmarks
deleted file mode 100644
index 63fc023..0000000
--- a/awesome/config/gtk-3.0/bookmarks
+++ /dev/null
@@ -1,3 +0,0 @@
-file:///tmp
-file:///home/mediocregopher/Screenshots
-file:///home/mediocregopher/Downloads
diff --git a/awesome/config/gtk-3.0/settings.ini b/awesome/config/gtk-3.0/settings.ini
deleted file mode 100644
index 0ca365e..0000000
--- a/awesome/config/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Settings]
-gtk-icon-theme-name = Tela
diff --git a/awesome/default.nix b/awesome/default.nix
index 3fedb87..c9d0eb2 100644
--- a/awesome/default.nix
+++ b/awesome/default.nix
@@ -2,12 +2,10 @@
 
   config,
 
-
 }: rec {
 
   pkgs = (import ../pkgs.nix).stable {};
   pkgs2305 = (import ../pkgs.nix).stable2305 {};
-  pkgsEdge = (import ../pkgs.nix).edge {};
 
   xorgInnerEnv = pkgs.buildEnv {
     name = "xorg-inner-env";
@@ -41,10 +39,9 @@ EOF
     done
   '';
 
-  startx = pkgs.writeShellScriptBin "startx" ''
+  startx = pkgs.writeShellScriptBin "startx-awesome" ''
     # TODO pass .xinitrc into here, somehow
     export XORGCONFIG=${xorgConf}
-    export PATH=${xorgInnerEnv}/bin:$PATH
     exec startx
   '';
 
@@ -60,43 +57,6 @@ EOF
     exec "$@"
   '';
 
-  browser = pkgs.writeScriptBin "browser" ''
-    #!${pkgs.bash}/bin/bash
-    exec ${nativeWrap}/bin/native-wrap ${config.browser} "$@"
-  '';
-
-  env = pkgs.buildEnv {
-    name = "awesome-env";
-    paths = [
-      pkgs.awesome
-      pkgs.tela-icon-theme
-
-      nativeWrap
-      browser
-
-      pkgs.pavucontrol
-      pkgs.xdg-utils
-      pkgs.arandr
-
-      pkgs.i3lock
-      pkgs.scrot
-      pkgs.feh
-      pkgs.brightnessctl
-
-      pkgs.cbatticon
-      pkgs.phwmon
-
-      pkgs2305.libreoffice
-      pkgs.gimp
-      pkgs.inkscape
-      pkgs.vlc
-      pkgs.sylpheed
-      pkgs.calibre
-
-      pkgsEdge.lagrange
-    ];
-  };
-
   wp = ../wallpapers;
 
   dirsLua = pkgs.writeTextDir "dirs.lua" ''
@@ -111,19 +71,10 @@ EOF
 
     set -e -x
 
-    export BROWSER=${browser}/bin/browser
-
     # Turn off powersaving (fuck the environment)
     xset -dpms
     xset s off
 
-    export PATH=${env}/bin:$PATH
-
-    export XDG_CONFIG_DIRS=${./config}
-
-    export XDG_DATA_DIRS=${env}/share
-    export XDG_DATA_DIRS=$XDG_DATA_DIRS:/home/mediocregopher/.nix-profile/share
-
     ${config.awesome.startupExtra}
 
     # HACK: This sleep is here because phwmon actually creates a separate tray
@@ -150,11 +101,35 @@ EOF
 
     echo "New awesome session starting" > $this_log
 
-    exec awesome \
+    exec ${pkgs.awesome}/bin/awesome \
       -c ${./rc.lua} \
       --search ${dirsLua} \
       --search ${./share} \
-      --search ${env}/share/awesome/themes \
+      --search ${pkgs.awesome}/share/awesome/themes \
       2>&1 2>>$this_log
   '';
+
+  env = pkgs.buildEnv {
+    name = "awesome-env";
+    paths = [
+      pkgs.tela-icon-theme
+
+      # We only include utilities in here which are directly used by awesome.
+      # General purpose applications go in the root default.nix env.
+      pkgs.pavucontrol
+      pkgs.xdg-utils
+      pkgs.arandr
+      pkgs.i3lock
+      pkgs.scrot
+      pkgs.feh
+      pkgs.brightnessctl
+      pkgs.cbatticon
+      pkgs.phwmon
+
+      xorgInnerEnv
+      nativeWrap
+      awesome
+      startx
+    ];
+  };
 }
diff --git a/default.nix b/default.nix
index f12d079..344f952 100644
--- a/default.nix
+++ b/default.nix
@@ -4,6 +4,7 @@
 
   pkgs ? (import ./pkgs.nix).stable {},
   pkgs2305 ? (import ./pkgs.nix).stable2305 {},
+  pkgsEdge ? (import ./pkgs.nix).edge {},
 
 }: let
 
@@ -48,7 +49,7 @@ in rec {
     );
   };
 
-  zsh = ((import ./zsh) {}).zsh;
+  zsh = ((import ./zsh) { inherit config; }).zsh;
   awesome = ((import ./awesome) { inherit config; });
 
   loadout = pkgs.buildEnv {
@@ -106,13 +107,19 @@ in rec {
       pkgs.udiskie
 
       pkgs.xterm # nice to have a backup
+      pkgs2305.libreoffice
+      pkgs.gimp
+      pkgs.inkscape
+      pkgs.vlc
+      pkgs.sylpheed
+      pkgs.calibre
+      pkgsEdge.lagrange
 
       bin
       ((import ./nvim) {}).nvim
       zsh
       ((import ./alacritty) { inherit config zsh; }).alacritty
-      awesome.awesome
-      awesome.startx
+      awesome.env
     ];
   };
 
diff --git a/zsh/default.nix b/zsh/default.nix
index 51fba90..99cffc6 100644
--- a/zsh/default.nix
+++ b/zsh/default.nix
@@ -1,6 +1,7 @@
 {
 
   pkgs ? (import ../pkgs.nix).stable {},
+  config,
 
 }: rec {
 
@@ -17,6 +18,8 @@
     plugins=(git vi-mode)
     source $ZSH/oh-my-zsh.sh
 
+    export BROWSER=${config.browser}/bin/browser
+
     . ${./zshrc}
     . ${./aliases}
   '';