From 138a0d6fb911570786b4efbf68668a4e2d7006b8 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Fri, 8 Sep 2023 11:44:12 +0200
Subject: [PATCH] Clean up config step2

---
 flake.lock                                    | 17 -------------
 flake.nix                                     | 11 +-------
 .../apps/default.nix => common/apps.nix}      | 13 +---------
 modules/{home/apps => common}/gtk.nix         |  6 +----
 modules/{home/apps => common}/kitty.nix       |  2 +-
 modules/dwl/default.nix                       |  6 +++++
 modules/dwl/home.nix                          | 13 ++++------
 modules/home/default.nix                      | 12 ---------
 modules/home/direnv/default.nix               | 13 ----------
 modules/misc/default.nix                      |  7 ------
 .../{home/direnv/cache.sh => misc/direnv.sh}  |  0
 .../{home/git/default.nix => misc/home.nix}   | 25 +++++++++++++++----
 modules/{home => misc}/nvim/default.nix       | 14 +++++------
 modules/{home => misc}/nvim/init.lua          |  0
 modules/{home => misc}/nvim/lazy-lock.json    |  0
 modules/{home => misc}/nvim/lua/.luarc.json   |  0
 .../nvim/lua/plugins/colorscheme.lua          |  0
 .../{home => misc}/nvim/lua/plugins/git.lua   |  0
 .../{home => misc}/nvim/lua/plugins/line.lua  |  0
 .../{home => misc}/nvim/lua/plugins/lsp.lua   |  0
 .../{home => misc}/nvim/lua/plugins/misc.lua  |  0
 .../nvim/lua/plugins/motions.lua              |  0
 .../nvim/lua/plugins/telescope.lua            |  0
 .../{home => misc}/nvim/lua/plugins/tree.lua  |  0
 .../nvim/lua/plugins/treesiter.lua            |  0
 .../{home => misc}/nvim/lua/plugins/ui.lua    |  0
 modules/{home => misc}/nvim/lua/settings.lua  |  0
 .../lua/telescope/_extensions/git_show.lua    |  0
 .../lua/telescope/_extensions/git_status.lua  |  0
 modules/{home => misc}/zsh/custom.zsh         |  0
 modules/{home => misc}/zsh/default.nix        | 17 +++----------
 modules/{home => misc}/zsh/init.zsh           |  0
 modules/{home => misc}/zsh/p10k-tty.zsh       |  0
 modules/{home => misc}/zsh/p10k.zsh           |  0
 34 files changed, 45 insertions(+), 111 deletions(-)
 rename modules/{home/apps/default.nix => common/apps.nix} (93%)
 rename modules/{home/apps => common}/gtk.nix (93%)
 rename modules/{home/apps => common}/kitty.nix (98%)
 delete mode 100644 modules/home/default.nix
 delete mode 100644 modules/home/direnv/default.nix
 rename modules/{home/direnv/cache.sh => misc/direnv.sh} (100%)
 rename modules/{home/git/default.nix => misc/home.nix} (56%)
 rename modules/{home => misc}/nvim/default.nix (81%)
 rename modules/{home => misc}/nvim/init.lua (100%)
 rename modules/{home => misc}/nvim/lazy-lock.json (100%)
 rename modules/{home => misc}/nvim/lua/.luarc.json (100%)
 rename modules/{home => misc}/nvim/lua/plugins/colorscheme.lua (100%)
 rename modules/{home => misc}/nvim/lua/plugins/git.lua (100%)
 rename modules/{home => misc}/nvim/lua/plugins/line.lua (100%)
 rename modules/{home => misc}/nvim/lua/plugins/lsp.lua (100%)
 rename modules/{home => misc}/nvim/lua/plugins/misc.lua (100%)
 rename modules/{home => misc}/nvim/lua/plugins/motions.lua (100%)
 rename modules/{home => misc}/nvim/lua/plugins/telescope.lua (100%)
 rename modules/{home => misc}/nvim/lua/plugins/tree.lua (100%)
 rename modules/{home => misc}/nvim/lua/plugins/treesiter.lua (100%)
 rename modules/{home => misc}/nvim/lua/plugins/ui.lua (100%)
 rename modules/{home => misc}/nvim/lua/settings.lua (100%)
 rename modules/{home => misc}/nvim/lua/telescope/_extensions/git_show.lua (100%)
 rename modules/{home => misc}/nvim/lua/telescope/_extensions/git_status.lua (100%)
 rename modules/{home => misc}/zsh/custom.zsh (100%)
 rename modules/{home => misc}/zsh/default.nix (93%)
 rename modules/{home => misc}/zsh/init.zsh (100%)
 rename modules/{home => misc}/zsh/p10k-tty.zsh (100%)
 rename modules/{home => misc}/zsh/p10k.zsh (100%)

