diff --git a/flake.nix b/flake.nix index a78a600..d382530 100644 --- a/flake.nix +++ b/flake.nix @@ -98,7 +98,7 @@ stateVersion = "22.05"; configuration = { imports = [ - ./home.nix + ./home/home.nix ./modules ]; diff --git a/home.nix b/home/home.nix similarity index 98% rename from home.nix rename to home/home.nix index 3d4de31..20618f9 100644 --- a/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 ]; diff --git a/misc/mimetypes.nix b/home/misc/mimetypes.nix similarity index 100% rename from misc/mimetypes.nix rename to home/misc/mimetypes.nix diff --git a/misc/ssh/hosts/pvv.nix b/home/misc/ssh/hosts/pvv.nix similarity index 100% rename from misc/ssh/hosts/pvv.nix rename to home/misc/ssh/hosts/pvv.nix diff --git a/packages.nix b/home/packages.nix similarity index 100% rename from packages.nix rename to home/packages.nix diff --git a/programs/alacritty.nix b/home/programs/alacritty.nix similarity index 100% rename from programs/alacritty.nix rename to home/programs/alacritty.nix diff --git a/programs/comma.nix b/home/programs/comma.nix similarity index 100% rename from programs/comma.nix rename to home/programs/comma.nix diff --git a/programs/emacs/config.org b/home/programs/emacs/config.org similarity index 100% rename from programs/emacs/config.org rename to home/programs/emacs/config.org diff --git a/programs/emacs/default.nix b/home/programs/emacs/default.nix similarity index 100% rename from programs/emacs/default.nix rename to home/programs/emacs/default.nix diff --git a/programs/emacs/logo.svg b/home/programs/emacs/logo.svg similarity index 100% rename from programs/emacs/logo.svg rename to home/programs/emacs/logo.svg diff --git a/programs/emacs/snippets/emacs-lisp-mode/.yas-compiled-snippets.el b/home/programs/emacs/snippets/emacs-lisp-mode/.yas-compiled-snippets.el similarity index 100% rename from programs/emacs/snippets/emacs-lisp-mode/.yas-compiled-snippets.el rename to home/programs/emacs/snippets/emacs-lisp-mode/.yas-compiled-snippets.el diff --git a/programs/emacs/snippets/emacs-lisp-mode/lambda.yasnippet b/home/programs/emacs/snippets/emacs-lisp-mode/lambda.yasnippet similarity index 100% rename from programs/emacs/snippets/emacs-lisp-mode/lambda.yasnippet rename to home/programs/emacs/snippets/emacs-lisp-mode/lambda.yasnippet diff --git a/programs/emacs/snippets/latex-mode/.yas-compiled-snippets.el b/home/programs/emacs/snippets/latex-mode/.yas-compiled-snippets.el similarity index 100% rename from programs/emacs/snippets/latex-mode/.yas-compiled-snippets.el rename to home/programs/emacs/snippets/latex-mode/.yas-compiled-snippets.el diff --git a/programs/emacs/snippets/latex-mode/excs.yasnippet b/home/programs/emacs/snippets/latex-mode/excs.yasnippet similarity index 100% rename from programs/emacs/snippets/latex-mode/excs.yasnippet rename to home/programs/emacs/snippets/latex-mode/excs.yasnippet diff --git a/programs/emacs/snippets/latex-mode/ntnu-doc.yasnippet b/home/programs/emacs/snippets/latex-mode/ntnu-doc.yasnippet similarity index 100% rename from programs/emacs/snippets/latex-mode/ntnu-doc.yasnippet rename to home/programs/emacs/snippets/latex-mode/ntnu-doc.yasnippet diff --git a/programs/emacs/snippets/latex-mode/pic.yasnippet b/home/programs/emacs/snippets/latex-mode/pic.yasnippet similarity index 100% rename from programs/emacs/snippets/latex-mode/pic.yasnippet rename to home/programs/emacs/snippets/latex-mode/pic.yasnippet diff --git a/programs/emacs/snippets/latex-mode/subexcs.yasnippet b/home/programs/emacs/snippets/latex-mode/subexcs.yasnippet similarity index 100% rename from programs/emacs/snippets/latex-mode/subexcs.yasnippet rename to home/programs/emacs/snippets/latex-mode/subexcs.yasnippet diff --git a/programs/emacs/snippets/latex-mode/truthtable.yasnippet b/home/programs/emacs/snippets/latex-mode/truthtable.yasnippet similarity index 100% rename from programs/emacs/snippets/latex-mode/truthtable.yasnippet rename to home/programs/emacs/snippets/latex-mode/truthtable.yasnippet diff --git a/programs/emacs/snippets/org-mode/.yas-compiled-snippets.el b/home/programs/emacs/snippets/org-mode/.yas-compiled-snippets.el similarity index 100% rename from programs/emacs/snippets/org-mode/.yas-compiled-snippets.el rename to home/programs/emacs/snippets/org-mode/.yas-compiled-snippets.el diff --git a/programs/emacs/snippets/org-mode/src.yasnippet b/home/programs/emacs/snippets/org-mode/src.yasnippet similarity index 100% rename from programs/emacs/snippets/org-mode/src.yasnippet rename to home/programs/emacs/snippets/org-mode/src.yasnippet diff --git a/programs/firefox.nix b/home/programs/firefox.nix similarity index 100% rename from programs/firefox.nix rename to home/programs/firefox.nix diff --git a/programs/gh.nix b/home/programs/gh.nix similarity index 100% rename from programs/gh.nix rename to home/programs/gh.nix diff --git a/programs/git.nix b/home/programs/git.nix similarity index 100% rename from programs/git.nix rename to home/programs/git.nix diff --git a/programs/gpg.nix b/home/programs/gpg.nix similarity index 100% rename from programs/gpg.nix rename to home/programs/gpg.nix diff --git a/programs/ncmpcpp.nix b/home/programs/ncmpcpp.nix similarity index 100% rename from programs/ncmpcpp.nix rename to home/programs/ncmpcpp.nix diff --git a/programs/neovim.nix b/home/programs/neovim.nix similarity index 100% rename from programs/neovim.nix rename to home/programs/neovim.nix diff --git a/programs/newsboat.nix b/home/programs/newsboat.nix similarity index 100% rename from programs/newsboat.nix rename to home/programs/newsboat.nix diff --git a/programs/qutebrowser.nix b/home/programs/qutebrowser.nix similarity index 100% rename from programs/qutebrowser.nix rename to home/programs/qutebrowser.nix diff --git a/programs/rofi.nix b/home/programs/rofi.nix similarity index 100% rename from programs/rofi.nix rename to home/programs/rofi.nix diff --git a/programs/tmux.nix b/home/programs/tmux.nix similarity index 100% rename from programs/tmux.nix rename to home/programs/tmux.nix diff --git a/programs/vscode-extensions/noop-syslog.c b/home/programs/vscode-extensions/noop-syslog.c similarity index 100% rename from programs/vscode-extensions/noop-syslog.c rename to home/programs/vscode-extensions/noop-syslog.c diff --git a/programs/vscode-extensions/vsliveshare.nix b/home/programs/vscode-extensions/vsliveshare.nix similarity index 100% rename from programs/vscode-extensions/vsliveshare.nix rename to home/programs/vscode-extensions/vsliveshare.nix diff --git a/programs/vscode.nix b/home/programs/vscode.nix similarity index 100% rename from programs/vscode.nix rename to home/programs/vscode.nix diff --git a/programs/xmobar/default.nix b/home/programs/xmobar/default.nix similarity index 100% rename from programs/xmobar/default.nix rename to home/programs/xmobar/default.nix diff --git a/programs/xmobar/lambda.xpm b/home/programs/xmobar/lambda.xpm similarity index 100% rename from programs/xmobar/lambda.xpm rename to home/programs/xmobar/lambda.xpm diff --git a/programs/xmobar/scripts/mpd_status.sh b/home/programs/xmobar/scripts/mpd_status.sh similarity index 100% rename from programs/xmobar/scripts/mpd_status.sh rename to home/programs/xmobar/scripts/mpd_status.sh diff --git a/programs/xmobar/scripts/volume.py b/home/programs/xmobar/scripts/volume.py similarity index 100% rename from programs/xmobar/scripts/volume.py rename to home/programs/xmobar/scripts/volume.py diff --git a/programs/xmobar/scripts/wireless.sh b/home/programs/xmobar/scripts/wireless.sh similarity index 100% rename from programs/xmobar/scripts/wireless.sh rename to home/programs/xmobar/scripts/wireless.sh diff --git a/programs/xmonad/default.nix b/home/programs/xmonad/default.nix similarity index 100% rename from programs/xmonad/default.nix rename to home/programs/xmonad/default.nix diff --git a/programs/xmonad/xmonad.org b/home/programs/xmonad/xmonad.org similarity index 100% rename from programs/xmonad/xmonad.org rename to home/programs/xmonad/xmonad.org diff --git a/programs/zathura.nix b/home/programs/zathura.nix similarity index 100% rename from programs/zathura.nix rename to home/programs/zathura.nix diff --git a/programs/zsh/default.nix b/home/programs/zsh/default.nix similarity index 100% rename from programs/zsh/default.nix rename to home/programs/zsh/default.nix diff --git a/programs/zsh/p10k.zsh b/home/programs/zsh/p10k.zsh similarity index 100% rename from programs/zsh/p10k.zsh rename to home/programs/zsh/p10k.zsh diff --git a/services/dunst.nix b/home/services/dunst.nix similarity index 100% rename from services/dunst.nix rename to home/services/dunst.nix diff --git a/services/mpd.nix b/home/services/mpd.nix similarity index 100% rename from services/mpd.nix rename to home/services/mpd.nix diff --git a/services/picom.nix b/home/services/picom.nix similarity index 100% rename from services/picom.nix rename to home/services/picom.nix diff --git a/services/stalonetray.nix b/home/services/stalonetray.nix similarity index 100% rename from services/stalonetray.nix rename to home/services/stalonetray.nix diff --git a/services/sxhkd.nix b/home/services/sxhkd.nix similarity index 94% rename from services/sxhkd.nix rename to home/services/sxhkd.nix index 99aeb2a..95f810a 100644 --- a/services/sxhkd.nix +++ b/home/services/sxhkd.nix @@ -1,17 +1,13 @@ { pkgs, ... }: { services.sxhkd = { - enable = true; - keybindings = { + enable = true; + keybindings = { # make sxhkd reload its configuration files: "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"; @@ -54,7 +50,7 @@ # fcitx5 # "super + {b,n,m}" = "${pkgs.fcitx5}/bin/fcitx5-remote -s {mozc,keyboard-no,keyboard-us}"; - # TODO: fix + # TODO: fix # "super + v" = "${pkgs.rofi}/bin/rofi -modi lpass:$HOME/.scripts/rofi/lpass/rofi-lpass -show lpass"; "super + minus" = "${pkgs.xcalib}/bin/xcalib -invert -alter"; @@ -74,6 +70,6 @@ # é "super + shift + e" = "sleep 0.3; ${pkgs.xdotool}/bin/xdotool key U00E9"; - }; + }; }; } diff --git a/shellOptions.nix b/home/shellOptions.nix similarity index 100% rename from shellOptions.nix rename to home/shellOptions.nix diff --git a/hosts/common.nix b/hosts/common.nix index c295a89..a3f55cc 100644 --- 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;