From e637fcc7282f12f4eaa15d6d306af8f7841bf34c Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Fri, 9 Apr 2021 16:00:43 -0400
Subject: [PATCH] put xmonad and taffy under desktopish

---
 features/desktopish/default.nix                              | 5 +++++
 features/{ => desktopish}/taffybar/default.nix               | 0
 features/{ => desktopish}/taffybar/taffybar-srid/.gitignore  | 0
 .../taffybar/taffybar-srid/.vscode/extensions.json           | 0
 .../taffybar/taffybar-srid/.vscode/settings.json             | 0
 .../{ => desktopish}/taffybar/taffybar-srid/CHANGELOG.md     | 0
 features/{ => desktopish}/taffybar/taffybar-srid/Main.hs     | 0
 features/{ => desktopish}/taffybar/taffybar-srid/README.md   | 0
 features/{ => desktopish}/taffybar/taffybar-srid/Setup.hs    | 0
 features/{ => desktopish}/taffybar/taffybar-srid/bin/run     | 0
 features/{ => desktopish}/taffybar/taffybar-srid/default.nix | 0
 .../taffybar/taffybar-srid/dep/gitignoresrc/default.nix      | 0
 .../taffybar/taffybar-srid/dep/gitignoresrc/github.json      | 0
 .../taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix        | 0
 .../taffybar/taffybar-srid/dep/taffybar/default.nix          | 0
 .../taffybar/taffybar-srid/dep/taffybar/github.json          | 0
 .../taffybar/taffybar-srid/dep/taffybar/thunk.nix            | 0
 features/{ => desktopish}/taffybar/taffybar-srid/hie.yaml    | 0
 .../taffybar/taffybar-srid/taffybar-srid.cabal               | 0
 features/{ => desktopish}/xmonad/default.nix                 | 0
 features/{ => desktopish}/xmonad/xmonad-srid/.gitignore      | 0
 .../xmonad/xmonad-srid/.vscode/extensions.json               | 0
 .../xmonad/xmonad-srid/.vscode/settings.json                 | 0
 features/{ => desktopish}/xmonad/xmonad-srid/CHANGELOG.md    | 0
 features/{ => desktopish}/xmonad/xmonad-srid/Main.hs         | 0
 features/{ => desktopish}/xmonad/xmonad-srid/README.md       | 0
 features/{ => desktopish}/xmonad/xmonad-srid/Setup.hs        | 0
 features/{ => desktopish}/xmonad/xmonad-srid/default.nix     | 0
 .../xmonad/xmonad-srid/dep/gitignoresrc/default.nix          | 0
 .../xmonad/xmonad-srid/dep/gitignoresrc/github.json          | 0
 .../xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix            | 0
 features/{ => desktopish}/xmonad/xmonad-srid/hie.yaml        | 0
 .../{ => desktopish}/xmonad/xmonad-srid/xmonad-srid.cabal    | 0
 flake.nix                                                    | 2 --
 34 files changed, 5 insertions(+), 2 deletions(-)
 rename features/{ => desktopish}/taffybar/default.nix (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/.gitignore (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/.vscode/extensions.json (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/.vscode/settings.json (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/CHANGELOG.md (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/Main.hs (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/README.md (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/Setup.hs (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/bin/run (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/default.nix (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/dep/gitignoresrc/default.nix (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/dep/gitignoresrc/github.json (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/dep/taffybar/default.nix (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/dep/taffybar/github.json (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/dep/taffybar/thunk.nix (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/hie.yaml (100%)
 rename features/{ => desktopish}/taffybar/taffybar-srid/taffybar-srid.cabal (100%)
 rename features/{ => desktopish}/xmonad/default.nix (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/.gitignore (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/.vscode/extensions.json (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/.vscode/settings.json (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/CHANGELOG.md (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/Main.hs (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/README.md (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/Setup.hs (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/default.nix (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/dep/gitignoresrc/default.nix (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/dep/gitignoresrc/github.json (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/hie.yaml (100%)
 rename features/{ => desktopish}/xmonad/xmonad-srid/xmonad-srid.cabal (100%)

diff --git a/features/desktopish/default.nix b/features/desktopish/default.nix
index f3eeda7..b1d411c 100644
--- a/features/desktopish/default.nix
+++ b/features/desktopish/default.nix
@@ -1,10 +1,15 @@
 { pkgs, ... }: {
   imports = [
+    # Isolated features
     ./hidpi.nix
     ./swap-caps-ctrl.nix
     ./light-terminal.nix
     ./screencapture.nix
     ./fonts.nix
     ./touchpad-trackpoint.nix
+
+    # WMish things
+    ./xmonad
+    ./taffybar
   ];
 }
diff --git a/features/taffybar/default.nix b/features/desktopish/taffybar/default.nix
similarity index 100%
rename from features/taffybar/default.nix
rename to features/desktopish/taffybar/default.nix
diff --git a/features/taffybar/taffybar-srid/.gitignore b/features/desktopish/taffybar/taffybar-srid/.gitignore
similarity index 100%
rename from features/taffybar/taffybar-srid/.gitignore
rename to features/desktopish/taffybar/taffybar-srid/.gitignore
diff --git a/features/taffybar/taffybar-srid/.vscode/extensions.json b/features/desktopish/taffybar/taffybar-srid/.vscode/extensions.json
similarity index 100%
rename from features/taffybar/taffybar-srid/.vscode/extensions.json
rename to features/desktopish/taffybar/taffybar-srid/.vscode/extensions.json
diff --git a/features/taffybar/taffybar-srid/.vscode/settings.json b/features/desktopish/taffybar/taffybar-srid/.vscode/settings.json
similarity index 100%
rename from features/taffybar/taffybar-srid/.vscode/settings.json
rename to features/desktopish/taffybar/taffybar-srid/.vscode/settings.json
diff --git a/features/taffybar/taffybar-srid/CHANGELOG.md b/features/desktopish/taffybar/taffybar-srid/CHANGELOG.md
similarity index 100%
rename from features/taffybar/taffybar-srid/CHANGELOG.md
rename to features/desktopish/taffybar/taffybar-srid/CHANGELOG.md
diff --git a/features/taffybar/taffybar-srid/Main.hs b/features/desktopish/taffybar/taffybar-srid/Main.hs
similarity index 100%
rename from features/taffybar/taffybar-srid/Main.hs
rename to features/desktopish/taffybar/taffybar-srid/Main.hs
diff --git a/features/taffybar/taffybar-srid/README.md b/features/desktopish/taffybar/taffybar-srid/README.md
similarity index 100%
rename from features/taffybar/taffybar-srid/README.md
rename to features/desktopish/taffybar/taffybar-srid/README.md
diff --git a/features/taffybar/taffybar-srid/Setup.hs b/features/desktopish/taffybar/taffybar-srid/Setup.hs
similarity index 100%
rename from features/taffybar/taffybar-srid/Setup.hs
rename to features/desktopish/taffybar/taffybar-srid/Setup.hs
diff --git a/features/taffybar/taffybar-srid/bin/run b/features/desktopish/taffybar/taffybar-srid/bin/run
similarity index 100%
rename from features/taffybar/taffybar-srid/bin/run
rename to features/desktopish/taffybar/taffybar-srid/bin/run
diff --git a/features/taffybar/taffybar-srid/default.nix b/features/desktopish/taffybar/taffybar-srid/default.nix
similarity index 100%
rename from features/taffybar/taffybar-srid/default.nix
rename to features/desktopish/taffybar/taffybar-srid/default.nix
diff --git a/features/taffybar/taffybar-srid/dep/gitignoresrc/default.nix b/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix
similarity index 100%
rename from features/taffybar/taffybar-srid/dep/gitignoresrc/default.nix
rename to features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/default.nix
diff --git a/features/taffybar/taffybar-srid/dep/gitignoresrc/github.json b/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/github.json
similarity index 100%
rename from features/taffybar/taffybar-srid/dep/gitignoresrc/github.json
rename to features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/github.json
diff --git a/features/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix b/features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix
similarity index 100%
rename from features/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix
rename to features/desktopish/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix
diff --git a/features/taffybar/taffybar-srid/dep/taffybar/default.nix b/features/desktopish/taffybar/taffybar-srid/dep/taffybar/default.nix
similarity index 100%
rename from features/taffybar/taffybar-srid/dep/taffybar/default.nix
rename to features/desktopish/taffybar/taffybar-srid/dep/taffybar/default.nix
diff --git a/features/taffybar/taffybar-srid/dep/taffybar/github.json b/features/desktopish/taffybar/taffybar-srid/dep/taffybar/github.json
similarity index 100%
rename from features/taffybar/taffybar-srid/dep/taffybar/github.json
rename to features/desktopish/taffybar/taffybar-srid/dep/taffybar/github.json
diff --git a/features/taffybar/taffybar-srid/dep/taffybar/thunk.nix b/features/desktopish/taffybar/taffybar-srid/dep/taffybar/thunk.nix
similarity index 100%
rename from features/taffybar/taffybar-srid/dep/taffybar/thunk.nix
rename to features/desktopish/taffybar/taffybar-srid/dep/taffybar/thunk.nix
diff --git a/features/taffybar/taffybar-srid/hie.yaml b/features/desktopish/taffybar/taffybar-srid/hie.yaml
similarity index 100%
rename from features/taffybar/taffybar-srid/hie.yaml
rename to features/desktopish/taffybar/taffybar-srid/hie.yaml
diff --git a/features/taffybar/taffybar-srid/taffybar-srid.cabal b/features/desktopish/taffybar/taffybar-srid/taffybar-srid.cabal
similarity index 100%
rename from features/taffybar/taffybar-srid/taffybar-srid.cabal
rename to features/desktopish/taffybar/taffybar-srid/taffybar-srid.cabal
diff --git a/features/xmonad/default.nix b/features/desktopish/xmonad/default.nix
similarity index 100%
rename from features/xmonad/default.nix
rename to features/desktopish/xmonad/default.nix
diff --git a/features/xmonad/xmonad-srid/.gitignore b/features/desktopish/xmonad/xmonad-srid/.gitignore
similarity index 100%
rename from features/xmonad/xmonad-srid/.gitignore
rename to features/desktopish/xmonad/xmonad-srid/.gitignore
diff --git a/features/xmonad/xmonad-srid/.vscode/extensions.json b/features/desktopish/xmonad/xmonad-srid/.vscode/extensions.json
similarity index 100%
rename from features/xmonad/xmonad-srid/.vscode/extensions.json
rename to features/desktopish/xmonad/xmonad-srid/.vscode/extensions.json
diff --git a/features/xmonad/xmonad-srid/.vscode/settings.json b/features/desktopish/xmonad/xmonad-srid/.vscode/settings.json
similarity index 100%
rename from features/xmonad/xmonad-srid/.vscode/settings.json
rename to features/desktopish/xmonad/xmonad-srid/.vscode/settings.json
diff --git a/features/xmonad/xmonad-srid/CHANGELOG.md b/features/desktopish/xmonad/xmonad-srid/CHANGELOG.md
similarity index 100%
rename from features/xmonad/xmonad-srid/CHANGELOG.md
rename to features/desktopish/xmonad/xmonad-srid/CHANGELOG.md
diff --git a/features/xmonad/xmonad-srid/Main.hs b/features/desktopish/xmonad/xmonad-srid/Main.hs
similarity index 100%
rename from features/xmonad/xmonad-srid/Main.hs
rename to features/desktopish/xmonad/xmonad-srid/Main.hs
diff --git a/features/xmonad/xmonad-srid/README.md b/features/desktopish/xmonad/xmonad-srid/README.md
similarity index 100%
rename from features/xmonad/xmonad-srid/README.md
rename to features/desktopish/xmonad/xmonad-srid/README.md
diff --git a/features/xmonad/xmonad-srid/Setup.hs b/features/desktopish/xmonad/xmonad-srid/Setup.hs
similarity index 100%
rename from features/xmonad/xmonad-srid/Setup.hs
rename to features/desktopish/xmonad/xmonad-srid/Setup.hs
diff --git a/features/xmonad/xmonad-srid/default.nix b/features/desktopish/xmonad/xmonad-srid/default.nix
similarity index 100%
rename from features/xmonad/xmonad-srid/default.nix
rename to features/desktopish/xmonad/xmonad-srid/default.nix
diff --git a/features/xmonad/xmonad-srid/dep/gitignoresrc/default.nix b/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix
similarity index 100%
rename from features/xmonad/xmonad-srid/dep/gitignoresrc/default.nix
rename to features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/default.nix
diff --git a/features/xmonad/xmonad-srid/dep/gitignoresrc/github.json b/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/github.json
similarity index 100%
rename from features/xmonad/xmonad-srid/dep/gitignoresrc/github.json
rename to features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/github.json
diff --git a/features/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix b/features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix
similarity index 100%
rename from features/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix
rename to features/desktopish/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix
diff --git a/features/xmonad/xmonad-srid/hie.yaml b/features/desktopish/xmonad/xmonad-srid/hie.yaml
similarity index 100%
rename from features/xmonad/xmonad-srid/hie.yaml
rename to features/desktopish/xmonad/xmonad-srid/hie.yaml
diff --git a/features/xmonad/xmonad-srid/xmonad-srid.cabal b/features/desktopish/xmonad/xmonad-srid/xmonad-srid.cabal
similarity index 100%
rename from features/xmonad/xmonad-srid/xmonad-srid.cabal
rename to features/desktopish/xmonad/xmonad-srid/xmonad-srid.cabal
diff --git a/flake.nix b/flake.nix
index 33734f6..e7f3416 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,9 +23,7 @@
           # ./features/virtualization.nix
           ./features/email
           ./features/monitor-brightness.nix
-          ./features/xmonad
           ./features/desktopish
-          ./features/taffybar
 
           # HACK: This should really go under ./features/email
           ({