diff --git a/flake.lock b/flake.lock
index e7a9b57..20f9bb5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -109,22 +109,6 @@
         "type": "github"
       }
     },
-    "jq": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1675076157,
-        "narHash": "sha256-YEpywDJMx/Zg/CKYfq+kX2m1rn0SQ5TtmtNIkjV4xHQ=",
-        "owner": "reegnz",
-        "repo": "jq-zsh-plugin",
-        "rev": "e61804e35a593ada9c4d23ee5c957d08974ac382",
-        "type": "github"
-      },
-      "original": {
-        "owner": "reegnz",
-        "repo": "jq-zsh-plugin",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1693377291,
@@ -146,7 +130,6 @@
         "dwl-source": "dwl-source",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
-        "jq": "jq",
         "nixpkgs": "nixpkgs",
         "tuxedo-nixos": "tuxedo-nixos"
       }
diff --git a/flake.nix b/flake.nix
index cd3839d..145498b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,10 +10,6 @@
     impermanence.url = "github:nix-community/impermanence";
     # neovim-nightly.url = "github:nix-community/neovim-nightly-overlay";
     # nur.url = "github:nix-community/NUR";
-    jq = {
-      url = "github:reegnz/jq-zsh-plugin";
-      flake = false;
-    };
     tuxedo-nixos = {
       url = "github:blitz/tuxedo-nixos";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -68,11 +64,6 @@
                 isNormalUser = true;
                 extraGroups = ["wheel" "input" "docker" "audio" "mlocate"];
                 shell = pkgs.zsh;
-                packages = with pkgs; [
-                  git
-                  docker-compose
-                  jq
-                ];
               };
             })
             ./hosts/${hostname}/hardware-configuration.nix
@@ -85,7 +76,7 @@
                 extraSpecialArgs = inputs;
                 users.${user} = {
                   imports = [
-                    ./modules/home
+                    ./modules/misc/home.nix
                     (./modules + "/${de}/home.nix")
                   ];
                 };
