diff --git a/docs/TODO.md b/docs/TODO.md index ef97871..d67d4d5 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -1,17 +1,15 @@ # Todolist - [ ] Installation script -- [ ] Compress png docs/src - [ ] Find a new icon theme (White, flat) - [ ] Global font-size config (Alt font size for waybar) -- [ ] Catppuccin theme -- [ ] Windows theme -- [ ] MacOS theme -- [ ] Rice screenshot script +- [ ] Themes + - [ ] Catppuccin theme + - [ ] Windows theme + - [ ] MacOS theme - [ ] Global variable for config location - [ ] Obsidian conditional import - [ ] Make hyprcursor work -- [ ] Remove folder's laptop conf - [ ] Nixvim - [ ] Telescope shortcut for file content - [ ] Markdown snippets diff --git a/home/laptop.nix b/home/laptop.nix index b4e6e2e..80122ce 100644 --- a/home/laptop.nix +++ b/home/laptop.nix @@ -2,9 +2,28 @@ imports = [ ../hosts/laptop/variables.nix - ./system/laptop.nix - ./scripts/laptop.nix - ./programs/laptop.nix + + # Programs + ./programs/btop + ./programs/cava + ./programs/kitty + ./programs/nvim + ./programs/qutebrowser + ./programs/spicetify + + # Scripts + ./scripts # All scripts + + # System + ./system/dunst + ./system/git + ./system/gtk + ./system/hyprland + ./system/shell + ./system/sops/laptop.nix + ./system/waybar + ./system/wlogout + ./system/wofi ]; home = { @@ -57,6 +76,7 @@ neovide ]; + # Import wallpapers into $HOME/wallpapers file."wallpapers" = { recursive = true; source = ./wallpapers; diff --git a/home/programs/laptop.nix b/home/programs/laptop.nix deleted file mode 100644 index 2ab4c52..0000000 --- a/home/programs/laptop.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - imports = - [ ./btop ./kitty ./nvim/laptop.nix ./qutebrowser ./spicetify ./cava ]; -} diff --git a/home/programs/nvim/colorscheme.nix b/home/programs/nvim/colorscheme.nix new file mode 100644 index 0000000..b241767 --- /dev/null +++ b/home/programs/nvim/colorscheme.nix @@ -0,0 +1,9 @@ +{ + programs.nixvim = { + enable = true; + colorschemes.catppuccin = { + enable = true; + settings = { transparent_background = true; }; + }; + }; +} diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix new file mode 100644 index 0000000..7ae9250 --- /dev/null +++ b/home/programs/nvim/default.nix @@ -0,0 +1,30 @@ +{ inputs, ... }: { + imports = [ + inputs.nixvim.homeManagerModules.nixvim + ./plugins/auto-pairs.nix + ./plugins/bufferline.nix + ./plugins/lazygit.nix + ./plugins/telescope.nix + ./plugins/nvim-tree.nix + ./plugins/lightline.nix + ./plugins/git.nix + ./plugins/cmp.nix + ./plugins/none-ls.nix + ./plugins/wilder.nix + ./plugins/lsp.nix + ./plugins/treesitter.nix + ./plugins/toggleterm.nix + ./plugins/copilot.nix + ./plugins/whichkey.nix + ./plugins/alpha.nix + ./plugins/keymaps.nix + ./plugins/comment.nix + ./plugins/oil.nix + ./plugins/trouble.nix + ./plugins/tmux-navigator.nix + ./plugins/noice.nix + ./plugins/obsidian.nix + ./options.nix + ./colorscheme.nix + ]; +} diff --git a/home/programs/nvim/laptop.nix b/home/programs/nvim/laptop.nix deleted file mode 100644 index ed6da64..0000000 --- a/home/programs/nvim/laptop.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ inputs, ... }: { - imports = [ - inputs.nixvim.homeManagerModules.nixvim - ./auto-pairs.nix - ./options.nix - ./bufferline.nix - ./lazygit.nix - ./telescope.nix - ./nvim-tree.nix - ./lightline.nix - ./git.nix - ./cmp.nix - ./none-ls.nix - ./wilder.nix - ./lsp.nix - ./treesitter.nix - ./toggleterm.nix - ./copilot.nix - ./obsidian.nix # make conditional - ./whichkey.nix - ./alpha.nix - ./keymaps.nix - ./comment.nix - ./oil.nix - ./trouble.nix - ./tmux-navigator.nix - ./noice.nix - ]; - - programs.nixvim = { - enable = true; - colorschemes.catppuccin = { - enable = true; - settings = { transparent_background = true; }; - }; - }; - -} diff --git a/home/programs/nvim/alpha.nix b/home/programs/nvim/plugins/alpha.nix similarity index 100% rename from home/programs/nvim/alpha.nix rename to home/programs/nvim/plugins/alpha.nix diff --git a/home/programs/nvim/auto-pairs.nix b/home/programs/nvim/plugins/auto-pairs.nix similarity index 100% rename from home/programs/nvim/auto-pairs.nix rename to home/programs/nvim/plugins/auto-pairs.nix diff --git a/home/programs/nvim/bufferline.nix b/home/programs/nvim/plugins/bufferline.nix similarity index 100% rename from home/programs/nvim/bufferline.nix rename to home/programs/nvim/plugins/bufferline.nix diff --git a/home/programs/nvim/cmp.nix b/home/programs/nvim/plugins/cmp.nix similarity index 100% rename from home/programs/nvim/cmp.nix rename to home/programs/nvim/plugins/cmp.nix diff --git a/home/programs/nvim/comment.nix b/home/programs/nvim/plugins/comment.nix similarity index 100% rename from home/programs/nvim/comment.nix rename to home/programs/nvim/plugins/comment.nix diff --git a/home/programs/nvim/copilot.nix b/home/programs/nvim/plugins/copilot.nix similarity index 100% rename from home/programs/nvim/copilot.nix rename to home/programs/nvim/plugins/copilot.nix diff --git a/home/programs/nvim/git.nix b/home/programs/nvim/plugins/git.nix similarity index 100% rename from home/programs/nvim/git.nix rename to home/programs/nvim/plugins/git.nix diff --git a/home/programs/nvim/keymaps.nix b/home/programs/nvim/plugins/keymaps.nix similarity index 100% rename from home/programs/nvim/keymaps.nix rename to home/programs/nvim/plugins/keymaps.nix diff --git a/home/programs/nvim/lazygit.nix b/home/programs/nvim/plugins/lazygit.nix similarity index 100% rename from home/programs/nvim/lazygit.nix rename to home/programs/nvim/plugins/lazygit.nix diff --git a/home/programs/nvim/lightline.nix b/home/programs/nvim/plugins/lightline.nix similarity index 100% rename from home/programs/nvim/lightline.nix rename to home/programs/nvim/plugins/lightline.nix diff --git a/home/programs/nvim/lsp.nix b/home/programs/nvim/plugins/lsp.nix similarity index 100% rename from home/programs/nvim/lsp.nix rename to home/programs/nvim/plugins/lsp.nix diff --git a/home/programs/nvim/noice.nix b/home/programs/nvim/plugins/noice.nix similarity index 100% rename from home/programs/nvim/noice.nix rename to home/programs/nvim/plugins/noice.nix diff --git a/home/programs/nvim/none-ls.nix b/home/programs/nvim/plugins/none-ls.nix similarity index 100% rename from home/programs/nvim/none-ls.nix rename to home/programs/nvim/plugins/none-ls.nix diff --git a/home/programs/nvim/nvim-tree.nix b/home/programs/nvim/plugins/nvim-tree.nix similarity index 100% rename from home/programs/nvim/nvim-tree.nix rename to home/programs/nvim/plugins/nvim-tree.nix diff --git a/home/programs/nvim/obsidian.nix b/home/programs/nvim/plugins/obsidian.nix similarity index 72% rename from home/programs/nvim/obsidian.nix rename to home/programs/nvim/plugins/obsidian.nix index 458edce..6951a97 100644 --- a/home/programs/nvim/obsidian.nix +++ b/home/programs/nvim/plugins/obsidian.nix @@ -1,6 +1,6 @@ -{ +{ config, ... }: { programs.nixvim.plugins.obsidian = { - enable = true; + enable = config.var.obsidian; settings = { dir = "~/nextcloud/Notes"; disable_frontmatter = true; diff --git a/home/programs/nvim/oil.nix b/home/programs/nvim/plugins/oil.nix similarity index 100% rename from home/programs/nvim/oil.nix rename to home/programs/nvim/plugins/oil.nix diff --git a/home/programs/nvim/telescope.nix b/home/programs/nvim/plugins/telescope.nix similarity index 100% rename from home/programs/nvim/telescope.nix rename to home/programs/nvim/plugins/telescope.nix diff --git a/home/programs/nvim/tmux-navigator.nix b/home/programs/nvim/plugins/tmux-navigator.nix similarity index 100% rename from home/programs/nvim/tmux-navigator.nix rename to home/programs/nvim/plugins/tmux-navigator.nix diff --git a/home/programs/nvim/toggleterm.nix b/home/programs/nvim/plugins/toggleterm.nix similarity index 100% rename from home/programs/nvim/toggleterm.nix rename to home/programs/nvim/plugins/toggleterm.nix diff --git a/home/programs/nvim/treesitter.nix b/home/programs/nvim/plugins/treesitter.nix similarity index 100% rename from home/programs/nvim/treesitter.nix rename to home/programs/nvim/plugins/treesitter.nix diff --git a/home/programs/nvim/trouble.nix b/home/programs/nvim/plugins/trouble.nix similarity index 100% rename from home/programs/nvim/trouble.nix rename to home/programs/nvim/plugins/trouble.nix diff --git a/home/programs/nvim/whichkey.nix b/home/programs/nvim/plugins/whichkey.nix similarity index 100% rename from home/programs/nvim/whichkey.nix rename to home/programs/nvim/plugins/whichkey.nix diff --git a/home/programs/nvim/wilder.nix b/home/programs/nvim/plugins/wilder.nix similarity index 100% rename from home/programs/nvim/wilder.nix rename to home/programs/nvim/plugins/wilder.nix diff --git a/home/scripts/laptop.nix b/home/scripts/default.nix similarity index 100% rename from home/scripts/laptop.nix rename to home/scripts/default.nix diff --git a/home/system/theme/default.nix b/home/system/gtk/default.nix similarity index 100% rename from home/system/theme/default.nix rename to home/system/gtk/default.nix diff --git a/home/system/theme/gtk/gtk-2.0/gtkrc b/home/system/gtk/gtk/gtk-2.0/gtkrc similarity index 100% rename from home/system/theme/gtk/gtk-2.0/gtkrc rename to home/system/gtk/gtk/gtk-2.0/gtkrc diff --git a/home/system/theme/gtk/gtk-2.0/gtkrc.base b/home/system/gtk/gtk/gtk-2.0/gtkrc.base similarity index 100% rename from home/system/theme/gtk/gtk-2.0/gtkrc.base rename to home/system/gtk/gtk/gtk-2.0/gtkrc.base diff --git a/home/system/theme/gtk/gtk-3.0/assets/blank.png b/home/system/gtk/gtk/gtk-3.0/assets/blank.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/blank.png rename to home/system/gtk/gtk/gtk-3.0/assets/blank.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/check-insensitive.png b/home/system/gtk/gtk/gtk-3.0/assets/check-insensitive.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/check-insensitive.png rename to home/system/gtk/gtk/gtk-3.0/assets/check-insensitive.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/check-mixed-insensitive.png b/home/system/gtk/gtk/gtk-3.0/assets/check-mixed-insensitive.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/check-mixed-insensitive.png rename to home/system/gtk/gtk/gtk-3.0/assets/check-mixed-insensitive.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/check-mixed.png b/home/system/gtk/gtk/gtk-3.0/assets/check-mixed.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/check-mixed.png rename to home/system/gtk/gtk/gtk-3.0/assets/check-mixed.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/check.png b/home/system/gtk/gtk/gtk-3.0/assets/check.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/check.png rename to home/system/gtk/gtk/gtk-3.0/assets/check.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/grid-selection-blank.png b/home/system/gtk/gtk/gtk-3.0/assets/grid-selection-blank.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/grid-selection-blank.png rename to home/system/gtk/gtk/gtk-3.0/assets/grid-selection-blank.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/grid-selection.png b/home/system/gtk/gtk/gtk-3.0/assets/grid-selection.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/grid-selection.png rename to home/system/gtk/gtk/gtk-3.0/assets/grid-selection.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/menuitem-checkbox-checked-hover.png b/home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-checked-hover.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/menuitem-checkbox-checked-hover.png rename to home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-checked-hover.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png b/home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png rename to home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/menuitem-checkbox-checked.png b/home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-checked.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/menuitem-checkbox-checked.png rename to home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-checked.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png b/home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png rename to home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png b/home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png rename to home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/menuitem-checkbox-mixed.png b/home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-mixed.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/menuitem-checkbox-mixed.png rename to home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-mixed.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/menuitem-radio-checked-hover.png b/home/system/gtk/gtk/gtk-3.0/assets/menuitem-radio-checked-hover.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/menuitem-radio-checked-hover.png rename to home/system/gtk/gtk/gtk-3.0/assets/menuitem-radio-checked-hover.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/menuitem-radio-checked-insensitive.png b/home/system/gtk/gtk/gtk-3.0/assets/menuitem-radio-checked-insensitive.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/menuitem-radio-checked-insensitive.png rename to home/system/gtk/gtk/gtk-3.0/assets/menuitem-radio-checked-insensitive.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/menuitem-radio-checked.png b/home/system/gtk/gtk/gtk-3.0/assets/menuitem-radio-checked.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/menuitem-radio-checked.png rename to home/system/gtk/gtk/gtk-3.0/assets/menuitem-radio-checked.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/pane-separator-grip-vertical.png b/home/system/gtk/gtk/gtk-3.0/assets/pane-separator-grip-vertical.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/pane-separator-grip-vertical.png rename to home/system/gtk/gtk/gtk-3.0/assets/pane-separator-grip-vertical.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/pane-separator-grip.png b/home/system/gtk/gtk/gtk-3.0/assets/pane-separator-grip.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/pane-separator-grip.png rename to home/system/gtk/gtk/gtk-3.0/assets/pane-separator-grip.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/radio-checked.png b/home/system/gtk/gtk/gtk-3.0/assets/radio-checked.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/radio-checked.png rename to home/system/gtk/gtk/gtk-3.0/assets/radio-checked.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/radio-insensitive.png b/home/system/gtk/gtk/gtk-3.0/assets/radio-insensitive.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/radio-insensitive.png rename to home/system/gtk/gtk/gtk-3.0/assets/radio-insensitive.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/radio-unchecked.png b/home/system/gtk/gtk/gtk-3.0/assets/radio-unchecked.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/radio-unchecked.png rename to home/system/gtk/gtk/gtk-3.0/assets/radio-unchecked.png diff --git a/home/system/theme/gtk/gtk-3.0/assets/radio.png b/home/system/gtk/gtk/gtk-3.0/assets/radio.png similarity index 100% rename from home/system/theme/gtk/gtk-3.0/assets/radio.png rename to home/system/gtk/gtk/gtk-3.0/assets/radio.png diff --git a/home/system/theme/gtk/gtk-3.0/gnome-applications.css b/home/system/gtk/gtk/gtk-3.0/gnome-applications.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/gnome-applications.css rename to home/system/gtk/gtk/gtk-3.0/gnome-applications.css diff --git a/home/system/theme/gtk/gtk-3.0/gtk-widgets-assets.css b/home/system/gtk/gtk/gtk-3.0/gtk-widgets-assets.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/gtk-widgets-assets.css rename to home/system/gtk/gtk/gtk-3.0/gtk-widgets-assets.css diff --git a/home/system/theme/gtk/gtk-3.0/gtk-widgets.css b/home/system/gtk/gtk/gtk-3.0/gtk-widgets.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/gtk-widgets.css rename to home/system/gtk/gtk/gtk-3.0/gtk-widgets.css diff --git a/home/system/theme/gtk/gtk-3.0/gtk.css b/home/system/gtk/gtk/gtk-3.0/gtk.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/gtk.css rename to home/system/gtk/gtk/gtk-3.0/gtk.css diff --git a/home/system/theme/gtk/gtk-3.0/gtk.css.base b/home/system/gtk/gtk/gtk-3.0/gtk.css.base similarity index 100% rename from home/system/theme/gtk/gtk-3.0/gtk.css.base rename to home/system/gtk/gtk/gtk-3.0/gtk.css.base diff --git a/home/system/theme/gtk/gtk-3.0/settings.ini b/home/system/gtk/gtk/gtk-3.0/settings.ini similarity index 100% rename from home/system/theme/gtk/gtk-3.0/settings.ini rename to home/system/gtk/gtk/gtk-3.0/settings.ini diff --git a/home/system/theme/gtk/gtk-3.0/unity.css b/home/system/gtk/gtk/gtk-3.0/unity.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/unity.css rename to home/system/gtk/gtk/gtk-3.0/unity.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/button.css b/home/system/gtk/gtk/gtk-3.0/widgets/button.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/button.css rename to home/system/gtk/gtk/gtk-3.0/widgets/button.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/calendar.css b/home/system/gtk/gtk/gtk-3.0/widgets/calendar.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/calendar.css rename to home/system/gtk/gtk/gtk-3.0/widgets/calendar.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/cell-row.css b/home/system/gtk/gtk/gtk-3.0/widgets/cell-row.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/cell-row.css rename to home/system/gtk/gtk/gtk-3.0/widgets/cell-row.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/check-radio.css b/home/system/gtk/gtk/gtk-3.0/widgets/check-radio.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/check-radio.css rename to home/system/gtk/gtk/gtk-3.0/widgets/check-radio.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/color-chooser.css b/home/system/gtk/gtk/gtk-3.0/widgets/color-chooser.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/color-chooser.css rename to home/system/gtk/gtk/gtk-3.0/widgets/color-chooser.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/column-header.css b/home/system/gtk/gtk/gtk-3.0/widgets/column-header.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/column-header.css rename to home/system/gtk/gtk/gtk-3.0/widgets/column-header.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/combobox.css b/home/system/gtk/gtk/gtk-3.0/widgets/combobox.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/combobox.css rename to home/system/gtk/gtk/gtk-3.0/widgets/combobox.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/csd.css b/home/system/gtk/gtk/gtk-3.0/widgets/csd.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/csd.css rename to home/system/gtk/gtk/gtk-3.0/widgets/csd.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/entry.css b/home/system/gtk/gtk/gtk-3.0/widgets/entry.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/entry.css rename to home/system/gtk/gtk/gtk-3.0/widgets/entry.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/header-bar.css b/home/system/gtk/gtk/gtk-3.0/widgets/header-bar.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/header-bar.css rename to home/system/gtk/gtk/gtk-3.0/widgets/header-bar.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/infobar.css b/home/system/gtk/gtk/gtk-3.0/widgets/infobar.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/infobar.css rename to home/system/gtk/gtk/gtk-3.0/widgets/infobar.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/linked-buttons.css b/home/system/gtk/gtk/gtk-3.0/widgets/linked-buttons.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/linked-buttons.css rename to home/system/gtk/gtk/gtk-3.0/widgets/linked-buttons.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/menu.css b/home/system/gtk/gtk/gtk-3.0/widgets/menu.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/menu.css rename to home/system/gtk/gtk/gtk-3.0/widgets/menu.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/notebook.css b/home/system/gtk/gtk/gtk-3.0/widgets/notebook.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/notebook.css rename to home/system/gtk/gtk/gtk-3.0/widgets/notebook.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/osd.css b/home/system/gtk/gtk/gtk-3.0/widgets/osd.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/osd.css rename to home/system/gtk/gtk/gtk-3.0/widgets/osd.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/progress-scale.css b/home/system/gtk/gtk/gtk-3.0/widgets/progress-scale.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/progress-scale.css rename to home/system/gtk/gtk/gtk-3.0/widgets/progress-scale.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/scrollbar.css b/home/system/gtk/gtk/gtk-3.0/widgets/scrollbar.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/scrollbar.css rename to home/system/gtk/gtk/gtk-3.0/widgets/scrollbar.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/selection-mode.css b/home/system/gtk/gtk/gtk-3.0/widgets/selection-mode.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/selection-mode.css rename to home/system/gtk/gtk/gtk-3.0/widgets/selection-mode.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/separator.css b/home/system/gtk/gtk/gtk-3.0/widgets/separator.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/separator.css rename to home/system/gtk/gtk/gtk-3.0/widgets/separator.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/sidebar.css b/home/system/gtk/gtk/gtk-3.0/widgets/sidebar.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/sidebar.css rename to home/system/gtk/gtk/gtk-3.0/widgets/sidebar.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/spinbutton.css b/home/system/gtk/gtk/gtk-3.0/widgets/spinbutton.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/spinbutton.css rename to home/system/gtk/gtk/gtk-3.0/widgets/spinbutton.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/spinner.css b/home/system/gtk/gtk/gtk-3.0/widgets/spinner.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/spinner.css rename to home/system/gtk/gtk/gtk-3.0/widgets/spinner.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/switch.css b/home/system/gtk/gtk/gtk-3.0/widgets/switch.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/switch.css rename to home/system/gtk/gtk/gtk-3.0/widgets/switch.css diff --git a/home/system/theme/gtk/gtk-3.0/widgets/toolbar.css b/home/system/gtk/gtk/gtk-3.0/widgets/toolbar.css similarity index 100% rename from home/system/theme/gtk/gtk-3.0/widgets/toolbar.css rename to home/system/gtk/gtk/gtk-3.0/widgets/toolbar.css diff --git a/home/system/theme/gtk/gtk-3.20/assets/blank.png b/home/system/gtk/gtk/gtk-3.20/assets/blank.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/blank.png rename to home/system/gtk/gtk/gtk-3.20/assets/blank.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/bullet-disabled.png b/home/system/gtk/gtk/gtk-3.20/assets/bullet-disabled.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/bullet-disabled.png rename to home/system/gtk/gtk/gtk-3.20/assets/bullet-disabled.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/bullet.png b/home/system/gtk/gtk/gtk-3.20/assets/bullet.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/bullet.png rename to home/system/gtk/gtk/gtk-3.20/assets/bullet.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/check-disabled.png b/home/system/gtk/gtk/gtk-3.20/assets/check-disabled.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/check-disabled.png rename to home/system/gtk/gtk/gtk-3.20/assets/check-disabled.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/check.png b/home/system/gtk/gtk/gtk-3.20/assets/check.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/check.png rename to home/system/gtk/gtk/gtk-3.20/assets/check.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/dash-disabled.png b/home/system/gtk/gtk/gtk-3.20/assets/dash-disabled.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/dash-disabled.png rename to home/system/gtk/gtk/gtk-3.20/assets/dash-disabled.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/dash.png b/home/system/gtk/gtk/gtk-3.20/assets/dash.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/dash.png rename to home/system/gtk/gtk/gtk-3.20/assets/dash.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/grid-selection-blank.png b/home/system/gtk/gtk/gtk-3.20/assets/grid-selection-blank.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/grid-selection-blank.png rename to home/system/gtk/gtk/gtk-3.20/assets/grid-selection-blank.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/grid-selection.png b/home/system/gtk/gtk/gtk-3.20/assets/grid-selection.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/grid-selection.png rename to home/system/gtk/gtk/gtk-3.20/assets/grid-selection.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/pane-separator-grip-vertical.png b/home/system/gtk/gtk/gtk-3.20/assets/pane-separator-grip-vertical.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/pane-separator-grip-vertical.png rename to home/system/gtk/gtk/gtk-3.20/assets/pane-separator-grip-vertical.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/pane-separator-grip.png b/home/system/gtk/gtk/gtk-3.20/assets/pane-separator-grip.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/pane-separator-grip.png rename to home/system/gtk/gtk/gtk-3.20/assets/pane-separator-grip.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/radio-disabled.png b/home/system/gtk/gtk/gtk-3.20/assets/radio-disabled.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/radio-disabled.png rename to home/system/gtk/gtk/gtk-3.20/assets/radio-disabled.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-dark.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-dark.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-dark.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-dark.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-dark@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-dark@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-dark@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-dark@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-insensitive-dark.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive-dark.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-insensitive-dark.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive-dark.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-insensitive-dark@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive-dark@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-insensitive-dark@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive-dark@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-insensitive.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-insensitive.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-insensitive@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-insensitive@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below@2.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider.png b/home/system/gtk/gtk/gtk-3.20/assets/slider.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider.png diff --git a/home/system/theme/gtk/gtk-3.20/assets/slider@2.png b/home/system/gtk/gtk/gtk-3.20/assets/slider@2.png similarity index 100% rename from home/system/theme/gtk/gtk-3.20/assets/slider@2.png rename to home/system/gtk/gtk/gtk-3.20/assets/slider@2.png diff --git a/home/system/theme/gtk/gtk-3.20/gnome-applications.css b/home/system/gtk/gtk/gtk-3.20/gnome-applications.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/gnome-applications.css rename to home/system/gtk/gtk/gtk-3.20/gnome-applications.css diff --git a/home/system/theme/gtk/gtk-3.20/gtk-widgets.css b/home/system/gtk/gtk/gtk-3.20/gtk-widgets.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/gtk-widgets.css rename to home/system/gtk/gtk/gtk-3.20/gtk-widgets.css diff --git a/home/system/theme/gtk/gtk-3.20/gtk.css b/home/system/gtk/gtk/gtk-3.20/gtk.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/gtk.css rename to home/system/gtk/gtk/gtk-3.20/gtk.css diff --git a/home/system/theme/gtk/gtk-3.20/gtk.css.base b/home/system/gtk/gtk/gtk-3.20/gtk.css.base similarity index 100% rename from home/system/theme/gtk/gtk-3.20/gtk.css.base rename to home/system/gtk/gtk/gtk-3.20/gtk.css.base diff --git a/home/system/theme/gtk/gtk-3.20/settings.ini b/home/system/gtk/gtk/gtk-3.20/settings.ini similarity index 100% rename from home/system/theme/gtk/gtk-3.20/settings.ini rename to home/system/gtk/gtk/gtk-3.20/settings.ini diff --git a/home/system/theme/gtk/gtk-3.20/unity.css b/home/system/gtk/gtk/gtk-3.20/unity.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/unity.css rename to home/system/gtk/gtk/gtk-3.20/unity.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/button.css b/home/system/gtk/gtk/gtk-3.20/widgets/button.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/button.css rename to home/system/gtk/gtk/gtk-3.20/widgets/button.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/calendar.css b/home/system/gtk/gtk/gtk-3.20/widgets/calendar.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/calendar.css rename to home/system/gtk/gtk/gtk-3.20/widgets/calendar.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/cell-row.css b/home/system/gtk/gtk/gtk-3.20/widgets/cell-row.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/cell-row.css rename to home/system/gtk/gtk/gtk-3.20/widgets/cell-row.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/check-radio.css b/home/system/gtk/gtk/gtk-3.20/widgets/check-radio.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/check-radio.css rename to home/system/gtk/gtk/gtk-3.20/widgets/check-radio.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/chrome.css b/home/system/gtk/gtk/gtk-3.20/widgets/chrome.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/chrome.css rename to home/system/gtk/gtk/gtk-3.20/widgets/chrome.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/color-chooser.css b/home/system/gtk/gtk/gtk-3.20/widgets/color-chooser.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/color-chooser.css rename to home/system/gtk/gtk/gtk-3.20/widgets/color-chooser.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/column-header.css b/home/system/gtk/gtk/gtk-3.20/widgets/column-header.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/column-header.css rename to home/system/gtk/gtk/gtk-3.20/widgets/column-header.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/combobox.css b/home/system/gtk/gtk/gtk-3.20/widgets/combobox.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/combobox.css rename to home/system/gtk/gtk/gtk-3.20/widgets/combobox.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/csd.css b/home/system/gtk/gtk/gtk-3.20/widgets/csd.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/csd.css rename to home/system/gtk/gtk/gtk-3.20/widgets/csd.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/entry.css b/home/system/gtk/gtk/gtk-3.20/widgets/entry.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/entry.css rename to home/system/gtk/gtk/gtk-3.20/widgets/entry.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/header-bar.css b/home/system/gtk/gtk/gtk-3.20/widgets/header-bar.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/header-bar.css rename to home/system/gtk/gtk/gtk-3.20/widgets/header-bar.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/infobar.css b/home/system/gtk/gtk/gtk-3.20/widgets/infobar.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/infobar.css rename to home/system/gtk/gtk/gtk-3.20/widgets/infobar.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/linked-buttons.css b/home/system/gtk/gtk/gtk-3.20/widgets/linked-buttons.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/linked-buttons.css rename to home/system/gtk/gtk/gtk-3.20/widgets/linked-buttons.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/menu.css b/home/system/gtk/gtk/gtk-3.20/widgets/menu.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/menu.css rename to home/system/gtk/gtk/gtk-3.20/widgets/menu.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/notebook.css b/home/system/gtk/gtk/gtk-3.20/widgets/notebook.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/notebook.css rename to home/system/gtk/gtk/gtk-3.20/widgets/notebook.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/osd.css b/home/system/gtk/gtk/gtk-3.20/widgets/osd.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/osd.css rename to home/system/gtk/gtk/gtk-3.20/widgets/osd.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/progress-scale.css b/home/system/gtk/gtk/gtk-3.20/widgets/progress-scale.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/progress-scale.css rename to home/system/gtk/gtk/gtk-3.20/widgets/progress-scale.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/scrollbar.css b/home/system/gtk/gtk/gtk-3.20/widgets/scrollbar.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/scrollbar.css rename to home/system/gtk/gtk/gtk-3.20/widgets/scrollbar.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/selection-mode.css b/home/system/gtk/gtk/gtk-3.20/widgets/selection-mode.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/selection-mode.css rename to home/system/gtk/gtk/gtk-3.20/widgets/selection-mode.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/separator.css b/home/system/gtk/gtk/gtk-3.20/widgets/separator.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/separator.css rename to home/system/gtk/gtk/gtk-3.20/widgets/separator.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/sidebar.css b/home/system/gtk/gtk/gtk-3.20/widgets/sidebar.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/sidebar.css rename to home/system/gtk/gtk/gtk-3.20/widgets/sidebar.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/spinbutton.css b/home/system/gtk/gtk/gtk-3.20/widgets/spinbutton.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/spinbutton.css rename to home/system/gtk/gtk/gtk-3.20/widgets/spinbutton.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/spinner.css b/home/system/gtk/gtk/gtk-3.20/widgets/spinner.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/spinner.css rename to home/system/gtk/gtk/gtk-3.20/widgets/spinner.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/switch.css b/home/system/gtk/gtk/gtk-3.20/widgets/switch.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/switch.css rename to home/system/gtk/gtk/gtk-3.20/widgets/switch.css diff --git a/home/system/theme/gtk/gtk-3.20/widgets/toolbar.css b/home/system/gtk/gtk/gtk-3.20/widgets/toolbar.css similarity index 100% rename from home/system/theme/gtk/gtk-3.20/widgets/toolbar.css rename to home/system/gtk/gtk/gtk-3.20/widgets/toolbar.css diff --git a/home/system/theme/gtk/index.theme b/home/system/gtk/gtk/index.theme similarity index 100% rename from home/system/theme/gtk/index.theme rename to home/system/gtk/gtk/index.theme diff --git a/home/system/theme/gtk/metacity-1/close_focused_normal.png b/home/system/gtk/gtk/metacity-1/close_focused_normal.png similarity index 100% rename from home/system/theme/gtk/metacity-1/close_focused_normal.png rename to home/system/gtk/gtk/metacity-1/close_focused_normal.png diff --git a/home/system/theme/gtk/metacity-1/close_focused_prelight.png b/home/system/gtk/gtk/metacity-1/close_focused_prelight.png similarity index 100% rename from home/system/theme/gtk/metacity-1/close_focused_prelight.png rename to home/system/gtk/gtk/metacity-1/close_focused_prelight.png diff --git a/home/system/theme/gtk/metacity-1/close_focused_pressed.png b/home/system/gtk/gtk/metacity-1/close_focused_pressed.png similarity index 100% rename from home/system/theme/gtk/metacity-1/close_focused_pressed.png rename to home/system/gtk/gtk/metacity-1/close_focused_pressed.png diff --git a/home/system/theme/gtk/metacity-1/close_unfocused.png b/home/system/gtk/gtk/metacity-1/close_unfocused.png similarity index 100% rename from home/system/theme/gtk/metacity-1/close_unfocused.png rename to home/system/gtk/gtk/metacity-1/close_unfocused.png diff --git a/home/system/theme/gtk/metacity-1/close_unfocused_prelight.png b/home/system/gtk/gtk/metacity-1/close_unfocused_prelight.png similarity index 100% rename from home/system/theme/gtk/metacity-1/close_unfocused_prelight.png rename to home/system/gtk/gtk/metacity-1/close_unfocused_prelight.png diff --git a/home/system/theme/gtk/metacity-1/close_unfocused_pressed.png b/home/system/gtk/gtk/metacity-1/close_unfocused_pressed.png similarity index 100% rename from home/system/theme/gtk/metacity-1/close_unfocused_pressed.png rename to home/system/gtk/gtk/metacity-1/close_unfocused_pressed.png diff --git a/home/system/theme/gtk/metacity-1/maximize_focused_normal.png b/home/system/gtk/gtk/metacity-1/maximize_focused_normal.png similarity index 100% rename from home/system/theme/gtk/metacity-1/maximize_focused_normal.png rename to home/system/gtk/gtk/metacity-1/maximize_focused_normal.png diff --git a/home/system/theme/gtk/metacity-1/maximize_focused_prelight.png b/home/system/gtk/gtk/metacity-1/maximize_focused_prelight.png similarity index 100% rename from home/system/theme/gtk/metacity-1/maximize_focused_prelight.png rename to home/system/gtk/gtk/metacity-1/maximize_focused_prelight.png diff --git a/home/system/theme/gtk/metacity-1/maximize_focused_pressed.png b/home/system/gtk/gtk/metacity-1/maximize_focused_pressed.png similarity index 100% rename from home/system/theme/gtk/metacity-1/maximize_focused_pressed.png rename to home/system/gtk/gtk/metacity-1/maximize_focused_pressed.png diff --git a/home/system/theme/gtk/metacity-1/maximize_unfocused.png b/home/system/gtk/gtk/metacity-1/maximize_unfocused.png similarity index 100% rename from home/system/theme/gtk/metacity-1/maximize_unfocused.png rename to home/system/gtk/gtk/metacity-1/maximize_unfocused.png diff --git a/home/system/theme/gtk/metacity-1/maximize_unfocused_prelight.png b/home/system/gtk/gtk/metacity-1/maximize_unfocused_prelight.png similarity index 100% rename from home/system/theme/gtk/metacity-1/maximize_unfocused_prelight.png rename to home/system/gtk/gtk/metacity-1/maximize_unfocused_prelight.png diff --git a/home/system/theme/gtk/metacity-1/maximize_unfocused_pressed.png b/home/system/gtk/gtk/metacity-1/maximize_unfocused_pressed.png similarity index 100% rename from home/system/theme/gtk/metacity-1/maximize_unfocused_pressed.png rename to home/system/gtk/gtk/metacity-1/maximize_unfocused_pressed.png diff --git a/home/system/theme/gtk/metacity-1/menu-pressed.png b/home/system/gtk/gtk/metacity-1/menu-pressed.png similarity index 100% rename from home/system/theme/gtk/metacity-1/menu-pressed.png rename to home/system/gtk/gtk/metacity-1/menu-pressed.png diff --git a/home/system/theme/gtk/metacity-1/menu-unfocus-prelight.png b/home/system/gtk/gtk/metacity-1/menu-unfocus-prelight.png similarity index 100% rename from home/system/theme/gtk/metacity-1/menu-unfocus-prelight.png rename to home/system/gtk/gtk/metacity-1/menu-unfocus-prelight.png diff --git a/home/system/theme/gtk/metacity-1/menu-unfocus-pressed.png b/home/system/gtk/gtk/metacity-1/menu-unfocus-pressed.png similarity index 100% rename from home/system/theme/gtk/metacity-1/menu-unfocus-pressed.png rename to home/system/gtk/gtk/metacity-1/menu-unfocus-pressed.png diff --git a/home/system/theme/gtk/metacity-1/menu-unfocus.png b/home/system/gtk/gtk/metacity-1/menu-unfocus.png similarity index 100% rename from home/system/theme/gtk/metacity-1/menu-unfocus.png rename to home/system/gtk/gtk/metacity-1/menu-unfocus.png diff --git a/home/system/theme/gtk/metacity-1/menu.png b/home/system/gtk/gtk/metacity-1/menu.png similarity index 100% rename from home/system/theme/gtk/metacity-1/menu.png rename to home/system/gtk/gtk/metacity-1/menu.png diff --git a/home/system/theme/gtk/metacity-1/menu_prelight.png b/home/system/gtk/gtk/metacity-1/menu_prelight.png similarity index 100% rename from home/system/theme/gtk/metacity-1/menu_prelight.png rename to home/system/gtk/gtk/metacity-1/menu_prelight.png diff --git a/home/system/theme/gtk/metacity-1/metacity-theme-1.xml b/home/system/gtk/gtk/metacity-1/metacity-theme-1.xml similarity index 100% rename from home/system/theme/gtk/metacity-1/metacity-theme-1.xml rename to home/system/gtk/gtk/metacity-1/metacity-theme-1.xml diff --git a/home/system/theme/gtk/metacity-1/metacity-theme-3.xml b/home/system/gtk/gtk/metacity-1/metacity-theme-3.xml similarity index 100% rename from home/system/theme/gtk/metacity-1/metacity-theme-3.xml rename to home/system/gtk/gtk/metacity-1/metacity-theme-3.xml diff --git a/home/system/theme/gtk/metacity-1/minimize_focused_normal.png b/home/system/gtk/gtk/metacity-1/minimize_focused_normal.png similarity index 100% rename from home/system/theme/gtk/metacity-1/minimize_focused_normal.png rename to home/system/gtk/gtk/metacity-1/minimize_focused_normal.png diff --git a/home/system/theme/gtk/metacity-1/minimize_focused_prelight.png b/home/system/gtk/gtk/metacity-1/minimize_focused_prelight.png similarity index 100% rename from home/system/theme/gtk/metacity-1/minimize_focused_prelight.png rename to home/system/gtk/gtk/metacity-1/minimize_focused_prelight.png diff --git a/home/system/theme/gtk/metacity-1/minimize_focused_pressed.png b/home/system/gtk/gtk/metacity-1/minimize_focused_pressed.png similarity index 100% rename from home/system/theme/gtk/metacity-1/minimize_focused_pressed.png rename to home/system/gtk/gtk/metacity-1/minimize_focused_pressed.png diff --git a/home/system/theme/gtk/metacity-1/minimize_unfocused.png b/home/system/gtk/gtk/metacity-1/minimize_unfocused.png similarity index 100% rename from home/system/theme/gtk/metacity-1/minimize_unfocused.png rename to home/system/gtk/gtk/metacity-1/minimize_unfocused.png diff --git a/home/system/theme/gtk/metacity-1/minimize_unfocused_prelight.png b/home/system/gtk/gtk/metacity-1/minimize_unfocused_prelight.png similarity index 100% rename from home/system/theme/gtk/metacity-1/minimize_unfocused_prelight.png rename to home/system/gtk/gtk/metacity-1/minimize_unfocused_prelight.png diff --git a/home/system/theme/gtk/metacity-1/minimize_unfocused_pressed.png b/home/system/gtk/gtk/metacity-1/minimize_unfocused_pressed.png similarity index 100% rename from home/system/theme/gtk/metacity-1/minimize_unfocused_pressed.png rename to home/system/gtk/gtk/metacity-1/minimize_unfocused_pressed.png diff --git a/home/system/theme/gtk/metacity-1/trough_left.png b/home/system/gtk/gtk/metacity-1/trough_left.png similarity index 100% rename from home/system/theme/gtk/metacity-1/trough_left.png rename to home/system/gtk/gtk/metacity-1/trough_left.png diff --git a/home/system/theme/gtk/metacity-1/trough_middle.png b/home/system/gtk/gtk/metacity-1/trough_middle.png similarity index 100% rename from home/system/theme/gtk/metacity-1/trough_middle.png rename to home/system/gtk/gtk/metacity-1/trough_middle.png diff --git a/home/system/theme/gtk/metacity-1/trough_right.png b/home/system/gtk/gtk/metacity-1/trough_right.png similarity index 100% rename from home/system/theme/gtk/metacity-1/trough_right.png rename to home/system/gtk/gtk/metacity-1/trough_right.png diff --git a/home/system/theme/gtk/metacity-1/unmaximize.png b/home/system/gtk/gtk/metacity-1/unmaximize.png similarity index 100% rename from home/system/theme/gtk/metacity-1/unmaximize.png rename to home/system/gtk/gtk/metacity-1/unmaximize.png diff --git a/home/system/theme/gtk/metacity-1/unmaximize_focused_normal.png b/home/system/gtk/gtk/metacity-1/unmaximize_focused_normal.png similarity index 100% rename from home/system/theme/gtk/metacity-1/unmaximize_focused_normal.png rename to home/system/gtk/gtk/metacity-1/unmaximize_focused_normal.png diff --git a/home/system/theme/gtk/metacity-1/unmaximize_focused_prelight.png b/home/system/gtk/gtk/metacity-1/unmaximize_focused_prelight.png similarity index 100% rename from home/system/theme/gtk/metacity-1/unmaximize_focused_prelight.png rename to home/system/gtk/gtk/metacity-1/unmaximize_focused_prelight.png diff --git a/home/system/theme/gtk/metacity-1/unmaximize_focused_pressed.png b/home/system/gtk/gtk/metacity-1/unmaximize_focused_pressed.png similarity index 100% rename from home/system/theme/gtk/metacity-1/unmaximize_focused_pressed.png rename to home/system/gtk/gtk/metacity-1/unmaximize_focused_pressed.png diff --git a/home/system/theme/gtk/metacity-1/unmaximize_unfocused.png b/home/system/gtk/gtk/metacity-1/unmaximize_unfocused.png similarity index 100% rename from home/system/theme/gtk/metacity-1/unmaximize_unfocused.png rename to home/system/gtk/gtk/metacity-1/unmaximize_unfocused.png diff --git a/home/system/theme/gtk/metacity-1/unmaximize_unfocused_prelight.png b/home/system/gtk/gtk/metacity-1/unmaximize_unfocused_prelight.png similarity index 100% rename from home/system/theme/gtk/metacity-1/unmaximize_unfocused_prelight.png rename to home/system/gtk/gtk/metacity-1/unmaximize_unfocused_prelight.png diff --git a/home/system/theme/gtk/metacity-1/unmaximize_unfocused_pressed.png b/home/system/gtk/gtk/metacity-1/unmaximize_unfocused_pressed.png similarity index 100% rename from home/system/theme/gtk/metacity-1/unmaximize_unfocused_pressed.png rename to home/system/gtk/gtk/metacity-1/unmaximize_unfocused_pressed.png diff --git a/home/system/theme/gtk/unity/close.png b/home/system/gtk/gtk/unity/close.png similarity index 100% rename from home/system/theme/gtk/unity/close.png rename to home/system/gtk/gtk/unity/close.png diff --git a/home/system/theme/gtk/unity/close_focused_normal.png b/home/system/gtk/gtk/unity/close_focused_normal.png similarity index 100% rename from home/system/theme/gtk/unity/close_focused_normal.png rename to home/system/gtk/gtk/unity/close_focused_normal.png diff --git a/home/system/theme/gtk/unity/close_focused_prelight.png b/home/system/gtk/gtk/unity/close_focused_prelight.png similarity index 100% rename from home/system/theme/gtk/unity/close_focused_prelight.png rename to home/system/gtk/gtk/unity/close_focused_prelight.png diff --git a/home/system/theme/gtk/unity/close_focused_pressed.png b/home/system/gtk/gtk/unity/close_focused_pressed.png similarity index 100% rename from home/system/theme/gtk/unity/close_focused_pressed.png rename to home/system/gtk/gtk/unity/close_focused_pressed.png diff --git a/home/system/theme/gtk/unity/close_unfocused.png b/home/system/gtk/gtk/unity/close_unfocused.png similarity index 100% rename from home/system/theme/gtk/unity/close_unfocused.png rename to home/system/gtk/gtk/unity/close_unfocused.png diff --git a/home/system/theme/gtk/unity/close_unfocused_prelight.png b/home/system/gtk/gtk/unity/close_unfocused_prelight.png similarity index 100% rename from home/system/theme/gtk/unity/close_unfocused_prelight.png rename to home/system/gtk/gtk/unity/close_unfocused_prelight.png diff --git a/home/system/theme/gtk/unity/close_unfocused_pressed.png b/home/system/gtk/gtk/unity/close_unfocused_pressed.png similarity index 100% rename from home/system/theme/gtk/unity/close_unfocused_pressed.png rename to home/system/gtk/gtk/unity/close_unfocused_pressed.png diff --git a/home/system/theme/gtk/unity/launcher_arrow_ltr_19.svg b/home/system/gtk/gtk/unity/launcher_arrow_ltr_19.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_arrow_ltr_19.svg rename to home/system/gtk/gtk/unity/launcher_arrow_ltr_19.svg diff --git a/home/system/theme/gtk/unity/launcher_arrow_ltr_37.svg b/home/system/gtk/gtk/unity/launcher_arrow_ltr_37.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_arrow_ltr_37.svg rename to home/system/gtk/gtk/unity/launcher_arrow_ltr_37.svg diff --git a/home/system/theme/gtk/unity/launcher_arrow_outline_ltr_19.svg b/home/system/gtk/gtk/unity/launcher_arrow_outline_ltr_19.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_arrow_outline_ltr_19.svg rename to home/system/gtk/gtk/unity/launcher_arrow_outline_ltr_19.svg diff --git a/home/system/theme/gtk/unity/launcher_arrow_outline_ltr_37.svg b/home/system/gtk/gtk/unity/launcher_arrow_outline_ltr_37.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_arrow_outline_ltr_37.svg rename to home/system/gtk/gtk/unity/launcher_arrow_outline_ltr_37.svg diff --git a/home/system/theme/gtk/unity/launcher_arrow_outline_rtl_19.svg b/home/system/gtk/gtk/unity/launcher_arrow_outline_rtl_19.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_arrow_outline_rtl_19.svg rename to home/system/gtk/gtk/unity/launcher_arrow_outline_rtl_19.svg diff --git a/home/system/theme/gtk/unity/launcher_arrow_outline_rtl_37.svg b/home/system/gtk/gtk/unity/launcher_arrow_outline_rtl_37.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_arrow_outline_rtl_37.svg rename to home/system/gtk/gtk/unity/launcher_arrow_outline_rtl_37.svg diff --git a/home/system/theme/gtk/unity/launcher_arrow_rtl_19.svg b/home/system/gtk/gtk/unity/launcher_arrow_rtl_19.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_arrow_rtl_19.svg rename to home/system/gtk/gtk/unity/launcher_arrow_rtl_19.svg diff --git a/home/system/theme/gtk/unity/launcher_arrow_rtl_37.svg b/home/system/gtk/gtk/unity/launcher_arrow_rtl_37.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_arrow_rtl_37.svg rename to home/system/gtk/gtk/unity/launcher_arrow_rtl_37.svg diff --git a/home/system/theme/gtk/unity/launcher_icon_back_150.svg b/home/system/gtk/gtk/unity/launcher_icon_back_150.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_icon_back_150.svg rename to home/system/gtk/gtk/unity/launcher_icon_back_150.svg diff --git a/home/system/theme/gtk/unity/launcher_icon_back_54.svg b/home/system/gtk/gtk/unity/launcher_icon_back_54.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_icon_back_54.svg rename to home/system/gtk/gtk/unity/launcher_icon_back_54.svg diff --git a/home/system/theme/gtk/unity/launcher_icon_edge_150.svg b/home/system/gtk/gtk/unity/launcher_icon_edge_150.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_icon_edge_150.svg rename to home/system/gtk/gtk/unity/launcher_icon_edge_150.svg diff --git a/home/system/theme/gtk/unity/launcher_icon_edge_54.svg b/home/system/gtk/gtk/unity/launcher_icon_edge_54.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_icon_edge_54.svg rename to home/system/gtk/gtk/unity/launcher_icon_edge_54.svg diff --git a/home/system/theme/gtk/unity/launcher_icon_glow_200.svg b/home/system/gtk/gtk/unity/launcher_icon_glow_200.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_icon_glow_200.svg rename to home/system/gtk/gtk/unity/launcher_icon_glow_200.svg diff --git a/home/system/theme/gtk/unity/launcher_icon_glow_62.svg b/home/system/gtk/gtk/unity/launcher_icon_glow_62.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_icon_glow_62.svg rename to home/system/gtk/gtk/unity/launcher_icon_glow_62.svg diff --git a/home/system/theme/gtk/unity/launcher_icon_selected_back_150.svg b/home/system/gtk/gtk/unity/launcher_icon_selected_back_150.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_icon_selected_back_150.svg rename to home/system/gtk/gtk/unity/launcher_icon_selected_back_150.svg diff --git a/home/system/theme/gtk/unity/launcher_icon_selected_back_54.svg b/home/system/gtk/gtk/unity/launcher_icon_selected_back_54.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_icon_selected_back_54.svg rename to home/system/gtk/gtk/unity/launcher_icon_selected_back_54.svg diff --git a/home/system/theme/gtk/unity/launcher_icon_shadow_200.svg b/home/system/gtk/gtk/unity/launcher_icon_shadow_200.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_icon_shadow_200.svg rename to home/system/gtk/gtk/unity/launcher_icon_shadow_200.svg diff --git a/home/system/theme/gtk/unity/launcher_icon_shadow_62.svg b/home/system/gtk/gtk/unity/launcher_icon_shadow_62.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_icon_shadow_62.svg rename to home/system/gtk/gtk/unity/launcher_icon_shadow_62.svg diff --git a/home/system/theme/gtk/unity/launcher_icon_shine_150.svg b/home/system/gtk/gtk/unity/launcher_icon_shine_150.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_icon_shine_150.svg rename to home/system/gtk/gtk/unity/launcher_icon_shine_150.svg diff --git a/home/system/theme/gtk/unity/launcher_icon_shine_54.svg b/home/system/gtk/gtk/unity/launcher_icon_shine_54.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_icon_shine_54.svg rename to home/system/gtk/gtk/unity/launcher_icon_shine_54.svg diff --git a/home/system/theme/gtk/unity/launcher_pip_ltr_19.svg b/home/system/gtk/gtk/unity/launcher_pip_ltr_19.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_pip_ltr_19.svg rename to home/system/gtk/gtk/unity/launcher_pip_ltr_19.svg diff --git a/home/system/theme/gtk/unity/launcher_pip_ltr_37.svg b/home/system/gtk/gtk/unity/launcher_pip_ltr_37.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_pip_ltr_37.svg rename to home/system/gtk/gtk/unity/launcher_pip_ltr_37.svg diff --git a/home/system/theme/gtk/unity/launcher_pip_rtl_19.svg b/home/system/gtk/gtk/unity/launcher_pip_rtl_19.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_pip_rtl_19.svg rename to home/system/gtk/gtk/unity/launcher_pip_rtl_19.svg diff --git a/home/system/theme/gtk/unity/launcher_pip_rtl_37.svg b/home/system/gtk/gtk/unity/launcher_pip_rtl_37.svg similarity index 100% rename from home/system/theme/gtk/unity/launcher_pip_rtl_37.svg rename to home/system/gtk/gtk/unity/launcher_pip_rtl_37.svg diff --git a/home/system/theme/gtk/unity/maximize.png b/home/system/gtk/gtk/unity/maximize.png similarity index 100% rename from home/system/theme/gtk/unity/maximize.png rename to home/system/gtk/gtk/unity/maximize.png diff --git a/home/system/theme/gtk/unity/maximize_focused_normal.png b/home/system/gtk/gtk/unity/maximize_focused_normal.png similarity index 100% rename from home/system/theme/gtk/unity/maximize_focused_normal.png rename to home/system/gtk/gtk/unity/maximize_focused_normal.png diff --git a/home/system/theme/gtk/unity/maximize_focused_prelight.png b/home/system/gtk/gtk/unity/maximize_focused_prelight.png similarity index 100% rename from home/system/theme/gtk/unity/maximize_focused_prelight.png rename to home/system/gtk/gtk/unity/maximize_focused_prelight.png diff --git a/home/system/theme/gtk/unity/maximize_focused_pressed.png b/home/system/gtk/gtk/unity/maximize_focused_pressed.png similarity index 100% rename from home/system/theme/gtk/unity/maximize_focused_pressed.png rename to home/system/gtk/gtk/unity/maximize_focused_pressed.png diff --git a/home/system/theme/gtk/unity/maximize_unfocused.png b/home/system/gtk/gtk/unity/maximize_unfocused.png similarity index 100% rename from home/system/theme/gtk/unity/maximize_unfocused.png rename to home/system/gtk/gtk/unity/maximize_unfocused.png diff --git a/home/system/theme/gtk/unity/maximize_unfocused_prelight.png b/home/system/gtk/gtk/unity/maximize_unfocused_prelight.png similarity index 100% rename from home/system/theme/gtk/unity/maximize_unfocused_prelight.png rename to home/system/gtk/gtk/unity/maximize_unfocused_prelight.png diff --git a/home/system/theme/gtk/unity/maximize_unfocused_pressed.png b/home/system/gtk/gtk/unity/maximize_unfocused_pressed.png similarity index 100% rename from home/system/theme/gtk/unity/maximize_unfocused_pressed.png rename to home/system/gtk/gtk/unity/maximize_unfocused_pressed.png diff --git a/home/system/theme/gtk/unity/minimize.png b/home/system/gtk/gtk/unity/minimize.png similarity index 100% rename from home/system/theme/gtk/unity/minimize.png rename to home/system/gtk/gtk/unity/minimize.png diff --git a/home/system/theme/gtk/unity/minimize_focused_normal.png b/home/system/gtk/gtk/unity/minimize_focused_normal.png similarity index 100% rename from home/system/theme/gtk/unity/minimize_focused_normal.png rename to home/system/gtk/gtk/unity/minimize_focused_normal.png diff --git a/home/system/theme/gtk/unity/minimize_focused_prelight.png b/home/system/gtk/gtk/unity/minimize_focused_prelight.png similarity index 100% rename from home/system/theme/gtk/unity/minimize_focused_prelight.png rename to home/system/gtk/gtk/unity/minimize_focused_prelight.png diff --git a/home/system/theme/gtk/unity/minimize_focused_pressed.png b/home/system/gtk/gtk/unity/minimize_focused_pressed.png similarity index 100% rename from home/system/theme/gtk/unity/minimize_focused_pressed.png rename to home/system/gtk/gtk/unity/minimize_focused_pressed.png diff --git a/home/system/theme/gtk/unity/minimize_unfocused.png b/home/system/gtk/gtk/unity/minimize_unfocused.png similarity index 100% rename from home/system/theme/gtk/unity/minimize_unfocused.png rename to home/system/gtk/gtk/unity/minimize_unfocused.png diff --git a/home/system/theme/gtk/unity/minimize_unfocused_prelight.png b/home/system/gtk/gtk/unity/minimize_unfocused_prelight.png similarity index 100% rename from home/system/theme/gtk/unity/minimize_unfocused_prelight.png rename to home/system/gtk/gtk/unity/minimize_unfocused_prelight.png diff --git a/home/system/theme/gtk/unity/minimize_unfocused_pressed.png b/home/system/gtk/gtk/unity/minimize_unfocused_pressed.png similarity index 100% rename from home/system/theme/gtk/unity/minimize_unfocused_pressed.png rename to home/system/gtk/gtk/unity/minimize_unfocused_pressed.png diff --git a/home/system/theme/gtk/unity/unmaximize.png b/home/system/gtk/gtk/unity/unmaximize.png similarity index 100% rename from home/system/theme/gtk/unity/unmaximize.png rename to home/system/gtk/gtk/unity/unmaximize.png diff --git a/home/system/theme/gtk/unity/unmaximize_focused_normal.png b/home/system/gtk/gtk/unity/unmaximize_focused_normal.png similarity index 100% rename from home/system/theme/gtk/unity/unmaximize_focused_normal.png rename to home/system/gtk/gtk/unity/unmaximize_focused_normal.png diff --git a/home/system/theme/gtk/unity/unmaximize_focused_prelight.png b/home/system/gtk/gtk/unity/unmaximize_focused_prelight.png similarity index 100% rename from home/system/theme/gtk/unity/unmaximize_focused_prelight.png rename to home/system/gtk/gtk/unity/unmaximize_focused_prelight.png diff --git a/home/system/theme/gtk/unity/unmaximize_focused_pressed.png b/home/system/gtk/gtk/unity/unmaximize_focused_pressed.png similarity index 100% rename from home/system/theme/gtk/unity/unmaximize_focused_pressed.png rename to home/system/gtk/gtk/unity/unmaximize_focused_pressed.png diff --git a/home/system/theme/gtk/unity/unmaximize_unfocused.png b/home/system/gtk/gtk/unity/unmaximize_unfocused.png similarity index 100% rename from home/system/theme/gtk/unity/unmaximize_unfocused.png rename to home/system/gtk/gtk/unity/unmaximize_unfocused.png diff --git a/home/system/theme/gtk/unity/unmaximize_unfocused_prelight.png b/home/system/gtk/gtk/unity/unmaximize_unfocused_prelight.png similarity index 100% rename from home/system/theme/gtk/unity/unmaximize_unfocused_prelight.png rename to home/system/gtk/gtk/unity/unmaximize_unfocused_prelight.png diff --git a/home/system/theme/gtk/unity/unmaximize_unfocused_pressed.png b/home/system/gtk/gtk/unity/unmaximize_unfocused_pressed.png similarity index 100% rename from home/system/theme/gtk/unity/unmaximize_unfocused_pressed.png rename to home/system/gtk/gtk/unity/unmaximize_unfocused_pressed.png diff --git a/home/system/theme/gtk/xfce-notify-4.0/gtkrc b/home/system/gtk/gtk/xfce-notify-4.0/gtkrc similarity index 100% rename from home/system/theme/gtk/xfce-notify-4.0/gtkrc rename to home/system/gtk/gtk/xfce-notify-4.0/gtkrc diff --git a/home/system/laptop.nix b/home/system/laptop.nix deleted file mode 100644 index 0904b1c..0000000 --- a/home/system/laptop.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - imports = [ - ./git - ./dunst - ./hyprland - ./shell - ./sops/laptop.nix - ./waybar - ./wlogout - ./wofi - ./theme - ]; -} diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix index 916c2aa..957710b 100644 --- a/hosts/laptop/variables.nix +++ b/hosts/laptop/variables.nix @@ -5,6 +5,7 @@ hostname = "nixy"; username = "hadi"; homeDirectory = "/home/" + config.var.username; + configDirectory = config.var.homeDirectory + "/.config/nixos"; keyboardLayout = "fr"; @@ -21,9 +22,11 @@ autoUpgrade = false; autoGarbageCollector = false; - sops = true; # change the sops configuration if you want to enable that nextcloud = true; - obsidian = true; # change the nvim's obsidian configuration if you want to enable that + # change the sops configuration if you want to enable that: + sops = true; + # change the nvim's obsidian configuration if you want to enable that: + obsidian = true; theme = import ../themes/nixy.nix; # select your theme here };