Move home-manager related files into home directory

2022-08-19 01:54:13 +02:00 · 2022-08-19 01:54:13 +02:00 · 8f68ada082
parent 56a100f0c6
commit 8f68ada082
50 changed files with 8 additions and 11 deletions
--- a/flake.nix
+++ b/flake.nix
@ -98,7 +98,7 @@
        stateVersion = "22.05";
        configuration = {
          imports = [
-            ./home.nix
+            ./home/home.nix
            ./modules
          ];

--- a/home/home.nix
+++ b/home/home.nix
@ -19,7 +19,7 @@ in {
    ./programs/tmux.nix
    ./programs/zsh

-    ./modules
+    ../modules

    inputs.secrets.outputs.nixosModule
  ] ++ optionals graphics [
@ -38,6 +38,7 @@ in {
    ./services/dunst.nix
    ./services/mpd.nix
    ./services/picom.nix
+    ./services/polybar.nix
    ./services/stalonetray.nix
    ./services/sxhkd.nix
  ];
--- a/home/misc/mimetypes.nix
+++ b/home/misc/mimetypes.nix
--- a/home/misc/ssh/hosts/pvv.nix
+++ b/home/misc/ssh/hosts/pvv.nix
--- a/home/packages.nix
+++ b/home/packages.nix
--- a/home/programs/alacritty.nix
+++ b/home/programs/alacritty.nix
--- a/home/programs/comma.nix
+++ b/home/programs/comma.nix
--- a/home/programs/emacs/config.org
+++ b/home/programs/emacs/config.org
--- a/home/programs/emacs/default.nix
+++ b/home/programs/emacs/default.nix
--- a/home/programs/emacs/logo.svg
+++ b/home/programs/emacs/logo.svg
--- a/home/programs/emacs/snippets/emacs-lisp-mode/.yas-compiled-snippets.el
+++ b/home/programs/emacs/snippets/emacs-lisp-mode/.yas-compiled-snippets.el
--- a/home/programs/emacs/snippets/emacs-lisp-mode/lambda.yasnippet
+++ b/home/programs/emacs/snippets/emacs-lisp-mode/lambda.yasnippet
--- a/home/programs/emacs/snippets/latex-mode/.yas-compiled-snippets.el
+++ b/home/programs/emacs/snippets/latex-mode/.yas-compiled-snippets.el
--- a/home/programs/emacs/snippets/latex-mode/excs.yasnippet
+++ b/home/programs/emacs/snippets/latex-mode/excs.yasnippet
--- a/home/programs/emacs/snippets/latex-mode/ntnu-doc.yasnippet
+++ b/home/programs/emacs/snippets/latex-mode/ntnu-doc.yasnippet
--- a/home/programs/emacs/snippets/latex-mode/pic.yasnippet
+++ b/home/programs/emacs/snippets/latex-mode/pic.yasnippet
--- a/home/programs/emacs/snippets/latex-mode/subexcs.yasnippet
+++ b/home/programs/emacs/snippets/latex-mode/subexcs.yasnippet
--- a/home/programs/emacs/snippets/latex-mode/truthtable.yasnippet
+++ b/home/programs/emacs/snippets/latex-mode/truthtable.yasnippet
--- a/home/programs/emacs/snippets/org-mode/.yas-compiled-snippets.el
+++ b/home/programs/emacs/snippets/org-mode/.yas-compiled-snippets.el
--- a/home/programs/emacs/snippets/org-mode/src.yasnippet
+++ b/home/programs/emacs/snippets/org-mode/src.yasnippet
--- a/home/programs/firefox.nix
+++ b/home/programs/firefox.nix
--- a/home/programs/gh.nix
+++ b/home/programs/gh.nix
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
--- a/home/programs/gpg.nix
+++ b/home/programs/gpg.nix
--- a/home/programs/ncmpcpp.nix
+++ b/home/programs/ncmpcpp.nix
--- a/home/programs/neovim.nix
+++ b/home/programs/neovim.nix
--- a/home/programs/newsboat.nix
+++ b/home/programs/newsboat.nix
--- a/home/programs/qutebrowser.nix
+++ b/home/programs/qutebrowser.nix
--- a/home/programs/rofi.nix
+++ b/home/programs/rofi.nix
--- a/home/programs/tmux.nix
+++ b/home/programs/tmux.nix
--- a/home/programs/vscode-extensions/noop-syslog.c
+++ b/home/programs/vscode-extensions/noop-syslog.c
--- a/home/programs/vscode-extensions/vsliveshare.nix
+++ b/home/programs/vscode-extensions/vsliveshare.nix
--- a/home/programs/vscode.nix
+++ b/home/programs/vscode.nix
--- a/home/programs/xmobar/default.nix
+++ b/home/programs/xmobar/default.nix
--- a/home/programs/xmobar/lambda.xpm
+++ b/home/programs/xmobar/lambda.xpm
--- a/home/programs/xmobar/scripts/mpd_status.sh
+++ b/home/programs/xmobar/scripts/mpd_status.sh
--- a/home/programs/xmobar/scripts/volume.py
+++ b/home/programs/xmobar/scripts/volume.py
--- a/home/programs/xmobar/scripts/wireless.sh
+++ b/home/programs/xmobar/scripts/wireless.sh
--- a/home/programs/xmonad/default.nix
+++ b/home/programs/xmonad/default.nix
--- a/home/programs/xmonad/xmonad.org
+++ b/home/programs/xmonad/xmonad.org
--- a/home/programs/zathura.nix
+++ b/home/programs/zathura.nix
--- a/home/programs/zsh/default.nix
+++ b/home/programs/zsh/default.nix
--- a/home/programs/zsh/p10k.zsh
+++ b/home/programs/zsh/p10k.zsh
--- a/home/services/dunst.nix
+++ b/home/services/dunst.nix
--- a/home/services/mpd.nix
+++ b/home/services/mpd.nix
--- a/home/services/picom.nix
+++ b/home/services/picom.nix
--- a/home/services/stalonetray.nix
+++ b/home/services/stalonetray.nix
--- a/home/services/sxhkd.nix
+++ b/home/services/sxhkd.nix
@ -8,10 +8,6 @@
      "super + Escape" = "pkill -USR1 -x sxhkd && ${pkgs.libnotify}/bin/notify-send -t 3000 \"sxhkd configuration reloaded\"";

      # Applications
-      "super + w" = "${pkgs.emacs}/bin/emacs";
-
-      "super + e" = "$FILEBROWSER";
-
      "super + s" = "$BROWSER";

      "super + r" = "${pkgs.rofi}/bin/rofi -show drun";
--- a/home/shellOptions.nix
+++ b/home/shellOptions.nix
--- a/hosts/common.nix
+++ b/hosts/common.nix
@ -203,7 +203,7 @@ in {
    extraSpecialArgs = { inherit inputs; inherit secrets; };

    # TODO: figure out why specialArgs isn't accessible from the root home file.
-    users.h7x4 = import ../home.nix {
+    users.h7x4 = import ../home/home.nix {
      inherit pkgs;
      inherit inputs;
      inherit config;