diff --git a/common/desktop.nix b/common/desktop.nix index 3ae124f..ba84010 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, home-manager, ...}: +{ lib, config, pkgs, ...}: let customPolybar = pkgs.polybar.override { @@ -7,7 +7,6 @@ let }; in { imports = [ - home-manager.nixosModules.default ./main.nix ]; @@ -178,75 +177,6 @@ in { fi ''; - home-manager.users.usr = { - home.stateVersion = "23.05"; - - programs.neovim = { - enable = true; - extraLuaPackages = luaPkgs: with luaPkgs; [ luaexpat ]; - extraPackages = [ pkgs.sqlite ]; - }; - - home.file = { - ".config/bash" = { - source = ../config/bash; - recursive = true; - }; - ".config/bspwm" = { - source = ../config/bspwm; - recursive = true; - }; - ".config/git" = { - source = ../config/git; - recursive = true; - }; - ".config/htop" = { - source = ../config/htop; - recursive = true; - }; - ".config/nvim" = { - source = ../config/nvim; - recursive = true; - }; - ".config/python" = { - source = ../config/python; - recursive = true; - }; - ".config/polybar" = { - source = ../config/polybar; - recursive = true; - }; - ".config/sx" = { - source = ../config/sx; - recursive = true; - }; - ".config/sxhkd" = { - source = ../config/sxhkd; - recursive = true; - }; - ".config/tridactyl" = { - source = ../config/tridactyl; - recursive = true; - }; - ".config/zathura" = { - source = ../config/zathura; - recursive = true; - }; - ".local/share/wallpapers" = { - source = ../wallpapers; - recursive = true; - }; - ".local/share/gnupg" = { - source = ../config/gnupg; - recursive = true; - }; - ".config/emacs" = { - source = ../config/emacs; - recursive = true; - }; - }; - }; - environment.etc = { "profile.local" = { text = "source /home/usr/.config/bash/profile"; diff --git a/common/main.nix b/common/main.nix index 66e69df..fe07f0b 100644 --- a/common/main.nix +++ b/common/main.nix @@ -32,6 +32,5 @@ in { (pkgs.callPackage ../builds/rebuild.nix {}) ]; - system.copySystemConfiguration = true; system.stateVersion = "23.11"; # don't change this, lol } diff --git a/common/testing.nix b/common/testing.nix new file mode 100644 index 0000000..9be1353 --- /dev/null +++ b/common/testing.nix @@ -0,0 +1,5 @@ +{ lib, config, pkgs, home-manager, ...}: + +{ + home + diff --git a/flake.nix b/flake.nix index 4b086cd..d5b2048 100644 --- a/flake.nix +++ b/flake.nix @@ -13,13 +13,18 @@ nixosConfigurations = { virtbox = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = { - home-manager = home-manager; - }; +# specialArgs = inputs; modules = [ ./bootstrap.nix ./boxes/virtbox.nix - ./common/desktop.nix + ./common/desktop.nix + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + + home-manager.users.usr = import ./home/terminal.nix; + } ]; }; }; diff --git a/home.nix b/home.nix deleted file mode 100644 index 42f9299..0000000 --- a/home.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - home.username = "usr"; - home.homeDirectory = lib.mkForce "/home/usr"; - - home.packages = [ - pkgs.htop - ]; - programs.neovim = { - enable = true; - }; - - home.stateVersion = "23.11"; - programs.home-manager.enable = true; -} diff --git a/config/bash/bashrc b/home/bash/bashrc similarity index 100% rename from config/bash/bashrc rename to home/bash/bashrc diff --git a/home/bash/default.nix b/home/bash/default.nix new file mode 100644 index 0000000..b14ca69 --- /dev/null +++ b/home/bash/default.nix @@ -0,0 +1,12 @@ +{ lib, config, pkgs, home, ... }: + +{ + home.file = { + ".config/bash/bashrc" = { + source = ./bashrc; + }; + ".config/bash/profile" = { + source = ./profile; + }; + }; +} diff --git a/config/bash/profile b/home/bash/profile similarity index 100% rename from config/bash/profile rename to home/bash/profile diff --git a/config/bspwm/bspwmrc b/home/bspwm/bspwmrc similarity index 100% rename from config/bspwm/bspwmrc rename to home/bspwm/bspwmrc diff --git a/home/bspwm/default.nix b/home/bspwm/default.nix new file mode 100644 index 0000000..8a2f13c --- /dev/null +++ b/home/bspwm/default.nix @@ -0,0 +1,9 @@ +{ lib, config, pkgs, home, ... }: + +{ + home.file = { + ".config/bspwm/bspwmrc" = { + source = ./bspwmrc; + }; + }; +} diff --git a/config/earth/assets/all-assets.svg b/home/earth/assets/all-assets.svg similarity index 100% rename from config/earth/assets/all-assets.svg rename to home/earth/assets/all-assets.svg diff --git a/config/earth/assets/all-assets.txt b/home/earth/assets/all-assets.txt similarity index 100% rename from config/earth/assets/all-assets.txt rename to home/earth/assets/all-assets.txt diff --git a/config/earth/assets/change_dpi.sh b/home/earth/assets/change_dpi.sh similarity index 100% rename from config/earth/assets/change_dpi.sh rename to home/earth/assets/change_dpi.sh diff --git a/config/earth/assets/checkbox-checked-insensitive.svg b/home/earth/assets/checkbox-checked-insensitive.svg similarity index 100% rename from config/earth/assets/checkbox-checked-insensitive.svg rename to home/earth/assets/checkbox-checked-insensitive.svg diff --git a/config/earth/assets/checkbox-checked.svg b/home/earth/assets/checkbox-checked.svg similarity index 100% rename from config/earth/assets/checkbox-checked.svg rename to home/earth/assets/checkbox-checked.svg diff --git a/config/earth/assets/checkbox-mixed-insensitive.svg b/home/earth/assets/checkbox-mixed-insensitive.svg similarity index 100% rename from config/earth/assets/checkbox-mixed-insensitive.svg rename to home/earth/assets/checkbox-mixed-insensitive.svg diff --git a/config/earth/assets/checkbox-mixed.svg b/home/earth/assets/checkbox-mixed.svg similarity index 100% rename from config/earth/assets/checkbox-mixed.svg rename to home/earth/assets/checkbox-mixed.svg diff --git a/config/earth/assets/grid-selection-checked.svg b/home/earth/assets/grid-selection-checked.svg similarity index 100% rename from config/earth/assets/grid-selection-checked.svg rename to home/earth/assets/grid-selection-checked.svg diff --git a/config/earth/assets/grid-selection-unchecked.svg b/home/earth/assets/grid-selection-unchecked.svg similarity index 100% rename from config/earth/assets/grid-selection-unchecked.svg rename to home/earth/assets/grid-selection-unchecked.svg diff --git a/config/earth/assets/menuitem-checkbox-checked-hover.svg b/home/earth/assets/menuitem-checkbox-checked-hover.svg similarity index 100% rename from config/earth/assets/menuitem-checkbox-checked-hover.svg rename to home/earth/assets/menuitem-checkbox-checked-hover.svg diff --git a/config/earth/assets/menuitem-checkbox-checked-insensitive.svg b/home/earth/assets/menuitem-checkbox-checked-insensitive.svg similarity index 100% rename from config/earth/assets/menuitem-checkbox-checked-insensitive.svg rename to home/earth/assets/menuitem-checkbox-checked-insensitive.svg diff --git a/config/earth/assets/menuitem-checkbox-checked.svg b/home/earth/assets/menuitem-checkbox-checked.svg similarity index 100% rename from config/earth/assets/menuitem-checkbox-checked.svg rename to home/earth/assets/menuitem-checkbox-checked.svg diff --git a/config/earth/assets/menuitem-checkbox-mixed-hover.svg b/home/earth/assets/menuitem-checkbox-mixed-hover.svg similarity index 100% rename from config/earth/assets/menuitem-checkbox-mixed-hover.svg rename to home/earth/assets/menuitem-checkbox-mixed-hover.svg diff --git a/config/earth/assets/menuitem-checkbox-mixed-insensitive.svg b/home/earth/assets/menuitem-checkbox-mixed-insensitive.svg similarity index 100% rename from config/earth/assets/menuitem-checkbox-mixed-insensitive.svg rename to home/earth/assets/menuitem-checkbox-mixed-insensitive.svg diff --git a/config/earth/assets/menuitem-checkbox-mixed-selected.svg b/home/earth/assets/menuitem-checkbox-mixed-selected.svg similarity index 100% rename from config/earth/assets/menuitem-checkbox-mixed-selected.svg rename to home/earth/assets/menuitem-checkbox-mixed-selected.svg diff --git a/config/earth/assets/menuitem-checkbox-mixed.svg b/home/earth/assets/menuitem-checkbox-mixed.svg similarity index 100% rename from config/earth/assets/menuitem-checkbox-mixed.svg rename to home/earth/assets/menuitem-checkbox-mixed.svg diff --git a/config/earth/assets/menuitem-checkbox-unchecked.svg b/home/earth/assets/menuitem-checkbox-unchecked.svg similarity index 100% rename from config/earth/assets/menuitem-checkbox-unchecked.svg rename to home/earth/assets/menuitem-checkbox-unchecked.svg diff --git a/config/earth/assets/menuitem-radio-checked-hover.svg b/home/earth/assets/menuitem-radio-checked-hover.svg similarity index 100% rename from config/earth/assets/menuitem-radio-checked-hover.svg rename to home/earth/assets/menuitem-radio-checked-hover.svg diff --git a/config/earth/assets/menuitem-radio-checked-insensitive.svg b/home/earth/assets/menuitem-radio-checked-insensitive.svg similarity index 100% rename from config/earth/assets/menuitem-radio-checked-insensitive.svg rename to home/earth/assets/menuitem-radio-checked-insensitive.svg diff --git a/config/earth/assets/menuitem-radio-checked.svg b/home/earth/assets/menuitem-radio-checked.svg similarity index 100% rename from config/earth/assets/menuitem-radio-checked.svg rename to home/earth/assets/menuitem-radio-checked.svg diff --git a/config/earth/assets/menuitem-radio-mixed-hover.svg b/home/earth/assets/menuitem-radio-mixed-hover.svg similarity index 100% rename from config/earth/assets/menuitem-radio-mixed-hover.svg rename to home/earth/assets/menuitem-radio-mixed-hover.svg diff --git a/config/earth/assets/menuitem-radio-mixed-insensitive.svg b/home/earth/assets/menuitem-radio-mixed-insensitive.svg similarity index 100% rename from config/earth/assets/menuitem-radio-mixed-insensitive.svg rename to home/earth/assets/menuitem-radio-mixed-insensitive.svg diff --git a/config/earth/assets/menuitem-radio-mixed-selected.svg b/home/earth/assets/menuitem-radio-mixed-selected.svg similarity index 100% rename from config/earth/assets/menuitem-radio-mixed-selected.svg rename to home/earth/assets/menuitem-radio-mixed-selected.svg diff --git a/config/earth/assets/menuitem-radio-mixed.svg b/home/earth/assets/menuitem-radio-mixed.svg similarity index 100% rename from config/earth/assets/menuitem-radio-mixed.svg rename to home/earth/assets/menuitem-radio-mixed.svg diff --git a/config/earth/assets/menuitem-radio-unchecked.svg b/home/earth/assets/menuitem-radio-unchecked.svg similarity index 100% rename from config/earth/assets/menuitem-radio-unchecked.svg rename to home/earth/assets/menuitem-radio-unchecked.svg diff --git a/config/earth/assets/pane-handle-vertical.svg b/home/earth/assets/pane-handle-vertical.svg similarity index 100% rename from config/earth/assets/pane-handle-vertical.svg rename to home/earth/assets/pane-handle-vertical.svg diff --git a/config/earth/assets/pane-handle.png b/home/earth/assets/pane-handle.png similarity index 100% rename from config/earth/assets/pane-handle.png rename to home/earth/assets/pane-handle.png diff --git a/config/earth/assets/pane-handle.svg b/home/earth/assets/pane-handle.svg similarity index 100% rename from config/earth/assets/pane-handle.svg rename to home/earth/assets/pane-handle.svg diff --git a/config/earth/assets/pane-handle@2.png b/home/earth/assets/pane-handle@2.png similarity index 100% rename from config/earth/assets/pane-handle@2.png rename to home/earth/assets/pane-handle@2.png diff --git a/config/earth/assets/radio-checked-insensitive.svg b/home/earth/assets/radio-checked-insensitive.svg similarity index 100% rename from config/earth/assets/radio-checked-insensitive.svg rename to home/earth/assets/radio-checked-insensitive.svg diff --git a/config/earth/assets/radio-checked.svg b/home/earth/assets/radio-checked.svg similarity index 100% rename from config/earth/assets/radio-checked.svg rename to home/earth/assets/radio-checked.svg diff --git a/config/earth/assets/radio-mixed-insensitive.svg b/home/earth/assets/radio-mixed-insensitive.svg similarity index 100% rename from config/earth/assets/radio-mixed-insensitive.svg rename to home/earth/assets/radio-mixed-insensitive.svg diff --git a/config/earth/assets/radio-mixed.svg b/home/earth/assets/radio-mixed.svg similarity index 100% rename from config/earth/assets/radio-mixed.svg rename to home/earth/assets/radio-mixed.svg diff --git a/config/earth/assets/radio-selected-insensitive.svg b/home/earth/assets/radio-selected-insensitive.svg similarity index 100% rename from config/earth/assets/radio-selected-insensitive.svg rename to home/earth/assets/radio-selected-insensitive.svg diff --git a/config/earth/assets/radio-selected.svg b/home/earth/assets/radio-selected.svg similarity index 100% rename from config/earth/assets/radio-selected.svg rename to home/earth/assets/radio-selected.svg diff --git a/config/earth/assets/radio-unselected-insensitive.svg b/home/earth/assets/radio-unselected-insensitive.svg similarity index 100% rename from config/earth/assets/radio-unselected-insensitive.svg rename to home/earth/assets/radio-unselected-insensitive.svg diff --git a/config/earth/assets/radio-unselected.svg b/home/earth/assets/radio-unselected.svg similarity index 100% rename from config/earth/assets/radio-unselected.svg rename to home/earth/assets/radio-unselected.svg diff --git a/config/earth/assets/sed.sh b/home/earth/assets/sed.sh similarity index 100% rename from config/earth/assets/sed.sh rename to home/earth/assets/sed.sh diff --git a/config/earth/assets/unsed.sh b/home/earth/assets/unsed.sh similarity index 100% rename from config/earth/assets/unsed.sh rename to home/earth/assets/unsed.sh diff --git a/config/earth/gtk-2.0/gtkrc b/home/earth/gtk-2.0/gtkrc similarity index 100% rename from config/earth/gtk-2.0/gtkrc rename to home/earth/gtk-2.0/gtkrc diff --git a/config/earth/gtk-2.0/gtkrc.hidpi b/home/earth/gtk-2.0/gtkrc.hidpi similarity index 100% rename from config/earth/gtk-2.0/gtkrc.hidpi rename to home/earth/gtk-2.0/gtkrc.hidpi diff --git a/config/earth/gtk-3.0/assets/all-assets.svg b/home/earth/gtk-3.0/assets/all-assets.svg similarity index 100% rename from config/earth/gtk-3.0/assets/all-assets.svg rename to home/earth/gtk-3.0/assets/all-assets.svg diff --git a/config/earth/gtk-3.0/assets/all-assets.txt b/home/earth/gtk-3.0/assets/all-assets.txt similarity index 100% rename from config/earth/gtk-3.0/assets/all-assets.txt rename to home/earth/gtk-3.0/assets/all-assets.txt diff --git a/config/earth/gtk-3.0/assets/change_dpi.sh b/home/earth/gtk-3.0/assets/change_dpi.sh similarity index 100% rename from config/earth/gtk-3.0/assets/change_dpi.sh rename to home/earth/gtk-3.0/assets/change_dpi.sh diff --git a/config/earth/gtk-3.0/assets/checkbox-checked-dark.svg b/home/earth/gtk-3.0/assets/checkbox-checked-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/checkbox-checked-dark.svg rename to home/earth/gtk-3.0/assets/checkbox-checked-dark.svg diff --git a/config/earth/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg b/home/earth/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg rename to home/earth/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg diff --git a/config/earth/gtk-3.0/assets/checkbox-checked-insensitive.svg b/home/earth/gtk-3.0/assets/checkbox-checked-insensitive.svg similarity index 100% rename from config/earth/gtk-3.0/assets/checkbox-checked-insensitive.svg rename to home/earth/gtk-3.0/assets/checkbox-checked-insensitive.svg diff --git a/config/earth/gtk-3.0/assets/checkbox-checked.svg b/home/earth/gtk-3.0/assets/checkbox-checked.svg similarity index 100% rename from config/earth/gtk-3.0/assets/checkbox-checked.svg rename to home/earth/gtk-3.0/assets/checkbox-checked.svg diff --git a/config/earth/gtk-3.0/assets/checkbox-mixed-dark.svg b/home/earth/gtk-3.0/assets/checkbox-mixed-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/checkbox-mixed-dark.svg rename to home/earth/gtk-3.0/assets/checkbox-mixed-dark.svg diff --git a/config/earth/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg b/home/earth/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg rename to home/earth/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg diff --git a/config/earth/gtk-3.0/assets/checkbox-mixed-insensitive.svg b/home/earth/gtk-3.0/assets/checkbox-mixed-insensitive.svg similarity index 100% rename from config/earth/gtk-3.0/assets/checkbox-mixed-insensitive.svg rename to home/earth/gtk-3.0/assets/checkbox-mixed-insensitive.svg diff --git a/config/earth/gtk-3.0/assets/checkbox-mixed.svg b/home/earth/gtk-3.0/assets/checkbox-mixed.svg similarity index 100% rename from config/earth/gtk-3.0/assets/checkbox-mixed.svg rename to home/earth/gtk-3.0/assets/checkbox-mixed.svg diff --git a/config/earth/gtk-3.0/assets/checkbox-unchecked-dark.svg b/home/earth/gtk-3.0/assets/checkbox-unchecked-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/checkbox-unchecked-dark.svg rename to home/earth/gtk-3.0/assets/checkbox-unchecked-dark.svg diff --git a/config/earth/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg b/home/earth/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg rename to home/earth/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg diff --git a/config/earth/gtk-3.0/assets/checkbox-unchecked-insensitive.svg b/home/earth/gtk-3.0/assets/checkbox-unchecked-insensitive.svg similarity index 100% rename from config/earth/gtk-3.0/assets/checkbox-unchecked-insensitive.svg rename to home/earth/gtk-3.0/assets/checkbox-unchecked-insensitive.svg diff --git a/config/earth/gtk-3.0/assets/checkbox-unchecked.svg b/home/earth/gtk-3.0/assets/checkbox-unchecked.svg similarity index 100% rename from config/earth/gtk-3.0/assets/checkbox-unchecked.svg rename to home/earth/gtk-3.0/assets/checkbox-unchecked.svg diff --git a/config/earth/gtk-3.0/assets/grid-selection-checked-dark.svg b/home/earth/gtk-3.0/assets/grid-selection-checked-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/grid-selection-checked-dark.svg rename to home/earth/gtk-3.0/assets/grid-selection-checked-dark.svg diff --git a/config/earth/gtk-3.0/assets/grid-selection-checked.svg b/home/earth/gtk-3.0/assets/grid-selection-checked.svg similarity index 100% rename from config/earth/gtk-3.0/assets/grid-selection-checked.svg rename to home/earth/gtk-3.0/assets/grid-selection-checked.svg diff --git a/config/earth/gtk-3.0/assets/grid-selection-unchecked-dark.svg b/home/earth/gtk-3.0/assets/grid-selection-unchecked-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/grid-selection-unchecked-dark.svg rename to home/earth/gtk-3.0/assets/grid-selection-unchecked-dark.svg diff --git a/config/earth/gtk-3.0/assets/grid-selection-unchecked.svg b/home/earth/gtk-3.0/assets/grid-selection-unchecked.svg similarity index 100% rename from config/earth/gtk-3.0/assets/grid-selection-unchecked.svg rename to home/earth/gtk-3.0/assets/grid-selection-unchecked.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg b/home/earth/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg rename to home/earth/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/home/earth/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg rename to home/earth/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-checkbox-checked.svg b/home/earth/gtk-3.0/assets/menuitem-checkbox-checked.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-checkbox-checked.svg rename to home/earth/gtk-3.0/assets/menuitem-checkbox-checked.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg b/home/earth/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg rename to home/earth/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/home/earth/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg rename to home/earth/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/home/earth/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg rename to home/earth/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/home/earth/gtk-3.0/assets/menuitem-checkbox-mixed.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-checkbox-mixed.svg rename to home/earth/gtk-3.0/assets/menuitem-checkbox-mixed.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-checkbox-unchecked.svg b/home/earth/gtk-3.0/assets/menuitem-checkbox-unchecked.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-checkbox-unchecked.svg rename to home/earth/gtk-3.0/assets/menuitem-checkbox-unchecked.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-radio-checked-hover.svg b/home/earth/gtk-3.0/assets/menuitem-radio-checked-hover.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-radio-checked-hover.svg rename to home/earth/gtk-3.0/assets/menuitem-radio-checked-hover.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/home/earth/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg rename to home/earth/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-radio-checked.svg b/home/earth/gtk-3.0/assets/menuitem-radio-checked.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-radio-checked.svg rename to home/earth/gtk-3.0/assets/menuitem-radio-checked.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-radio-mixed-hover.svg b/home/earth/gtk-3.0/assets/menuitem-radio-mixed-hover.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-radio-mixed-hover.svg rename to home/earth/gtk-3.0/assets/menuitem-radio-mixed-hover.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-radio-mixed-insensitive.svg b/home/earth/gtk-3.0/assets/menuitem-radio-mixed-insensitive.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-radio-mixed-insensitive.svg rename to home/earth/gtk-3.0/assets/menuitem-radio-mixed-insensitive.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-radio-mixed-selected.svg b/home/earth/gtk-3.0/assets/menuitem-radio-mixed-selected.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-radio-mixed-selected.svg rename to home/earth/gtk-3.0/assets/menuitem-radio-mixed-selected.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-radio-mixed.svg b/home/earth/gtk-3.0/assets/menuitem-radio-mixed.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-radio-mixed.svg rename to home/earth/gtk-3.0/assets/menuitem-radio-mixed.svg diff --git a/config/earth/gtk-3.0/assets/menuitem-radio-unchecked.svg b/home/earth/gtk-3.0/assets/menuitem-radio-unchecked.svg similarity index 100% rename from config/earth/gtk-3.0/assets/menuitem-radio-unchecked.svg rename to home/earth/gtk-3.0/assets/menuitem-radio-unchecked.svg diff --git a/config/earth/gtk-3.0/assets/pane-handle-vertical.svg b/home/earth/gtk-3.0/assets/pane-handle-vertical.svg similarity index 100% rename from config/earth/gtk-3.0/assets/pane-handle-vertical.svg rename to home/earth/gtk-3.0/assets/pane-handle-vertical.svg diff --git a/config/earth/gtk-3.0/assets/pane-handle.png b/home/earth/gtk-3.0/assets/pane-handle.png similarity index 100% rename from config/earth/gtk-3.0/assets/pane-handle.png rename to home/earth/gtk-3.0/assets/pane-handle.png diff --git a/config/earth/gtk-3.0/assets/pane-handle.svg b/home/earth/gtk-3.0/assets/pane-handle.svg similarity index 100% rename from config/earth/gtk-3.0/assets/pane-handle.svg rename to home/earth/gtk-3.0/assets/pane-handle.svg diff --git a/config/earth/gtk-3.0/assets/pane-handle@2.png b/home/earth/gtk-3.0/assets/pane-handle@2.png similarity index 100% rename from config/earth/gtk-3.0/assets/pane-handle@2.png rename to home/earth/gtk-3.0/assets/pane-handle@2.png diff --git a/config/earth/gtk-3.0/assets/radio-checked-dark.svg b/home/earth/gtk-3.0/assets/radio-checked-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-checked-dark.svg rename to home/earth/gtk-3.0/assets/radio-checked-dark.svg diff --git a/config/earth/gtk-3.0/assets/radio-checked-insensitive-dark.svg b/home/earth/gtk-3.0/assets/radio-checked-insensitive-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-checked-insensitive-dark.svg rename to home/earth/gtk-3.0/assets/radio-checked-insensitive-dark.svg diff --git a/config/earth/gtk-3.0/assets/radio-checked-insensitive.svg b/home/earth/gtk-3.0/assets/radio-checked-insensitive.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-checked-insensitive.svg rename to home/earth/gtk-3.0/assets/radio-checked-insensitive.svg diff --git a/config/earth/gtk-3.0/assets/radio-checked.svg b/home/earth/gtk-3.0/assets/radio-checked.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-checked.svg rename to home/earth/gtk-3.0/assets/radio-checked.svg diff --git a/config/earth/gtk-3.0/assets/radio-mixed-dark.svg b/home/earth/gtk-3.0/assets/radio-mixed-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-mixed-dark.svg rename to home/earth/gtk-3.0/assets/radio-mixed-dark.svg diff --git a/config/earth/gtk-3.0/assets/radio-mixed-insensitive-dark.svg b/home/earth/gtk-3.0/assets/radio-mixed-insensitive-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-mixed-insensitive-dark.svg rename to home/earth/gtk-3.0/assets/radio-mixed-insensitive-dark.svg diff --git a/config/earth/gtk-3.0/assets/radio-mixed-insensitive.svg b/home/earth/gtk-3.0/assets/radio-mixed-insensitive.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-mixed-insensitive.svg rename to home/earth/gtk-3.0/assets/radio-mixed-insensitive.svg diff --git a/config/earth/gtk-3.0/assets/radio-mixed.svg b/home/earth/gtk-3.0/assets/radio-mixed.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-mixed.svg rename to home/earth/gtk-3.0/assets/radio-mixed.svg diff --git a/config/earth/gtk-3.0/assets/radio-selected-insensitive.svg b/home/earth/gtk-3.0/assets/radio-selected-insensitive.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-selected-insensitive.svg rename to home/earth/gtk-3.0/assets/radio-selected-insensitive.svg diff --git a/config/earth/gtk-3.0/assets/radio-selected.svg b/home/earth/gtk-3.0/assets/radio-selected.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-selected.svg rename to home/earth/gtk-3.0/assets/radio-selected.svg diff --git a/config/earth/gtk-3.0/assets/radio-unchecked-dark.svg b/home/earth/gtk-3.0/assets/radio-unchecked-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-unchecked-dark.svg rename to home/earth/gtk-3.0/assets/radio-unchecked-dark.svg diff --git a/config/earth/gtk-3.0/assets/radio-unchecked-insensitive-dark.svg b/home/earth/gtk-3.0/assets/radio-unchecked-insensitive-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-unchecked-insensitive-dark.svg rename to home/earth/gtk-3.0/assets/radio-unchecked-insensitive-dark.svg diff --git a/config/earth/gtk-3.0/assets/radio-unchecked-insensitive.svg b/home/earth/gtk-3.0/assets/radio-unchecked-insensitive.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-unchecked-insensitive.svg rename to home/earth/gtk-3.0/assets/radio-unchecked-insensitive.svg diff --git a/config/earth/gtk-3.0/assets/radio-unchecked.svg b/home/earth/gtk-3.0/assets/radio-unchecked.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-unchecked.svg rename to home/earth/gtk-3.0/assets/radio-unchecked.svg diff --git a/config/earth/gtk-3.0/assets/radio-unselected-dark.svg b/home/earth/gtk-3.0/assets/radio-unselected-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-unselected-dark.svg rename to home/earth/gtk-3.0/assets/radio-unselected-dark.svg diff --git a/config/earth/gtk-3.0/assets/radio-unselected-insensitive-dark.svg b/home/earth/gtk-3.0/assets/radio-unselected-insensitive-dark.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-unselected-insensitive-dark.svg rename to home/earth/gtk-3.0/assets/radio-unselected-insensitive-dark.svg diff --git a/config/earth/gtk-3.0/assets/radio-unselected-insensitive.svg b/home/earth/gtk-3.0/assets/radio-unselected-insensitive.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-unselected-insensitive.svg rename to home/earth/gtk-3.0/assets/radio-unselected-insensitive.svg diff --git a/config/earth/gtk-3.0/assets/radio-unselected.svg b/home/earth/gtk-3.0/assets/radio-unselected.svg similarity index 100% rename from config/earth/gtk-3.0/assets/radio-unselected.svg rename to home/earth/gtk-3.0/assets/radio-unselected.svg diff --git a/config/earth/gtk-3.0/assets/sed.sh b/home/earth/gtk-3.0/assets/sed.sh similarity index 100% rename from config/earth/gtk-3.0/assets/sed.sh rename to home/earth/gtk-3.0/assets/sed.sh diff --git a/config/earth/gtk-3.0/assets/unsed.sh b/home/earth/gtk-3.0/assets/unsed.sh similarity index 100% rename from config/earth/gtk-3.0/assets/unsed.sh rename to home/earth/gtk-3.0/assets/unsed.sh diff --git a/config/earth/gtk-3.0/gtk-dark.css b/home/earth/gtk-3.0/gtk-dark.css similarity index 100% rename from config/earth/gtk-3.0/gtk-dark.css rename to home/earth/gtk-3.0/gtk-dark.css diff --git a/config/earth/gtk-3.0/gtk.css b/home/earth/gtk-3.0/gtk.css similarity index 100% rename from config/earth/gtk-3.0/gtk.css rename to home/earth/gtk-3.0/gtk.css diff --git a/config/earth/gtk-3.0/gtk.gresource.xml b/home/earth/gtk-3.0/gtk.gresource.xml similarity index 100% rename from config/earth/gtk-3.0/gtk.gresource.xml rename to home/earth/gtk-3.0/gtk.gresource.xml diff --git a/config/earth/gtk-3.0/thumbnail.png b/home/earth/gtk-3.0/thumbnail.png similarity index 100% rename from config/earth/gtk-3.0/thumbnail.png rename to home/earth/gtk-3.0/thumbnail.png diff --git a/config/earth/gtk-3.20/assets b/home/earth/gtk-3.20/assets similarity index 100% rename from config/earth/gtk-3.20/assets rename to home/earth/gtk-3.20/assets diff --git a/config/earth/gtk-3.20/dist/gtk-dark.css b/home/earth/gtk-3.20/dist/gtk-dark.css similarity index 100% rename from config/earth/gtk-3.20/dist/gtk-dark.css rename to home/earth/gtk-3.20/dist/gtk-dark.css diff --git a/config/earth/gtk-3.20/dist/gtk.css b/home/earth/gtk-3.20/dist/gtk.css similarity index 100% rename from config/earth/gtk-3.20/dist/gtk.css rename to home/earth/gtk-3.20/dist/gtk.css diff --git a/config/earth/gtk-3.20/gtk-dark.css b/home/earth/gtk-3.20/gtk-dark.css similarity index 100% rename from config/earth/gtk-3.20/gtk-dark.css rename to home/earth/gtk-3.20/gtk-dark.css diff --git a/config/earth/gtk-3.20/gtk.css b/home/earth/gtk-3.20/gtk.css similarity index 100% rename from config/earth/gtk-3.20/gtk.css rename to home/earth/gtk-3.20/gtk.css diff --git a/config/earth/gtk-3.20/gtk.gresource b/home/earth/gtk-3.20/gtk.gresource similarity index 100% rename from config/earth/gtk-3.20/gtk.gresource rename to home/earth/gtk-3.20/gtk.gresource diff --git a/config/earth/gtk-3.20/gtk.gresource.xml b/home/earth/gtk-3.20/gtk.gresource.xml similarity index 100% rename from config/earth/gtk-3.20/gtk.gresource.xml rename to home/earth/gtk-3.20/gtk.gresource.xml diff --git a/config/earth/gtk-3.20/thumbnail.png b/home/earth/gtk-3.20/thumbnail.png similarity index 100% rename from config/earth/gtk-3.20/thumbnail.png rename to home/earth/gtk-3.20/thumbnail.png diff --git a/config/earth/index.theme b/home/earth/index.theme similarity index 100% rename from config/earth/index.theme rename to home/earth/index.theme diff --git a/config/earth/metacity-1/metacity-theme-2.xml b/home/earth/metacity-1/metacity-theme-2.xml similarity index 100% rename from config/earth/metacity-1/metacity-theme-2.xml rename to home/earth/metacity-1/metacity-theme-2.xml diff --git a/config/earth/metacity-1/metacity-theme-3.xml b/home/earth/metacity-1/metacity-theme-3.xml similarity index 100% rename from config/earth/metacity-1/metacity-theme-3.xml rename to home/earth/metacity-1/metacity-theme-3.xml diff --git a/config/earth/metacity-1/thumbnail.png b/home/earth/metacity-1/thumbnail.png similarity index 100% rename from config/earth/metacity-1/thumbnail.png rename to home/earth/metacity-1/thumbnail.png diff --git a/config/emacs/init.el b/home/emacs/init.el similarity index 100% rename from config/emacs/init.el rename to home/emacs/init.el diff --git a/config/git/config b/home/git/config similarity index 100% rename from config/git/config rename to home/git/config diff --git a/config/gnupg/gpg-agent.conf b/home/gnupg/gpg-agent.conf similarity index 100% rename from config/gnupg/gpg-agent.conf rename to home/gnupg/gpg-agent.conf diff --git a/config/htop/htoprc b/home/htop/htoprc similarity index 100% rename from config/htop/htoprc rename to home/htop/htoprc diff --git a/config/nvim/colors/earth.vim b/home/nvim/colors/earth.vim similarity index 100% rename from config/nvim/colors/earth.vim rename to home/nvim/colors/earth.vim diff --git a/config/nvim/init.lua b/home/nvim/init.lua similarity index 100% rename from config/nvim/init.lua rename to home/nvim/init.lua diff --git a/config/polybar/config.ini b/home/polybar/config.ini similarity index 100% rename from config/polybar/config.ini rename to home/polybar/config.ini diff --git a/config/python/pythonrc.py b/home/python/pythonrc.py similarity index 100% rename from config/python/pythonrc.py rename to home/python/pythonrc.py diff --git a/config/ssh/config b/home/ssh/config similarity index 100% rename from config/ssh/config rename to home/ssh/config diff --git a/config/sx/sxrc b/home/sx/sxrc similarity index 100% rename from config/sx/sxrc rename to home/sx/sxrc diff --git a/config/sxhkd/mouse b/home/sxhkd/mouse similarity index 100% rename from config/sxhkd/mouse rename to home/sxhkd/mouse diff --git a/config/sxhkd/sxhkdrc b/home/sxhkd/sxhkdrc similarity index 100% rename from config/sxhkd/sxhkdrc rename to home/sxhkd/sxhkdrc diff --git a/home/terminal.nix b/home/terminal.nix new file mode 100644 index 0000000..2b11134 --- /dev/null +++ b/home/terminal.nix @@ -0,0 +1,65 @@ +{ lib, config, pkgs, home, ... }: + +{ + imports = [ + ./bash/default.nix + ./bspwm/default.nix + ]; + + home.stateVersion = "23.11"; + + programs.neovim = { + enable = true; + }; + + home.file = { + ".config/git" = { + source = ../config/git; + recursive = true; + }; + ".config/htop" = { + source = ../config/htop; + recursive = true; + }; + ".config/nvim" = { + source = ../config/nvim; + recursive = true; + }; + ".config/python" = { + source = ../config/python; + recursive = true; + }; + ".config/polybar" = { + source = ../config/polybar; + recursive = true; + }; + ".config/sx" = { + source = ../config/sx; + recursive = true; + }; + ".config/sxhkd" = { + source = ../config/sxhkd; + recursive = true; + }; + ".config/tridactyl" = { + source = ../config/tridactyl; + recursive = true; + }; + ".config/zathura" = { + source = ../config/zathura; + recursive = true; + }; + ".local/share/wallpapers" = { + source = ../wallpapers; + recursive = true; + }; + ".local/share/gnupg" = { + source = ../config/gnupg; + recursive = true; + }; + ".config/emacs" = { + source = ../config/emacs; + recursive = true; + }; + }; +} diff --git a/config/tridactyl/tridactylrc b/home/tridactyl/tridactylrc similarity index 100% rename from config/tridactyl/tridactylrc rename to home/tridactyl/tridactylrc diff --git a/config/zathura/zathurarc b/home/zathura/zathurarc similarity index 100% rename from config/zathura/zathurarc rename to home/zathura/zathurarc