diff --git a/modules/home/apps/default.nix b/modules/common/apps.nix
similarity index 93%
rename from modules/home/apps/default.nix
rename to modules/common/apps.nix
index a9d8aa9..2e12a94 100644
--- a/modules/home/apps/default.nix
+++ b/modules/common/apps.nix
@@ -1,5 +1,4 @@
 {
-  inputs,
   lib,
   config,
   pkgs,
@@ -32,8 +31,6 @@ in {
   ];
 
   home.sessionVariables = rec {
-    EDITOR = "nvim";
-    VISUAL = EDITOR;
     TERMINAL = "kitty";
     BROWSER = "google-chrome-stable";
     DEFAULT_BROWSER = BROWSER;
@@ -127,13 +124,5 @@ in {
     pictures = "${config.home.homeDirectory}/stuff";
     publicShare = "${config.home.homeDirectory}/stuff";
   };
-  home.file.".face".source = ../../../face.png;
-
-  xdg.configFile."nixpkgs/config.nix".text =
-''{
-  allowUnfree = true;
-  permittedInsecurePackages = [
-    "nodejs-16.20.2"
-  ];
-}'';
+  home.file.".face".source = ../../face.png;
 }
diff --git a/modules/home/apps/gtk.nix b/modules/common/gtk.nix
similarity index 93%
rename from modules/home/apps/gtk.nix
rename to modules/common/gtk.nix
index 83ad935..477ce11 100644
--- a/modules/home/apps/gtk.nix
+++ b/modules/common/gtk.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: rec {
+{pkgs, ...}: rec {
   gtk = {
     enable = true;
     theme = {
diff --git a/modules/home/apps/kitty.nix b/modules/common/kitty.nix
similarity index 98%
rename from modules/home/apps/kitty.nix
rename to modules/common/kitty.nix
index 94e061e..3960f77 100644
--- a/modules/home/apps/kitty.nix
+++ b/modules/common/kitty.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ pkgs, ... }: {
   programs.kitty = {
     enable = true;
     settings = {
diff --git a/modules/dwl/default.nix b/modules/dwl/default.nix
index 5ba7bc9..e71c296 100644
--- a/modules/dwl/default.nix
+++ b/modules/dwl/default.nix
@@ -21,7 +21,13 @@
   environment.systemPackages = with pkgs; [
     dwl
     ags.packages.x86_64-linux.default
+    wineWowPackages.stable
+    wineWowPackages.waylandFull
+    winetricks
   ];
+  hardware.steam-hardware.enable = true;
+  hardware.opengl.driSupport32Bit = true;
+  services.flatpak.enable = true;
 
   # Those two lines prevent a crash with gdm autologin.
   systemd.services."getty@tty1".enable = false;
diff --git a/modules/dwl/home.nix b/modules/dwl/home.nix
index 741ba4f..2e9b540 100644
--- a/modules/dwl/home.nix
+++ b/modules/dwl/home.nix
@@ -1,10 +1,4 @@
-{
-  pkgs,
-  lib,
-  config,
-  user,
-  ...
-}: let
+{pkgs, ...}: let
   wallpaper = pkgs.writeShellScriptBin "wallpaper" (builtins.readFile ./wallpaper.sh);
   dwlstartup = pkgs.writeShellScriptBin "dwlstartup" (builtins.readFile ./dwlstartup.sh);
   covercolors = pkgs.stdenv.mkDerivation {
@@ -20,7 +14,10 @@
     installPhase = "install -Dm755 ${./ags/covercolors.py} $out/bin/covercolors";
   };
 in {
-  imports = [./rofi];
+  imports = [
+    ./rofi
+    ../common/apps.nix
+  ];
 
   home.packages = with pkgs; [
     alsa-utils
diff --git a/modules/home/default.nix b/modules/home/default.nix
deleted file mode 100644
index 0d26feb..0000000
--- a/modules/home/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  imports = [
-    ./apps
-    ./zsh
-    ./git
-    ./nvim
-    ./direnv
-    ./fcitx5
-  ];
-
-  home.stateVersion = "22.11";
-}
diff --git a/modules/home/direnv/default.nix b/modules/home/direnv/default.nix
deleted file mode 100644
index b633a06..0000000
--- a/modules/home/direnv/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: {
-  programs.direnv.enable = true;
-  programs.direnv.stdlib = builtins.readFile ./cache.sh;
-  programs.direnv.nix-direnv.enable = true;
-  programs.direnv.config = {warn_timeout = "500h";};
-
-  programs.git.ignores = [".envrc"];
-}
diff --git a/modules/misc/default.nix b/modules/misc/default.nix
index 9338da3..d67eabe 100644
--- a/modules/misc/default.nix
+++ b/modules/misc/default.nix
@@ -27,14 +27,7 @@
     enableSSHSupport = true;
   };
 
-  services.flatpak.enable = true;
-
-  hardware.steam-hardware.enable = true;
-  hardware.opengl.driSupport32Bit = true;
   environment.systemPackages = with pkgs; [
-    wineWowPackages.stable
-    wineWowPackages.waylandFull
-    winetricks
     docker-compose
     git
     man-pages
diff --git a/modules/home/direnv/cache.sh b/modules/misc/direnv.sh
similarity index 100%
rename from modules/home/direnv/cache.sh
rename to modules/misc/direnv.sh
diff --git a/modules/home/git/default.nix b/modules/misc/home.nix
similarity index 56%
rename from modules/home/git/default.nix
rename to modules/misc/home.nix
index 81eb1b3..6669720 100644
--- a/modules/home/git/default.nix
+++ b/modules/misc/home.nix
@@ -1,11 +1,17 @@
 {
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+  imports = [
+    ./zsh
+    ./nvim
+  ];
+
+  programs.direnv.enable = true;
+  programs.direnv.stdlib = builtins.readFile ./direnv.sh;
+  programs.direnv.nix-direnv.enable = true;
+  programs.direnv.config = {warn_timeout = "500h";};
+
   programs.git = {
     enable = true;
+    ignores = [".envrc"];
     difftastic = {
       # This breaks telescope's git status and I don't want to debug why
       enable = false;
@@ -27,4 +33,13 @@
     userEmail = "zoe.roux@zoriya.dev";
     userName = "Zoe Roux";
   };
+
+  xdg.configFile."nixpkgs/config.nix".text = ''    {
+      allowUnfree = true;
+      permittedInsecurePackages = [
+        "nodejs-16.20.2"
+      ];
+    }'';
+
+  home.stateVersion = "22.11";
 }
diff --git a/modules/home/nvim/default.nix b/modules/misc/nvim/default.nix
similarity index 81%
rename from modules/home/nvim/default.nix
rename to modules/misc/nvim/default.nix
index f5e177c..cb788cd 100644
--- a/modules/home/nvim/default.nix
+++ b/modules/misc/nvim/default.nix
@@ -1,14 +1,8 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   home.packages = with pkgs; [
     neovim
     #neovim-nightly
   ];
-
   xdg.configFile."nvim/lua".source = ./lua;
   xdg.configFile."nvim/lazy-lock.json".source = ./lazy-lock.json;
   xdg.configFile."nvim/init.lua".text = ''
@@ -17,11 +11,15 @@
 
     ${builtins.readFile ./init.lua}
   '';
-
   programs.zsh.shellAliases = {
     n = "nvim";
     vim = "nvim";
     vi = "nvim";
     v = "nvim";
   };
+
+  home.sessionVariables = rec {
+    EDITOR = "nvim";
+    VISUAL = EDITOR;
+  };
 }
diff --git a/modules/home/nvim/init.lua b/modules/misc/nvim/init.lua
similarity index 100%
rename from modules/home/nvim/init.lua
rename to modules/misc/nvim/init.lua
diff --git a/modules/home/nvim/lazy-lock.json b/modules/misc/nvim/lazy-lock.json
similarity index 100%
rename from modules/home/nvim/lazy-lock.json
rename to modules/misc/nvim/lazy-lock.json
diff --git a/modules/home/nvim/lua/.luarc.json b/modules/misc/nvim/lua/.luarc.json
similarity index 100%
rename from modules/home/nvim/lua/.luarc.json
rename to modules/misc/nvim/lua/.luarc.json
diff --git a/modules/home/nvim/lua/plugins/colorscheme.lua b/modules/misc/nvim/lua/plugins/colorscheme.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/colorscheme.lua
rename to modules/misc/nvim/lua/plugins/colorscheme.lua
diff --git a/modules/home/nvim/lua/plugins/git.lua b/modules/misc/nvim/lua/plugins/git.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/git.lua
rename to modules/misc/nvim/lua/plugins/git.lua
diff --git a/modules/home/nvim/lua/plugins/line.lua b/modules/misc/nvim/lua/plugins/line.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/line.lua
rename to modules/misc/nvim/lua/plugins/line.lua
diff --git a/modules/home/nvim/lua/plugins/lsp.lua b/modules/misc/nvim/lua/plugins/lsp.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/lsp.lua
rename to modules/misc/nvim/lua/plugins/lsp.lua
diff --git a/modules/home/nvim/lua/plugins/misc.lua b/modules/misc/nvim/lua/plugins/misc.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/misc.lua
rename to modules/misc/nvim/lua/plugins/misc.lua
diff --git a/modules/home/nvim/lua/plugins/motions.lua b/modules/misc/nvim/lua/plugins/motions.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/motions.lua
rename to modules/misc/nvim/lua/plugins/motions.lua
diff --git a/modules/home/nvim/lua/plugins/telescope.lua b/modules/misc/nvim/lua/plugins/telescope.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/telescope.lua
rename to modules/misc/nvim/lua/plugins/telescope.lua
diff --git a/modules/home/nvim/lua/plugins/tree.lua b/modules/misc/nvim/lua/plugins/tree.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/tree.lua
rename to modules/misc/nvim/lua/plugins/tree.lua
diff --git a/modules/home/nvim/lua/plugins/treesiter.lua b/modules/misc/nvim/lua/plugins/treesiter.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/treesiter.lua
rename to modules/misc/nvim/lua/plugins/treesiter.lua
diff --git a/modules/home/nvim/lua/plugins/ui.lua b/modules/misc/nvim/lua/plugins/ui.lua
similarity index 100%
rename from modules/home/nvim/lua/plugins/ui.lua
rename to modules/misc/nvim/lua/plugins/ui.lua
diff --git a/modules/home/nvim/lua/settings.lua b/modules/misc/nvim/lua/settings.lua
similarity index 100%
rename from modules/home/nvim/lua/settings.lua
rename to modules/misc/nvim/lua/settings.lua
diff --git a/modules/home/nvim/lua/telescope/_extensions/git_show.lua b/modules/misc/nvim/lua/telescope/_extensions/git_show.lua
similarity index 100%
rename from modules/home/nvim/lua/telescope/_extensions/git_show.lua
rename to modules/misc/nvim/lua/telescope/_extensions/git_show.lua
diff --git a/modules/home/nvim/lua/telescope/_extensions/git_status.lua b/modules/misc/nvim/lua/telescope/_extensions/git_status.lua
similarity index 100%
rename from modules/home/nvim/lua/telescope/_extensions/git_status.lua
rename to modules/misc/nvim/lua/telescope/_extensions/git_status.lua
diff --git a/modules/home/zsh/custom.zsh b/modules/misc/zsh/custom.zsh
similarity index 100%
rename from modules/home/zsh/custom.zsh
rename to modules/misc/zsh/custom.zsh
diff --git a/modules/home/zsh/default.nix b/modules/misc/zsh/default.nix
similarity index 93%
rename from modules/home/zsh/default.nix
rename to modules/misc/zsh/default.nix
index 1065eb6..47825de 100644
--- a/modules/home/zsh/default.nix
+++ b/modules/misc/zsh/default.nix
@@ -1,9 +1,5 @@
 {
   pkgs,
-  zshpkgs,
-  config,
-  lib,
-  jq,
   ...
 }: let
   configThemeNormal = ./p10k.zsh;
@@ -47,9 +43,9 @@ in {
 
   programs.less = {
     enable = true;
-    keys = ''
-      \e quit
-    '';
+    # keys = ''
+    #   \e quit
+    # '';
   };
 
   programs.zsh = {
@@ -83,8 +79,7 @@ in {
       dc = "docker-compose";
       dcd = "docker-compose -f docker-compose.dev.yml";
       op = "xdg-open";
-      wp = "~/.config/hypr/wallpaper.sh";
-      py = "nix-shell -p python3 --command python3";
+      py = "python3 2> /dev/null || nix-shell -p python3 --command python3";
       jctl = "sudo journalctl -n 1000 -fu";
       where = "where -s"; # Follow symlinks
     };
@@ -95,10 +90,6 @@ in {
         src = pkgs.zsh-powerlevel10k;
         file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
       }
-      {
-        name = "jq";
-        src = jq;
-      }
       {
         name = "bd";
         src = pkgs.zsh-bd;
diff --git a/modules/home/zsh/init.zsh b/modules/misc/zsh/init.zsh
similarity index 100%
rename from modules/home/zsh/init.zsh
rename to modules/misc/zsh/init.zsh
diff --git a/modules/home/zsh/p10k-tty.zsh b/modules/misc/zsh/p10k-tty.zsh
similarity index 100%
rename from modules/home/zsh/p10k-tty.zsh
rename to modules/misc/zsh/p10k-tty.zsh
diff --git a/modules/home/zsh/p10k.zsh b/modules/misc/zsh/p10k.zsh
similarity index 100%
rename from modules/home/zsh/p10k.zsh
rename to modules/misc/zsh/p10k.zsh