diff --git a/common.nix b/common.nix index e11d919..c015ae7 100644 --- a/common.nix +++ b/common.nix @@ -4,8 +4,8 @@ with lib; with lib.my; { imports = - [ inputs.home-manager.nixosModules.home-manager ]; - # ++ (mapModulesRec' (toString ./modules) import); + [ inputs.home-manager.nixosModules.home-manager ] + ++ (mapModulesRec' (toString ./modules) import); nix = { package = pkgs.nixFlakes; @@ -26,8 +26,18 @@ with lib.my; auto-optimise-store = true; }; }; + system.configurationRevision = with inputs; mkIf (self ? rev) self.rev; + + time.timeZone = lib.mkDefault "Europe/Amsterdam"; + + i18n.defaultLocale = lib.mkDefault "en_US.UTF-8"; + + console = { + keyMap = lib.mkDefault "fr"; + }; + environment.systemPackages = with pkgs; [ git vim diff --git a/hosts/froidmpa-laptop/default.nix b/hosts/froidmpa-laptop/default.nix index 172618b..8e09131 100644 --- a/hosts/froidmpa-laptop/default.nix +++ b/hosts/froidmpa-laptop/default.nix @@ -2,8 +2,6 @@ { imports = [ ./hardware-configuration.nix - ../../profiles/base.nix - ../../users ]; home-manager.users.froidmpa = { pkgs, config, ... }: { diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index 9ff9d94..0f174a9 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -2,12 +2,23 @@ { imports = [ ./hardware-configuration.nix - ../../profiles/base.nix - ../../users ]; + modules = { + desktop = { + xmonad.enable = true; + neovim.enable = true; + alacritty.enable = true; + zsh.enable = true; + vscode.enable = true; + dunst.enable = true; + htop.enable = true; + mpd.enable = true; + }; + }; + # Allow to externally control MPD networking.firewall.allowedTCPPorts = [ 6600 ]; - system.stateVersion = "19.09"; + system.stateVersion = "20.09"; } diff --git a/lib/options.nix b/lib/options.nix new file mode 100644 index 0000000..13610ba --- /dev/null +++ b/lib/options.nix @@ -0,0 +1,18 @@ +{ lib, ... }: + +let + inherit (lib) mkOption types; +in +rec { + mkOpt = type: default: + mkOption { inherit type default; }; + + mkOpt' = type: default: description: + mkOption { inherit type default description; }; + + mkBoolOpt = default: mkOption { + inherit default; + type = types.bool; + example = true; + }; +} diff --git a/modules/desktop/alacritty.nix b/modules/desktop/alacritty.nix new file mode 100644 index 0000000..c4c372c --- /dev/null +++ b/modules/desktop/alacritty.nix @@ -0,0 +1,67 @@ +{ config, lib, pkgs, ... }: + +with lib; +with lib.my; +let cfg = config.modules.desktop.alacritty; +in { + options.modules.desktop.alacritty = { + enable = mkBoolOpt false; + }; + config = mkIf cfg.enable { + home-manager.users.${config.user.name} = { + programs.alacritty = { + enable = true; + settings = { + colors = { + # (Gruvbox dark) + primary = { + background = "0x1d2021"; + foreground = "0xebdbb2"; + }; + normal = { + black = "0x282828"; + red = "0xcc241d"; + green = "0x98971a"; + yellow = "0xd79921"; + blue = "0x458588"; + magenta = "0xb16286"; + cyan = "0x689d6a"; + white = "0xa89984"; + }; + bright = { + black = "0x928374"; + red = "0xfb4934"; + green = "0xb8bb26"; + yellow = "0xfabd2f"; + blue = "0x83a598"; + magenta = "0xd3869b"; + cyan = "0x8ec07c"; + white = "0xebdbb2"; + }; + }; + window = { + title = "Alacritty"; + padding = { + x = 5; + y = 5; + }; + }; + scrolling.history = 65535; + font.size = 8; + key_bindings = [ + { + key = "Up"; + mods = "Control"; + action = "IncreaseFontSize"; + } + { + key = "Down"; + mods = "Control"; + action = "DecreaseFontSize"; + } + ]; + }; + }; + }; + }; +} diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix new file mode 100644 index 0000000..15a8624 --- /dev/null +++ b/modules/desktop/default.nix @@ -0,0 +1,344 @@ +{ inputs, config, options, lib, pkgs, ... }: + +with lib; +with lib.my; +let cfg = config.modules.desktop; +in { + config = mkIf config.services.xserver.enable { + + fonts = { + fonts = with pkgs.unstable; [ + corefonts # Microsoft free fonts + meslo-lgs-nf + ]; + fontconfig.defaultFonts = { + monospace = [ "MesloLGS NF" ]; + }; + }; + + home-manager.users.${config.user.name} = { + + imports = [ + inputs.nix-doom-emacs.hmModule + ]; + + xsession = { + enable = true; + initExtra = '' + keepassxc & + ''; + numlock.enable = true; + }; + + services = { + nextcloud-client.enable = true; + udiskie.enable = true; + gpg-agent = { + enable = true; + enableSshSupport = false; + pinentryFlavor = "gtk2"; + }; + stalonetray = { + enable = true; + config = { + geometry = "1x1-5+0"; + background = "#000000"; + transparent = true; + grow_gravity = "E"; + icon_gravity = "E"; + icon_size = "24"; + kludges = "force_icons_size"; + }; + }; + unclutter.enable = true; + pasystray.enable = true; + screen-locker = { + enable = false; + inactiveInterval = 5; + lockCmd = "${pkgs.i3lock}/bin/i3lock -e -f -c 000000 -i ~/.wallpaper.png"; + }; + emacs = { + enable = true; + client.enable = true; + }; + }; + + programs = { + gpg.enable = true; + git = { + enable = true; + userName = "Paul-Henri Froidmont"; + userEmail = "git.contact-57n2p@froidmont.org"; + signing = { + key = lib.mkDefault "3AC6F170F01133CE393BCD94BE948AFD7E7873BE"; + signByDefault = true; + }; + extraConfig = { + init.defaultBranch = "master"; + }; + }; + ssh = { + enable = true; + extraConfig = '' + # Force IPv4 otherwise git will try to use IPv6 which doesn't play well through a VPN + AddressFamily inet + ''; + }; + rofi = { + enable = true; + theme = "gruvbox-dark"; + terminal = "alacritty"; + }; + bat.enable = true; + jq.enable = true; + fzf.enable = true; + lesspipe.enable = true; + zathura.enable = true; + pazi.enable = true; + + broot = { + enable = true; + enableZshIntegration = true; + }; + command-not-found.enable = true; + direnv = { + enable = true; + enableZshIntegration = true; + nix-direnv.enable = true; + }; + doom-emacs = { + enable = true; + doomPrivateDir = ./files/doom.d; + emacsPackagesOverlay = final: prev: { + ob-ammonite = with final; (trivialBuild { + src = pkgs.fetchFromGitHub { + owner = "zwild"; + repo = "ob-ammonite"; + rev = "39937dff395e70aff76a4224fa49cf2ec6c57cca"; + sha256 = pkgs.lib.fakeSha256; + }; + pname = "ob-ammonite"; + packageRequires = [ s dash editorconfig ]; + }); + }; + }; + newsboat = { + enable = true; + autoReload = true; + urls = [ + { title = "Happy Path Programming"; tags = [ "podcast" "programming" ]; url = "https://anchor.fm/s/2ed56aa0/podcast/rss"; } + { title = "Antoine Goya"; tags = [ "video" "culture" "cinema" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC2qlgiYCCtaYpn2_blX01xg"; } + { title = "Berd"; tags = [ "video" "humor" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCRei8TBpt4r0WPZ7MkiKmVg"; } + { title = "Berm Peak"; tags = [ "video" "MTB" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCu8YylsPiu9XfaQC74Hr_Gw"; } + { title = "Berm Peak Express"; tags = [ "video" "MTB" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCOpP5PqrzODWpFU961acUbg"; } + { title = "code- Reinho"; tags = [ "video" "guns" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCNWs0QTTHm7yiPMwl0aynsg"; } + { title = "Computerphile"; tags = [ "video" "programming" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC9-y-6csu5WGm29I7JiwpnA"; } + { title = "Chronik Fiction"; tags = [ "video" "cinema" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCeah3nqu_v6KfpXrCzEARQw"; } + { title = "Domain of Science"; tags = [ "video" "science" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCxqAWLTk1CmBvZFPzeZMd9A"; } + { title = "Forged Alliance Forever"; tags = [ "video" "gaming" "faf" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCkAWiUu4QE172kv"; } + { title = "Grand Angle"; tags = [ "video" "finance" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCWtD8JN9hkxL5TJL_ktaNZA"; } + { title = "Gyle"; tags = [ "video" "gaming" "cast" "faf" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCzY7MBSgNLZOMxMIFwtf2bw"; } + { title = "Hygiène Mentale"; tags = [ "video" "philosophy" "zetetic" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCMFcMhePnH4onVHt2-ItPZw"; } + { title = "Institut des Libertés"; tags = [ "video" "finance" "politics" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCaqUCTIgFDtMhBeKeeejrkA"; } + { title = "Juste Milieu"; tags = [ "video" "politics" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCXh5HwvbyfD-GUVHLng9aGQ"; } + { title = "J'suis pas content TV"; tags = [ "video" "politics" "humor" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC9NB2nXjNtRabu3YLPB16Hg"; } + { title = "Kriss Papillon"; tags = [ "video" "culture" "philosophy" ]; url = "https://odysee.com/$/rss/@Kriss-Papillon:c"; } + { title = "Kruggsmash"; tags = [ "video" "storytelling" "gaming" ]; url = "https://www.youtube.com/@kruggsmash"; } + { title = "Kurzgesagt"; tags = [ "video" "science" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCsXVk37bltHxD1rDPwtNM8Q"; } + { title = "La Gauloiserie"; tags = [ "video" "guns" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC5Ph48LXovwS2hyAGfWwE9A"; } + { title = "La Pistolerie"; tags = [ "video" "guns" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCvAZXkucE9CVVxb5K8xTjPA"; } + { title = "Le Précepteur"; tags = [ "video" "philosophy" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCvRgiAmogg7a_BgQ_Ftm6fA"; } + { title = "La Tronche en Biais"; tags = [ "video" "philosophy" "zetetic" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCq-8pBMM3I40QlrhM9ExXJQ"; } + { title = "Luke Smith"; tags = [ "video" "linux" "philosophy" ]; url = "https://videos.lukesmith.xyz/feeds/videos.atom"; } + { title = "Maitre Luger"; tags = [ "video" "guns" "history" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC570onl32MV5vjAnmnjeycg"; } + { title = "Mental Outlaw"; tags = [ "video" "linux" ]; url = "https://odysee.com/$/rss/@AlphaNerd:8"; } + { title = "mozinor"; tags = [ "video" "humor" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCTIiKt_Bp4gKlFPtHeB3qGw"; } + { title = "NixOS"; tags = [ "video" "linux" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC3vIimi9q4AT8EgxYp_dWIw"; } + { title = "Numberphile"; tags = [ "video" "math" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCoxcjq-8xIDTYp3uz647V5A"; } + { title = "PostmodernJukebox"; tags = [ "video" "music" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCORIeT1hk6tYBuntEXsguLg"; } + { title = "r/NixOS"; tags = [ "video" "linux" "reddit" ]; url = "https://www.reddit.com/r/NixOS.rss"; } + { title = "r/Scala"; tags = [ "video" "linux" "programming" ]; url = "https://www.reddit.com/r/Scala.rss"; } + { title = "Real Engineering"; tags = [ "video" "science" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCR1IuLEqb6UEA_zQ81kwXfg"; } + { title = "Real Science"; tags = [ "video" "science" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC176GAQozKKjhz62H8u9vQQ"; } + { title = "Richard sur Terre"; tags = [ "video" "politics" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCZIR19yr81nmaP0pMfiMwxw"; } + { title = "Stevius"; tags = [ "video" "history" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCkWzOALDNDee3t9IfYoB2uQ"; } + { title = "TheDuelist"; tags = [ "video" "gaming" "cast" "faf" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCDDNS1XW0-o1FRPvaR9-pKA"; } + { title = "Tom Scott"; tags = [ "video" "science" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCBa659QWEk1AI4Tg--mrJ2A"; } + { title = "Victor Ferry"; tags = [ "video" "rhetoric" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCcueC-4NWGuPFQKzQWn5heA"; } + { title = "videogamedunkey"; tags = [ "video" "humor" "gaming" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCsvn_Po0SmunchJYOWpOxMg"; } + { title = "Vilebrequin"; tags = [ "video" "humor" "cars" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCC9mlCpyisiIpp9YA9xV-QA"; } + { title = "Vsauce"; tags = [ "video" "science" "philosophy" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC6nSFpj9HTCZ5t-N3Rm3-HA"; } + { title = "Wendover Productions"; tags = [ "video" "finance" "logistics" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC9RM-iSvTu1uPJb8X5yp3EQ"; } + { title = "Willow's Duality"; tags = [ "video" "gaming" "cast" "faf" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC8lU7OuwPGDQibMhnvSvf1w"; } + { title = "ScienceEtonnante"; tags = [ "video" "science" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCaNlbnghtwlsGF-KzAFThqA"; } + ]; + extraConfig = '' + macro v set browser "setsid -f ${pkgs.mpv}/bin/mpv --really-quiet --no-terminal" ; open-in-browser ; set browser brave + + # unbind keys + unbind-key ENTER + unbind-key j + unbind-key k + unbind-key J + unbind-key K + + # bind keys - vim style + bind-key j down + bind-key k up + bind-key l open + bind-key h quit + + color background color223 color0 + color listnormal color223 color0 + color listnormal_unread color2 color0 + color listfocus color223 color237 + color listfocus_unread color223 color237 + color info color8 color0 + color article color223 color0 + + # highlights + highlight article "^(Feed|Link):.*$" color11 default bold + highlight article "^(Title|Date|Author):.*$" color11 default bold + highlight article "https?://[^ ]+" color2 default underline + highlight article "\\[[0-9]+\\]" color2 default bold + highlight article "\\[image\\ [0-9]+\\]" color2 default bold + highlight feedlist "^─.*$" color6 color6 bold + ''; + }; + }; + + gtk = { + enable = true; + theme.name = "oomox-gruvmox-dark-medium-default"; + iconTheme.name = "oomox-gruvmox-dark-medium-default"; + }; + qt = { + enable = true; + platformTheme = "gtk"; + }; + + home = { + sessionVariables = { + QT_AUTO_SCREEN_SCALE_FACTOR = "0"; + }; + + keyboard = { + layout = "fr"; + options = [ "caps:escape" ]; + }; + + file = { + ".wallpaper.png".source = ./files/wallpaper.png; + ".xmonad/xmobarrc".source = ./files/xmobarrc; + ".config/ncmpcpp" = { + source = ./files/ncmpcpp; + recursive = true; + }; + ".xmonad/scripts" = { + source = ./files/scripts; + recursive = true; + }; + ".themes/oomox-gruvmox-dark-medium-default" = { + source = ./files/oomox-gruvmox-dark-medium-default; + recursive = true; + }; + ".config/ranger" = { + source = ./files/ranger; + recursive = true; + }; + ".config/ranger/plugins" = { + source = builtins.fetchGit { + url = "git://github.com/phfroidmont/ranger_devicons.git"; + rev = "e02b6a3203411b76616a0e4328245bf8b47c5dcc"; + }; + recursive = true; + }; + }; + + packages = with pkgs.unstable; [ + haskellPackages.xmobar + i3lock + feh + xorg.xbacklight + xorg.xinit + xorg.xwininfo + xorg.xkill + scrot + numix-gtk-theme + + ncmpcpp + mpc_cli + pulsemixer + + # Ranger preview utils + w3m + xclip + odt2txt + + firefox + brave + keepassxc + krita + element-desktop + mpv + jellyfin-mpv-shim + mumble + libreoffice-fresh + onlyoffice-bin + thunderbird + portfolio + transmission-remote-gtk + monero-gui + + jdk + jetbrains.idea-community + httpie + + rnix-lsp + metals + nixpkgs-fmt + + zsh-syntax-highlighting + ranger + R + tldr + thefuck + atool + linuxPackages.perf + + glxinfo + steam + protontricks + lutris + dolphinEmu + ]; + }; + + + systemd.user.services.activitywatch = { + Unit.Description = "Start ActivityWatch"; + Service.Type = "simple"; + Service.ExecStart = "${pkgs.unstable.activitywatch-bin}/bin/aw-server"; + Install.WantedBy = [ "default.target" ]; + Service.Restart = "on-failure"; + Service.RestartSec = 5; + }; + systemd.user.services.activitywatch-afk = { + Unit.Description = "Start ActivityWatch AFK"; + Service.Type = "simple"; + Service.ExecStart = "${pkgs.unstable.activitywatch-bin}/bin/aw-watcher-afk"; + Install.WantedBy = [ "default.target" ]; + Service.Restart = "on-failure"; + Service.RestartSec = 5; + }; + systemd.user.services.activitywatch-window = { + Unit.Description = "Start ActivityWatch Window"; + Service.Type = "simple"; + Service.ExecStart = "${pkgs.unstable.activitywatch-bin}/bin/aw-watcher-window"; + Install.WantedBy = [ "default.target" ]; + Service.Restart = "on-failure"; + Service.RestartSec = 5; + }; + }; + }; +} diff --git a/modules/desktop/dunst.nix b/modules/desktop/dunst.nix new file mode 100644 index 0000000..f1abb2b --- /dev/null +++ b/modules/desktop/dunst.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: + +with lib; +with lib.my; +let cfg = config.modules.desktop.dunst; +in { + options.modules.desktop.dunst = { + enable = mkBoolOpt false; + }; + config = mkIf cfg.enable { + home-manager.users.${config.user.name} = { + services.dunst = + { + enable = true; + settings = { + global = { + monitor = 0; + geometry = "350x5-30+50"; + transparency = 10; + font = "monospace 14"; + idle_threshold = 120; + allow_markup = "yes"; + format = "%s\n%b"; + show_age_threshold = 300; + word_wrap = "yes"; + sticky_history = "yes"; + sort = "yes"; + }; + frame = { + width = 3; + color = "#ebdbb2"; + }; + shortcuts = { + close = "ctrl+space"; + close_all = "ctrl+shift+space"; + history = "ctrl+grave"; + context = "ctrl+shift+period"; + }; + urgency_low = { + foreground = "#ebdbb2"; + background = "#32302f"; + timeout = 10; + }; + urgency_normal = { + foreground = "#ebdbb2"; + background = "#32302f"; + timeout = 10; + }; + urgency_critical = { + foreground = "#ebdbb2"; + background = "#32302f"; + timeout = 10; + }; + }; + }; + }; + }; +} diff --git a/users/files/doom.d/config.el b/modules/desktop/files/doom.d/config.el similarity index 100% rename from users/files/doom.d/config.el rename to modules/desktop/files/doom.d/config.el diff --git a/users/files/doom.d/init.el b/modules/desktop/files/doom.d/init.el similarity index 100% rename from users/files/doom.d/init.el rename to modules/desktop/files/doom.d/init.el diff --git a/users/files/doom.d/packages.el b/modules/desktop/files/doom.d/packages.el similarity index 100% rename from users/files/doom.d/packages.el rename to modules/desktop/files/doom.d/packages.el diff --git a/users/files/ncmpcpp/bindings b/modules/desktop/files/ncmpcpp/bindings similarity index 100% rename from users/files/ncmpcpp/bindings rename to modules/desktop/files/ncmpcpp/bindings diff --git a/users/files/ncmpcpp/config b/modules/desktop/files/ncmpcpp/config similarity index 100% rename from users/files/ncmpcpp/config rename to modules/desktop/files/ncmpcpp/config diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/all-assets.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/all-assets.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/all-assets.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/all-assets.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/all-assets.txt b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/all-assets.txt similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/all-assets.txt rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/all-assets.txt diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/change_dpi.sh b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/change_dpi.sh similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/change_dpi.sh rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/change_dpi.sh diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked-insensitive-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked-insensitive-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked-insensitive-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked-insensitive-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked-insensitive.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked-insensitive.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked-insensitive.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked-insensitive.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-checked.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed-insensitive-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed-insensitive-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed-insensitive-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed-insensitive-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed-insensitive.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed-insensitive.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed-insensitive.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed-insensitive.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-mixed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked-insensitive-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked-insensitive-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked-insensitive-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked-insensitive-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked-insensitive.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked-insensitive.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked-insensitive.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked-insensitive.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/checkbox-unchecked.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-checked-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-checked-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-checked-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-checked-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-checked.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-checked.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-checked.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-checked.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-unchecked-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-unchecked-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-unchecked-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-unchecked-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-unchecked.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-unchecked.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-unchecked.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/grid-selection-unchecked.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-checked-hover.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-checked-hover.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-checked-hover.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-checked-hover.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-checked-insensitive.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-checked-insensitive.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-checked-insensitive.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-checked-insensitive.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-checked.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-checked.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-checked.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-checked.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed-hover.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed-hover.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed-hover.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed-hover.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed-insensitive.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed-insensitive.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed-insensitive.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed-insensitive.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed-selected.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed-selected.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed-selected.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed-selected.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-mixed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-unchecked.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-unchecked.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-unchecked.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-checkbox-unchecked.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-checked-hover.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-checked-hover.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-checked-hover.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-checked-hover.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-checked-insensitive.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-checked-insensitive.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-checked-insensitive.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-checked-insensitive.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-checked.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-checked.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-checked.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-checked.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed-hover.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed-hover.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed-hover.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed-hover.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed-insensitive.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed-insensitive.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed-insensitive.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed-insensitive.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed-selected.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed-selected.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed-selected.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed-selected.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-mixed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-unchecked.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-unchecked.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-unchecked.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/menuitem-radio-unchecked.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/pane-handle-vertical.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/pane-handle-vertical.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/pane-handle-vertical.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/pane-handle-vertical.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/pane-handle.png b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/pane-handle.png similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/pane-handle.png rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/pane-handle.png diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/pane-handle.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/pane-handle.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/pane-handle.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/pane-handle.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/pane-handle@2.png b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/pane-handle@2.png similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/pane-handle@2.png rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/pane-handle@2.png diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-checked-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-checked-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-checked-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-checked-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-checked-insensitive-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-checked-insensitive-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-checked-insensitive-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-checked-insensitive-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-checked-insensitive.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-checked-insensitive.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-checked-insensitive.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-checked-insensitive.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-checked.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-checked.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-checked.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-checked.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed-insensitive-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed-insensitive-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed-insensitive-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed-insensitive-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed-insensitive.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed-insensitive.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed-insensitive.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed-insensitive.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-mixed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-selected-insensitive.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-selected-insensitive.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-selected-insensitive.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-selected-insensitive.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-selected.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-selected.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-selected.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-selected.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked-insensitive-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked-insensitive-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked-insensitive-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked-insensitive-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked-insensitive.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked-insensitive.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked-insensitive.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked-insensitive.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unchecked.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected-insensitive-dark.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected-insensitive-dark.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected-insensitive-dark.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected-insensitive-dark.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected-insensitive.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected-insensitive.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected-insensitive.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected-insensitive.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/radio-unselected.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/sed.sh b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/sed.sh similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/sed.sh rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/sed.sh diff --git a/users/files/oomox-gruvmox-dark-medium-default/assets/unsed.sh b/modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/unsed.sh similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/assets/unsed.sh rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/assets/unsed.sh diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/add-workspace-hover.png b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/add-workspace-hover.png similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/add-workspace-hover.png rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/add-workspace-hover.png diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/add-workspace.png b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/add-workspace.png similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/add-workspace.png rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/add-workspace.png diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/calendar-arrow-left.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/calendar-arrow-left.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/calendar-arrow-left.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/calendar-arrow-left.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/calendar-arrow-right.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/calendar-arrow-right.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/calendar-arrow-right.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/calendar-arrow-right.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/checkbox-off.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/checkbox-off.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/checkbox-off.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/checkbox-off.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/checkbox.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/checkbox.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/checkbox.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/checkbox.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/close-window.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/close-window.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/close-window.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/close-window.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/corner-ripple.png b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/corner-ripple.png similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/corner-ripple.png rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/corner-ripple.png diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/radiobutton-off.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/radiobutton-off.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/radiobutton-off.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/radiobutton-off.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/radiobutton.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/radiobutton.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/radiobutton.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/radiobutton.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-off-intl.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-off-intl.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-off-intl.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-off-intl.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-off-us.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-off-us.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-off-us.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-off-us.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-on-intl.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-on-intl.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-on-intl.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-on-intl.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-on-us.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-on-us.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-on-us.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/toggle-on-us.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/trash-icon.png b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/trash-icon.png similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/trash-icon.png rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/assets/trash-icon.png diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/_extends.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/_extends.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/_extends.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/_extends.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/_global.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/_global.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/_global.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/_global.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/cinnamon.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/cinnamon.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/cinnamon.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/cinnamon.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_accessibility.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_accessibility.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_accessibility.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_accessibility.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_alt-tab.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_alt-tab.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_alt-tab.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_alt-tab.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_calendar.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_calendar.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_calendar.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_calendar.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_desklets.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_desklets.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_desklets.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_desklets.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_dialogs.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_dialogs.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_dialogs.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_dialogs.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_menu.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_menu.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_menu.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_menu.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_notifications.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_notifications.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_notifications.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_notifications.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_overview.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_overview.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_overview.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_overview.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_panel.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_panel.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_panel.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_panel.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_stage.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_stage.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_stage.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_stage.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_tile-hud.scss b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_tile-hud.scss similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_tile-hud.scss rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/scss/sections/_tile-hud.scss diff --git a/users/files/oomox-gruvmox-dark-medium-default/cinnamon/thumbnail.png b/modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/thumbnail.png similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/cinnamon/thumbnail.png rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/cinnamon/thumbnail.png diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-2.0/gtkrc b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-2.0/gtkrc similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-2.0/gtkrc rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-2.0/gtkrc diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-2.0/gtkrc.hidpi b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-2.0/gtkrc.hidpi similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-2.0/gtkrc.hidpi rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-2.0/gtkrc.hidpi diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/assets b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/assets similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/assets rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/assets diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/dist/gtk-dark.css b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/dist/gtk-dark.css similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/dist/gtk-dark.css rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/dist/gtk-dark.css diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/dist/gtk.css b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/dist/gtk.css similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/dist/gtk.css rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/dist/gtk.css diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk-dark.css b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk-dark.css similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk-dark.css rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk-dark.css diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk.css b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk.css similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk.css rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk.css diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk.gresource b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk.gresource similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk.gresource rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk.gresource diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk.gresource.xml b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk.gresource.xml similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk.gresource.xml rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/gtk.gresource.xml diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/thumbnail.png b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/thumbnail.png similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.0/thumbnail.png rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.0/thumbnail.png diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/assets b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/assets similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/assets rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/assets diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/dist/gtk-dark.css b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/dist/gtk-dark.css similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/dist/gtk-dark.css rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/dist/gtk-dark.css diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/dist/gtk.css b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/dist/gtk.css similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/dist/gtk.css rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/dist/gtk.css diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk-dark.css b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk-dark.css similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk-dark.css rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk-dark.css diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk.css b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk.css similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk.css rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk.css diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk.gresource b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk.gresource similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk.gresource rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk.gresource diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk.gresource.xml b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk.gresource.xml similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk.gresource.xml rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/gtk.gresource.xml diff --git a/users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/thumbnail.png b/modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/thumbnail.png similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/gtk-3.20/thumbnail.png rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/gtk-3.20/thumbnail.png diff --git a/users/files/oomox-gruvmox-dark-medium-default/index.theme b/modules/desktop/files/oomox-gruvmox-dark-medium-default/index.theme similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/index.theme rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/index.theme diff --git a/users/files/oomox-gruvmox-dark-medium-default/metacity-1/metacity-theme-2.xml b/modules/desktop/files/oomox-gruvmox-dark-medium-default/metacity-1/metacity-theme-2.xml similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/metacity-1/metacity-theme-2.xml rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/metacity-1/metacity-theme-2.xml diff --git a/users/files/oomox-gruvmox-dark-medium-default/metacity-1/metacity-theme-3.xml b/modules/desktop/files/oomox-gruvmox-dark-medium-default/metacity-1/metacity-theme-3.xml similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/metacity-1/metacity-theme-3.xml rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/metacity-1/metacity-theme-3.xml diff --git a/users/files/oomox-gruvmox-dark-medium-default/metacity-1/thumbnail.png b/modules/desktop/files/oomox-gruvmox-dark-medium-default/metacity-1/thumbnail.png similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/metacity-1/thumbnail.png rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/metacity-1/thumbnail.png diff --git a/users/files/oomox-gruvmox-dark-medium-default/openbox-3/close.xbm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/close.xbm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/openbox-3/close.xbm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/close.xbm diff --git a/users/files/oomox-gruvmox-dark-medium-default/openbox-3/close_hover.xbm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/close_hover.xbm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/openbox-3/close_hover.xbm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/close_hover.xbm diff --git a/users/files/oomox-gruvmox-dark-medium-default/openbox-3/desk.xbm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/desk.xbm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/openbox-3/desk.xbm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/desk.xbm diff --git a/users/files/oomox-gruvmox-dark-medium-default/openbox-3/desk_toggled.xbm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/desk_toggled.xbm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/openbox-3/desk_toggled.xbm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/desk_toggled.xbm diff --git a/users/files/oomox-gruvmox-dark-medium-default/openbox-3/iconify.xbm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/iconify.xbm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/openbox-3/iconify.xbm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/iconify.xbm diff --git a/users/files/oomox-gruvmox-dark-medium-default/openbox-3/iconify_hover.xbm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/iconify_hover.xbm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/openbox-3/iconify_hover.xbm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/iconify_hover.xbm diff --git a/users/files/oomox-gruvmox-dark-medium-default/openbox-3/max.xbm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/max.xbm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/openbox-3/max.xbm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/max.xbm diff --git a/users/files/oomox-gruvmox-dark-medium-default/openbox-3/max_toggled.xbm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/max_toggled.xbm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/openbox-3/max_toggled.xbm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/max_toggled.xbm diff --git a/users/files/oomox-gruvmox-dark-medium-default/openbox-3/shade.xbm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/shade.xbm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/openbox-3/shade.xbm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/shade.xbm diff --git a/users/files/oomox-gruvmox-dark-medium-default/openbox-3/shade_toggled.xbm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/shade_toggled.xbm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/openbox-3/shade_toggled.xbm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/shade_toggled.xbm diff --git a/users/files/oomox-gruvmox-dark-medium-default/openbox-3/themerc b/modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/themerc similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/openbox-3/themerc rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/openbox-3/themerc diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/close.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/close.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/close_dash.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_dash.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/close_dash.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_dash.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/close_dash_disabled.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_dash_disabled.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/close_dash_disabled.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_dash_disabled.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/close_dash_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_dash_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/close_dash_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_dash_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/close_dash_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_dash_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/close_dash_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_dash_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/close_focused_normal.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_focused_normal.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/close_focused_normal.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_focused_normal.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/close_focused_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_focused_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/close_focused_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_focused_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/close_focused_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_focused_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/close_focused_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_focused_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/close_unfocused.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_unfocused.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/close_unfocused.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_unfocused.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/close_unfocused_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_unfocused_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/close_unfocused_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_unfocused_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/close_unfocused_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_unfocused_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/close_unfocused_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/close_unfocused_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_ltr_19.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_ltr_19.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_ltr_19.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_ltr_19.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_ltr_37.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_ltr_37.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_ltr_37.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_ltr_37.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_ltr_19.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_ltr_19.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_ltr_19.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_ltr_19.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_ltr_37.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_ltr_37.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_ltr_37.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_ltr_37.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_rtl_19.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_rtl_19.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_rtl_19.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_rtl_19.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_rtl_37.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_rtl_37.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_rtl_37.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_outline_rtl_37.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_rtl_19.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_rtl_19.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_rtl_19.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_rtl_19.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_rtl_37.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_rtl_37.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_rtl_37.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_arrow_rtl_37.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_back_150.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_back_150.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_back_150.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_back_150.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_back_54.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_back_54.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_back_54.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_back_54.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_edge_150.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_edge_150.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_edge_150.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_edge_150.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_edge_54.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_edge_54.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_edge_54.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_edge_54.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_glow_200.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_glow_200.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_glow_200.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_glow_200.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_glow_62.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_glow_62.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_glow_62.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_glow_62.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_selected_back_150.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_selected_back_150.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_selected_back_150.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_selected_back_150.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_selected_back_54.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_selected_back_54.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_selected_back_54.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_selected_back_54.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shadow_200.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shadow_200.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shadow_200.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shadow_200.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shadow_62.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shadow_62.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shadow_62.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shadow_62.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shine_150.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shine_150.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shine_150.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shine_150.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shine_54.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shine_54.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shine_54.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_icon_shine_54.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_ltr_19.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_ltr_19.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_ltr_19.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_ltr_19.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_ltr_37.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_ltr_37.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_ltr_37.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_ltr_37.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_rtl_19.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_rtl_19.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_rtl_19.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_rtl_19.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_rtl_37.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_rtl_37.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_rtl_37.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/launcher_pip_rtl_37.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/maximize.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/maximize.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash_disabled.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash_disabled.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash_disabled.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash_disabled.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_dash_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/maximize_focused_normal.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_focused_normal.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/maximize_focused_normal.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_focused_normal.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/maximize_focused_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_focused_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/maximize_focused_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_focused_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/maximize_focused_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_focused_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/maximize_focused_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_focused_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/maximize_unfocused.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_unfocused.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/maximize_unfocused.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_unfocused.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/maximize_unfocused_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_unfocused_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/maximize_unfocused_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_unfocused_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/maximize_unfocused_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_unfocused_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/maximize_unfocused_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/maximize_unfocused_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/minimize.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/minimize.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash_disabled.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash_disabled.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash_disabled.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash_disabled.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_dash_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/minimize_focused_normal.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_focused_normal.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/minimize_focused_normal.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_focused_normal.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/minimize_focused_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_focused_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/minimize_focused_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_focused_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/minimize_focused_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_focused_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/minimize_focused_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_focused_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/minimize_unfocused.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_unfocused.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/minimize_unfocused.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_unfocused.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/minimize_unfocused_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_unfocused_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/minimize_unfocused_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_unfocused_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/minimize_unfocused_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_unfocused_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/minimize_unfocused_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimize_unfocused_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/minimized.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimized.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/minimized.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/minimized.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/modes/launcher_bfb-flat.png b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/modes/launcher_bfb-flat.png similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/modes/launcher_bfb-flat.png rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/modes/launcher_bfb-flat.png diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/modes/launcher_bfb_ns.png b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/modes/launcher_bfb_ns.png similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/modes/launcher_bfb_ns.png rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/modes/launcher_bfb_ns.png diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/modes/ubuntu-square.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/modes/ubuntu-square.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/modes/ubuntu-square.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/modes/ubuntu-square.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/progress_bar_fill.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/progress_bar_fill.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/progress_bar_fill.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/progress_bar_fill.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/progress_bar_trough.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/progress_bar_trough.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/progress_bar_trough.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/progress_bar_trough.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/sheet_style_close_focused.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/sheet_style_close_focused.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/sheet_style_close_focused.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/sheet_style_close_focused.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/sheet_style_close_focused_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/sheet_style_close_focused_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/sheet_style_close_focused_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/sheet_style_close_focused_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/sheet_style_close_focused_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/sheet_style_close_focused_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/sheet_style_close_focused_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/sheet_style_close_focused_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash_disabled.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash_disabled.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash_disabled.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash_disabled.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_dash_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_focused_normal.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_focused_normal.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_focused_normal.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_focused_normal.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_focused_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_focused_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_focused_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_focused_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_focused_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_focused_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_focused_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_focused_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_unfocused.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_unfocused.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_unfocused.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_unfocused.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_unfocused_prelight.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_unfocused_prelight.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_unfocused_prelight.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_unfocused_prelight.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_unfocused_pressed.svg b/modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_unfocused_pressed.svg similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_unfocused_pressed.svg rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/unity/unmaximize_unfocused_pressed.svg diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-left-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-left-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-left-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-left-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-left-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-left-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-left-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-left-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-right-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-right-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-right-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-right-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-right-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-right-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-right-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/bottom-right-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/close-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/close-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/close-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/close-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/close-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/close-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/close-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/close-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/close-prelight.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/close-prelight.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/close-prelight.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/close-prelight.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/close-pressed.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/close-pressed.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/close-pressed.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/close-pressed.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-prelight.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-prelight.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-prelight.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-prelight.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-pressed.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-pressed.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-pressed.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/hide-pressed.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/left-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/left-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/left-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/left-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/left-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/left-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/left-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/left-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-prelight.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-prelight.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-prelight.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-prelight.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-pressed.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-pressed.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-pressed.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-pressed.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-prelight.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-prelight.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-prelight.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-prelight.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-pressed.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-pressed.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-pressed.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/maximize-toggled-pressed.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-prelight.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-prelight.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-prelight.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-prelight.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-pressed.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-pressed.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-pressed.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/menu-pressed.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/right-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/right-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/right-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/right-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/right-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/right-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/right-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/right-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-prelight.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-prelight.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-prelight.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-prelight.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-pressed.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-pressed.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-pressed.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-pressed.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-prelight.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-prelight.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-prelight.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-prelight.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-pressed.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-pressed.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-pressed.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/shade-toggled-pressed.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-prelight.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-prelight.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-prelight.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-prelight.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-pressed.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-pressed.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-pressed.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-pressed.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-prelight.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-prelight.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-prelight.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-prelight.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-pressed.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-pressed.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-pressed.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/stick-toggled-pressed.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/themerc b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/themerc similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/themerc rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/themerc diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-1-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-1-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-1-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-1-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-1-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-1-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-1-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-1-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-2-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-2-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-2-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-2-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-2-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-2-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-2-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-2-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-3-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-3-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-3-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-3-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-3-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-3-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-3-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-3-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-4-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-4-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-4-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-4-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-4-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-4-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-4-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-4-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-5-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-5-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-5-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-5-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-5-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-5-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/title-5-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/title-5-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/top-left-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/top-left-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/top-left-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/top-left-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/top-left-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/top-left-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/top-left-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/top-left-inactive.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/top-right-active.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/top-right-active.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/top-right-active.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/top-right-active.xpm diff --git a/users/files/oomox-gruvmox-dark-medium-default/xfwm4/top-right-inactive.xpm b/modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/top-right-inactive.xpm similarity index 100% rename from users/files/oomox-gruvmox-dark-medium-default/xfwm4/top-right-inactive.xpm rename to modules/desktop/files/oomox-gruvmox-dark-medium-default/xfwm4/top-right-inactive.xpm diff --git a/users/files/ranger/commands.py b/modules/desktop/files/ranger/commands.py similarity index 100% rename from users/files/ranger/commands.py rename to modules/desktop/files/ranger/commands.py diff --git a/users/files/ranger/rc.conf b/modules/desktop/files/ranger/rc.conf similarity index 100% rename from users/files/ranger/rc.conf rename to modules/desktop/files/ranger/rc.conf diff --git a/users/files/ranger/rifle.conf b/modules/desktop/files/ranger/rifle.conf similarity index 100% rename from users/files/ranger/rifle.conf rename to modules/desktop/files/ranger/rifle.conf diff --git a/users/files/ranger/scope.sh b/modules/desktop/files/ranger/scope.sh similarity index 100% rename from users/files/ranger/scope.sh rename to modules/desktop/files/ranger/scope.sh diff --git a/users/files/scripts/mpd_status.sh b/modules/desktop/files/scripts/mpd_status.sh similarity index 100% rename from users/files/scripts/mpd_status.sh rename to modules/desktop/files/scripts/mpd_status.sh diff --git a/users/files/scripts/screenshot.sh b/modules/desktop/files/scripts/screenshot.sh similarity index 100% rename from users/files/scripts/screenshot.sh rename to modules/desktop/files/scripts/screenshot.sh diff --git a/users/files/wallpaper.png b/modules/desktop/files/wallpaper.png similarity index 100% rename from users/files/wallpaper.png rename to modules/desktop/files/wallpaper.png diff --git a/users/files/xmobarrc b/modules/desktop/files/xmobarrc similarity index 100% rename from users/files/xmobarrc rename to modules/desktop/files/xmobarrc diff --git a/users/files/xmonad.hs b/modules/desktop/files/xmonad.hs similarity index 100% rename from users/files/xmonad.hs rename to modules/desktop/files/xmonad.hs diff --git a/modules/desktop/htop.nix b/modules/desktop/htop.nix new file mode 100644 index 0000000..a08cf59 --- /dev/null +++ b/modules/desktop/htop.nix @@ -0,0 +1,48 @@ +{ config, lib, pkgs, ... }: + +with lib; +with lib.my; +let cfg = config.modules.desktop.htop; +in { + options.modules.desktop.htop = { + enable = mkBoolOpt false; + }; + config = mkIf cfg.enable { + home-manager.users.${config.user.name} = { config, ... }: { + programs.htop = { + enable = true; + settings = { + hide_userland_threads = true; + highlight_base_name = true; + vim_mode = true; + fields = with config.lib.htop.fields;[ + PID + USER + M_RESIDENT + M_SHARE + STATE + PERCENT_CPU + PERCENT_MEM + IO_RATE + TIME + COMM + ]; + } // ( + with config.lib.htop; leftMeters [ + (bar "LeftCPUs2") + (bar "CPU") + (bar "Memory") + (bar "Swap") + ] + ) // ( + with config.lib.htop; rightMeters [ + (bar "RightCPUs2") + (text "Tasks") + (text "LoadAverage") + (text "Uptime") + ] + ); + }; + }; + }; +} diff --git a/modules/desktop/mpd.nix b/modules/desktop/mpd.nix new file mode 100644 index 0000000..fafab2d --- /dev/null +++ b/modules/desktop/mpd.nix @@ -0,0 +1,37 @@ +{ config, lib, pkgs, ... }: + +with lib; +with lib.my; +let cfg = config.modules.desktop.mpd; +in { + options.modules.desktop.mpd = { + enable = mkBoolOpt false; + }; + config = mkIf cfg.enable { + home-manager.users.${config.user.name} = { config, ... }: { + services.mpd = + { + enable = true; + network.listenAddress = "any"; + musicDirectory = "${config.home.homeDirectory}/Nextcloud/Media/Music"; + playlistDirectory = "${config.home.homeDirectory}/Nextcloud/Playlists"; + extraConfig = '' + max_output_buffer_size "16384" + auto_update "yes" + audio_output { + type "pulse" + name "pulse audio" + device "pulse" + mixer_type "hardware" + } + audio_output { + type "fifo" + name "toggle_visualizer" + path "/tmp/mpd.fifo" + format "44100:16:2" + } + ''; + }; + }; + }; +} diff --git a/modules/desktop/neovim.nix b/modules/desktop/neovim.nix new file mode 100644 index 0000000..2837412 --- /dev/null +++ b/modules/desktop/neovim.nix @@ -0,0 +1,46 @@ +{ config, lib, pkgs, ... }: + +with lib; +with lib.my; +let cfg = config.modules.desktop.neovim; +in { + options.modules.desktop.neovim = { + enable = mkBoolOpt false; + }; + config = mkIf cfg.enable { + home-manager.users.${config.user.name} = { + programs.neovim = { + enable = true; + vimAlias = true; + plugins = with pkgs; [ + vimPlugins.gruvbox-community + vimPlugins.vim-airline + vimPlugins.vim-airline-themes + vimPlugins.vim-gitgutter + vimPlugins.nerdtree + vimPlugins.nerdtree-git-plugin + vimPlugins.ctrlp-vim + vimPlugins.tabular + ]; + extraConfig = '' + let g:gruvbox_italic=1 + colorscheme gruvbox + set background=dark + let g:airline_powerline_fonts = 1 + autocmd VimEnter * hi Normal ctermbg=NONE guibg=NONE + + "Toggle NERDTree with Ctrl-N + map :NERDTreeToggle + + "Show hidden files in NERDTree + let NERDTreeShowHidden=1 + + set number relativenumber + set ignorecase + + vnoremap . :norm. + ''; + }; + }; + }; +} diff --git a/users/froidmpa/p10k.zsh b/modules/desktop/p10k.zsh similarity index 100% rename from users/froidmpa/p10k.zsh rename to modules/desktop/p10k.zsh diff --git a/modules/desktop/vscode.nix b/modules/desktop/vscode.nix new file mode 100644 index 0000000..770f2e2 --- /dev/null +++ b/modules/desktop/vscode.nix @@ -0,0 +1,71 @@ +{ config, lib, pkgs, ... }: + +with lib; +with lib.my; +let cfg = config.modules.desktop.vscode; +in { + options.modules.desktop.vscode = { + enable = mkBoolOpt false; + }; + config = mkIf cfg.enable { + home-manager.users.${config.user.name} = { + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = ( + with pkgs.vscode-extensions; [ + pkief.material-icon-theme + jnoortheen.nix-ide + arrterian.nix-env-selector + scala-lang.scala + scalameta.metals + hashicorp.terraform + bradlc.vscode-tailwindcss + asciidoctor.asciidoctor-vscode + ] + ); + userSettings = { + "editor.formatOnSave" = true; + "editor.quickSuggestions" = { + "strings" = true; + }; + "tailwindCSS.includeLanguages" = { + "scala" = "html"; + }; + "tailwindCSS.experimental.classRegex" = [ + [ "cls\\(([^)]*)\\)" "\"([^']*)\"" ] + [ "cls\\s*:=\\s*\\(?([^,^\\n^\\)]*)" "\"([^']*)\"" ] + ]; + + "files.autoSave" = "onFocusChange"; + "files.watcherExclude" = { + "**/.bloop" = true; + "**/.metals" = true; + "**/.ammonite" = true; + }; + "gruvboxMaterial.darkContrast" = "hard"; + "metals.millScript" = "mill"; + "nix.enableLanguageServer" = true; + "terminal.integrated.confirmOnExit" = "hasChildProcesses"; + "terraform.languageServer" = { + "external" = true; + "pathToBinary" = ""; + "args" = [ + "serve" + ]; + "maxNumberOfProblems" = 100; + "trace.server" = "off"; + }; + "workbench.colorTheme" = "Gruvbox Material Dark"; + "workbench.iconTheme" = "material-icon-theme"; + "asciidoc.use_kroki" = true; + "explorer.confirmDelete" = false; + "explorer.confirmDragAndDrop" = false; + "terminal.integrated.shellIntegration.enabled" = false; + "terminal.external.linuxExec" = "alacritty"; + "terminal.integrated.scrollback" = 65535; + }; + }; + }; + }; +} diff --git a/modules/desktop/xmonad.nix b/modules/desktop/xmonad.nix new file mode 100644 index 0000000..ef852b7 --- /dev/null +++ b/modules/desktop/xmonad.nix @@ -0,0 +1,37 @@ +{ options, config, lib, pkgs, ... }: + +with lib; +with lib.my; + +let cfg = config.modules.desktop.xmonad; +in { + options.modules.desktop.xmonad = { + enable = mkBoolOpt false; + }; + + config = mkIf cfg.enable { + + services.xserver = { + enable = true; + layout = "fr"; + desktopManager.xterm.enable = false; + windowManager.xmonad.enable = true; + displayManager.lightdm = { + enable = true; + background = "/etc/nixos/configs/files/wallpaper.png"; + greeters.mini.enable = true; + }; + }; + + home-manager.users.${config.user.name} = { + xsession = { + windowManager.xmonad = { + enable = true; + enableContribAndExtras = true; + config = ./files/xmonad.hs; + }; + }; + }; + + }; +} diff --git a/modules/desktop/zsh.nix b/modules/desktop/zsh.nix new file mode 100644 index 0000000..0ef7c14 --- /dev/null +++ b/modules/desktop/zsh.nix @@ -0,0 +1,66 @@ +{ config, lib, pkgs, ... }: + +with lib; +with lib.my; +let cfg = config.modules.desktop.zsh; +in { + options.modules.desktop.zsh = { + enable = mkBoolOpt false; + }; + config = mkIf cfg.enable { + + environment.pathsToLink = [ "/share/zsh" ]; + + home-manager.users.${config.user.name} = { + programs.zsh = + { + enable = true; + history = { + save = 50000; + size = 50000; + }; + enableCompletion = true; + enableAutosuggestions = true; + enableSyntaxHighlighting = true; + initExtra = '' + source ${./p10k.zsh} + autoload -Uz up-line-or-beginning-search down-line-or-beginning-search + zle -N up-line-or-beginning-search + zle -N down-line-or-beginning-search + + [[ -n "$key[Up]" ]] && bindkey -- "$key[Up]" up-line-or-beginning-search + [[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search + + eval $(${pkgs.thefuck}/bin/thefuck --alias) + ''; + oh-my-zsh = { + enable = true; + plugins = [ + "git" + "terraform" + "systemd" + ]; + }; + plugins = [ + { + name = "powerlevel10k"; + src = pkgs.zsh-powerlevel10k; + file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; + } + { + name = "powerlevel10k-config"; + src = ./p10k.zsh; + } + { + name = "nix-zsh-completions"; + src = pkgs.nix-zsh-completions; + } + { + name = "zsh-completions"; + src = pkgs.zsh-completions; + } + ]; + }; + }; + }; +} diff --git a/modules/options.nix b/modules/options.nix new file mode 100644 index 0000000..c8b1525 --- /dev/null +++ b/modules/options.nix @@ -0,0 +1,32 @@ +{ config, options, lib, home-manager, ... }: + +with lib; +with lib.my; +{ + options = with types; { + user = mkOpt attrs { }; + }; + + config = { + + user = { + name = "froidmpa"; + description = "The primary user account"; + extraGroups = [ "wheel" "adbusers" ]; + isNormalUser = true; + }; + + users.users.${config.user.name} = mkAliasDefinitions options.user; + + home-manager = { + useUserPackages = true; + + users.${config.user.name} = { + home = { + stateVersion = config.system.stateVersion; + }; + }; + }; + + }; +} diff --git a/modules/system.nix b/modules/system.nix index 443ab83..5b03957 100644 --- a/modules/system.nix +++ b/modules/system.nix @@ -20,15 +20,6 @@ lsof dnsutils ]; - fonts = { - fonts = with pkgs.unstable; [ - corefonts # Microsoft free fonts - meslo-lgs-nf - ]; - fontconfig.defaultFonts = { - monospace = [ "MesloLGS NF" ]; - }; - }; sound.enable = true; hardware.pulseaudio.enable = true; @@ -43,16 +34,6 @@ }; programs.ssh.startAgent = true; - services.xserver = { - enable = true; - layout = "fr"; - desktopManager.xterm.enable = false; - windowManager.xmonad.enable = true; - displayManager.lightdm = { - enable = true; - background = "/etc/nixos/configs/files/wallpaper.png"; - }; - }; services.udisks2.enable = true; diff --git a/profiles/base.nix b/profiles/base.nix deleted file mode 100644 index b6ddaa3..0000000 --- a/profiles/base.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - imports = [ - ./../modules/system.nix - ./../modules/network.nix - ./../modules/virtualisation.nix - ./../modules/belgian-eid.nix - ]; - - time.timeZone = lib.mkDefault "Europe/Amsterdam"; - - i18n.defaultLocale = lib.mkDefault "en_US.UTF-8"; - - console = { - keyMap = lib.mkDefault "fr"; - }; -} diff --git a/users/default.nix b/users/default.nix deleted file mode 100644 index 12bc9ec..0000000 --- a/users/default.nix +++ /dev/null @@ -1,342 +0,0 @@ -{ inputs, config, lib, pkgs, ... }: -{ - - environment.pathsToLink = [ "/share/zsh" ]; - home-manager.users.froidmpa = { config, ... }: { - - imports = [ - ./froidmpa/alacritty.nix - ./froidmpa/neovim.nix - ./froidmpa/mpd.nix - ./froidmpa/dunst.nix - ./froidmpa/htop.nix - ./froidmpa/zsh.nix - ./froidmpa/vscode.nix - inputs.nix-doom-emacs.hmModule - ]; - - xsession = { - enable = true; - windowManager.xmonad = { - enable = true; - enableContribAndExtras = true; - config = ./files/xmonad.hs; - }; - initExtra = '' - keepassxc & - ''; - numlock.enable = true; - }; - - services = { - nextcloud-client.enable = true; - udiskie.enable = true; - gpg-agent = { - enable = true; - enableSshSupport = false; - pinentryFlavor = "gtk2"; - }; - stalonetray = { - enable = true; - config = { - geometry = "1x1-5+0"; - background = "#000000"; - transparent = true; - grow_gravity = "E"; - icon_gravity = "E"; - icon_size = "24"; - kludges = "force_icons_size"; - }; - }; - unclutter.enable = true; - pasystray.enable = true; - screen-locker = { - enable = false; - inactiveInterval = 5; - lockCmd = "${pkgs.i3lock}/bin/i3lock -e -f -c 000000 -i ~/.wallpaper.png"; - }; - emacs = { - enable = true; - client.enable = true; - }; - }; - - programs = { - gpg.enable = true; - git = { - enable = true; - userName = "Paul-Henri Froidmont"; - userEmail = "git.contact-57n2p@froidmont.org"; - signing = { - key = lib.mkDefault "3AC6F170F01133CE393BCD94BE948AFD7E7873BE"; - signByDefault = true; - }; - extraConfig = { - init.defaultBranch = "master"; - }; - }; - ssh = { - enable = true; - extraConfig = '' - # Force IPv4 otherwise git will try to use IPv6 which doesn't play well through a VPN - AddressFamily inet - ''; - }; - rofi = { - enable = true; - theme = "gruvbox-dark"; - terminal = "alacritty"; - }; - bat.enable = true; - jq.enable = true; - fzf.enable = true; - lesspipe.enable = true; - zathura.enable = true; - pazi.enable = true; - - broot = { - enable = true; - enableZshIntegration = true; - }; - command-not-found.enable = true; - direnv = { - enable = true; - enableZshIntegration = true; - nix-direnv.enable = true; - }; - doom-emacs = { - enable = true; - doomPrivateDir = ./files/doom.d; - emacsPackagesOverlay = final: prev: { - ob-ammonite = with final; (trivialBuild { - src = pkgs.fetchFromGitHub { - owner = "zwild"; - repo = "ob-ammonite"; - rev = "39937dff395e70aff76a4224fa49cf2ec6c57cca"; - sha256 = pkgs.lib.fakeSha256; - }; - pname = "ob-ammonite"; - packageRequires = [ s dash editorconfig ]; - }); - }; - }; - newsboat = { - enable = true; - autoReload = true; - urls = [ - { title = "Happy Path Programming"; tags = [ "podcast" "programming" ]; url = "https://anchor.fm/s/2ed56aa0/podcast/rss"; } - { title = "Antoine Goya"; tags = [ "video" "culture" "cinema" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC2qlgiYCCtaYpn2_blX01xg"; } - { title = "Berd"; tags = [ "video" "humor" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCRei8TBpt4r0WPZ7MkiKmVg"; } - { title = "Berm Peak"; tags = [ "video" "MTB" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCu8YylsPiu9XfaQC74Hr_Gw"; } - { title = "Berm Peak Express"; tags = [ "video" "MTB" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCOpP5PqrzODWpFU961acUbg"; } - { title = "code- Reinho"; tags = [ "video" "guns" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCNWs0QTTHm7yiPMwl0aynsg"; } - { title = "Computerphile"; tags = [ "video" "programming" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC9-y-6csu5WGm29I7JiwpnA"; } - { title = "Chronik Fiction"; tags = [ "video" "cinema" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCeah3nqu_v6KfpXrCzEARQw"; } - { title = "Domain of Science"; tags = [ "video" "science" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCxqAWLTk1CmBvZFPzeZMd9A"; } - { title = "Forged Alliance Forever"; tags = [ "video" "gaming" "faf" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCkAWiUu4QE172kv"; } - { title = "Grand Angle"; tags = [ "video" "finance" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCWtD8JN9hkxL5TJL_ktaNZA"; } - { title = "Gyle"; tags = [ "video" "gaming" "cast" "faf" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCzY7MBSgNLZOMxMIFwtf2bw"; } - { title = "Hygiène Mentale"; tags = [ "video" "philosophy" "zetetic" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCMFcMhePnH4onVHt2-ItPZw"; } - { title = "Institut des Libertés"; tags = [ "video" "finance" "politics" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCaqUCTIgFDtMhBeKeeejrkA"; } - { title = "Juste Milieu"; tags = [ "video" "politics" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCXh5HwvbyfD-GUVHLng9aGQ"; } - { title = "J'suis pas content TV"; tags = [ "video" "politics" "humor" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC9NB2nXjNtRabu3YLPB16Hg"; } - { title = "Kriss Papillon"; tags = [ "video" "culture" "philosophy" ]; url = "https://odysee.com/$/rss/@Kriss-Papillon:c"; } - { title = "Kruggsmash"; tags = [ "video" "storytelling" "gaming" ]; url = "https://www.youtube.com/@kruggsmash"; } - { title = "Kurzgesagt"; tags = [ "video" "science" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCsXVk37bltHxD1rDPwtNM8Q"; } - { title = "La Gauloiserie"; tags = [ "video" "guns" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC5Ph48LXovwS2hyAGfWwE9A"; } - { title = "La Pistolerie"; tags = [ "video" "guns" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCvAZXkucE9CVVxb5K8xTjPA"; } - { title = "Le Précepteur"; tags = [ "video" "philosophy" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCvRgiAmogg7a_BgQ_Ftm6fA"; } - { title = "La Tronche en Biais"; tags = [ "video" "philosophy" "zetetic" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCq-8pBMM3I40QlrhM9ExXJQ"; } - { title = "Luke Smith"; tags = [ "video" "linux" "philosophy" ]; url = "https://videos.lukesmith.xyz/feeds/videos.atom"; } - { title = "Maitre Luger"; tags = [ "video" "guns" "history" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC570onl32MV5vjAnmnjeycg"; } - { title = "Mental Outlaw"; tags = [ "video" "linux" ]; url = "https://odysee.com/$/rss/@AlphaNerd:8"; } - { title = "mozinor"; tags = [ "video" "humor" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCTIiKt_Bp4gKlFPtHeB3qGw"; } - { title = "NixOS"; tags = [ "video" "linux" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC3vIimi9q4AT8EgxYp_dWIw"; } - { title = "Numberphile"; tags = [ "video" "math" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCoxcjq-8xIDTYp3uz647V5A"; } - { title = "PostmodernJukebox"; tags = [ "video" "music" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCORIeT1hk6tYBuntEXsguLg"; } - { title = "r/NixOS"; tags = [ "video" "linux" "reddit" ]; url = "https://www.reddit.com/r/NixOS.rss"; } - { title = "r/Scala"; tags = [ "video" "linux" "programming" ]; url = "https://www.reddit.com/r/Scala.rss"; } - { title = "Real Engineering"; tags = [ "video" "science" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCR1IuLEqb6UEA_zQ81kwXfg"; } - { title = "Real Science"; tags = [ "video" "science" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC176GAQozKKjhz62H8u9vQQ"; } - { title = "Richard sur Terre"; tags = [ "video" "politics" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCZIR19yr81nmaP0pMfiMwxw"; } - { title = "Stevius"; tags = [ "video" "history" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCkWzOALDNDee3t9IfYoB2uQ"; } - { title = "TheDuelist"; tags = [ "video" "gaming" "cast" "faf" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCDDNS1XW0-o1FRPvaR9-pKA"; } - { title = "Tom Scott"; tags = [ "video" "science" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCBa659QWEk1AI4Tg--mrJ2A"; } - { title = "Victor Ferry"; tags = [ "video" "rhetoric" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCcueC-4NWGuPFQKzQWn5heA"; } - { title = "videogamedunkey"; tags = [ "video" "humor" "gaming" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCsvn_Po0SmunchJYOWpOxMg"; } - { title = "Vilebrequin"; tags = [ "video" "humor" "cars" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCC9mlCpyisiIpp9YA9xV-QA"; } - { title = "Vsauce"; tags = [ "video" "science" "philosophy" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC6nSFpj9HTCZ5t-N3Rm3-HA"; } - { title = "Wendover Productions"; tags = [ "video" "finance" "logistics" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC9RM-iSvTu1uPJb8X5yp3EQ"; } - { title = "Willow's Duality"; tags = [ "video" "gaming" "cast" "faf" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UC8lU7OuwPGDQibMhnvSvf1w"; } - { title = "ScienceEtonnante"; tags = [ "video" "science" ]; url = "https://www.youtube.com/feeds/videos.xml?channel_id=UCaNlbnghtwlsGF-KzAFThqA"; } - ]; - extraConfig = '' - macro v set browser "setsid -f ${pkgs.mpv}/bin/mpv --really-quiet --no-terminal" ; open-in-browser ; set browser brave - - # unbind keys - unbind-key ENTER - unbind-key j - unbind-key k - unbind-key J - unbind-key K - - # bind keys - vim style - bind-key j down - bind-key k up - bind-key l open - bind-key h quit - - color background color223 color0 - color listnormal color223 color0 - color listnormal_unread color2 color0 - color listfocus color223 color237 - color listfocus_unread color223 color237 - color info color8 color0 - color article color223 color0 - - # highlights - highlight article "^(Feed|Link):.*$" color11 default bold - highlight article "^(Title|Date|Author):.*$" color11 default bold - highlight article "https?://[^ ]+" color2 default underline - highlight article "\\[[0-9]+\\]" color2 default bold - highlight article "\\[image\\ [0-9]+\\]" color2 default bold - highlight feedlist "^─.*$" color6 color6 bold - ''; - }; - }; - - gtk = { - enable = true; - theme.name = "oomox-gruvmox-dark-medium-default"; - iconTheme.name = "oomox-gruvmox-dark-medium-default"; - }; - qt = { - enable = true; - platformTheme = "gtk"; - }; - - home = { - stateVersion = "20.09"; - - sessionVariables = { - QT_AUTO_SCREEN_SCALE_FACTOR = "0"; - }; - - keyboard = { - layout = "fr"; - options = [ "caps:escape" ]; - }; - - file = { - ".wallpaper.png".source = ./files/wallpaper.png; - ".xmonad/xmobarrc".source = ./files/xmobarrc; - ".config/ncmpcpp" = { - source = ./files/ncmpcpp; - recursive = true; - }; - ".xmonad/scripts" = { - source = ./files/scripts; - recursive = true; - }; - ".themes/oomox-gruvmox-dark-medium-default" = { - source = ./files/oomox-gruvmox-dark-medium-default; - recursive = true; - }; - ".config/ranger" = { - source = ./files/ranger; - recursive = true; - }; - ".config/ranger/plugins" = { - source = builtins.fetchGit { - url = "git://github.com/phfroidmont/ranger_devicons.git"; - rev = "e02b6a3203411b76616a0e4328245bf8b47c5dcc"; - }; - recursive = true; - }; - }; - - packages = with pkgs.unstable; [ - haskellPackages.xmobar - i3lock - ncmpcpp - mpc_cli - pulsemixer - feh - xorg.xbacklight - xorg.xinit - xorg.xwininfo - xorg.xkill - scrot - numix-gtk-theme - - # Ranger preview utils - w3m - xclip - odt2txt - - firefox - brave - keepassxc - krita - element-desktop - mpv - jellyfin-mpv-shim - mumble - libreoffice-fresh - onlyoffice-bin - thunderbird - portfolio - transmission-remote-gtk - monero-gui - - jdk - jetbrains.idea-community - httpie - - rnix-lsp - metals - nixpkgs-fmt - - zsh-syntax-highlighting - ranger - R - tldr - thefuck - atool - linuxPackages.perf - - glxinfo - steam - protontricks - lutris - dolphinEmu - ]; - }; - - - systemd.user.services.activitywatch = { - Unit.Description = "Start ActivityWatch"; - Service.Type = "simple"; - Service.ExecStart = "${pkgs.unstable.activitywatch-bin}/bin/aw-server"; - Install.WantedBy = [ "default.target" ]; - Service.Restart = "on-failure"; - Service.RestartSec = 5; - }; - systemd.user.services.activitywatch-afk = { - Unit.Description = "Start ActivityWatch AFK"; - Service.Type = "simple"; - Service.ExecStart = "${pkgs.unstable.activitywatch-bin}/bin/aw-watcher-afk"; - Install.WantedBy = [ "default.target" ]; - Service.Restart = "on-failure"; - Service.RestartSec = 5; - }; - systemd.user.services.activitywatch-window = { - Unit.Description = "Start ActivityWatch Window"; - Service.Type = "simple"; - Service.ExecStart = "${pkgs.unstable.activitywatch-bin}/bin/aw-watcher-window"; - Install.WantedBy = [ "default.target" ]; - Service.Restart = "on-failure"; - Service.RestartSec = 5; - }; - }; -} diff --git a/users/froidmpa/alacritty.nix b/users/froidmpa/alacritty.nix deleted file mode 100644 index 77ca1e1..0000000 --- a/users/froidmpa/alacritty.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - programs.alacritty = { - enable = true; - settings = { - colors = { - # (Gruvbox dark) - primary = { - background = "0x1d2021"; - foreground = "0xebdbb2"; - }; - normal = { - black = "0x282828"; - red = "0xcc241d"; - green = "0x98971a"; - yellow = "0xd79921"; - blue = "0x458588"; - magenta = "0xb16286"; - cyan = "0x689d6a"; - white = "0xa89984"; - }; - bright = { - black = "0x928374"; - red = "0xfb4934"; - green = "0xb8bb26"; - yellow = "0xfabd2f"; - blue = "0x83a598"; - magenta = "0xd3869b"; - cyan = "0x8ec07c"; - white = "0xebdbb2"; - }; - }; - window = { - title = "Alacritty"; - padding = { - x = 5; - y = 5; - }; - }; - scrolling.history = 65535; - font.size = 8; - key_bindings = [ - { - key = "Up"; - mods = "Control"; - action = "IncreaseFontSize"; - } - { - key = "Down"; - mods = "Control"; - action = "DecreaseFontSize"; - } - ]; - }; - }; -} diff --git a/users/froidmpa/dunst.nix b/users/froidmpa/dunst.nix deleted file mode 100644 index a84c45e..0000000 --- a/users/froidmpa/dunst.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - services.dunst = - { - enable = true; - settings = { - global = { - monitor = 0; - geometry = "350x5-30+50"; - transparency = 10; - font = "monospace 14"; - idle_threshold = 120; - allow_markup = "yes"; - format = "%s\n%b"; - show_age_threshold = 300; - word_wrap = "yes"; - sticky_history = "yes"; - sort = "yes"; - }; - frame = { - width = 3; - color = "#ebdbb2"; - }; - shortcuts = { - close = "ctrl+space"; - close_all = "ctrl+shift+space"; - history = "ctrl+grave"; - context = "ctrl+shift+period"; - }; - urgency_low = { - foreground = "#ebdbb2"; - background = "#32302f"; - timeout = 10; - }; - urgency_normal = { - foreground = "#ebdbb2"; - background = "#32302f"; - timeout = 10; - }; - urgency_critical = { - foreground = "#ebdbb2"; - background = "#32302f"; - timeout = 10; - }; - }; - }; -} diff --git a/users/froidmpa/htop.nix b/users/froidmpa/htop.nix deleted file mode 100644 index cbc1e18..0000000 --- a/users/froidmpa/htop.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - programs.htop = { - enable = true; - settings = { - hide_userland_threads = true; - highlight_base_name = true; - vim_mode = true; - fields = with config.lib.htop.fields;[ - PID - USER - M_RESIDENT - M_SHARE - STATE - PERCENT_CPU - PERCENT_MEM - IO_RATE - TIME - COMM - ]; - } // ( - with config.lib.htop; leftMeters [ - (bar "LeftCPUs2") - (bar "CPU") - (bar "Memory") - (bar "Swap") - ] - ) // ( - with config.lib.htop; rightMeters [ - (bar "RightCPUs2") - (text "Tasks") - (text "LoadAverage") - (text "Uptime") - ] - ); - }; -} diff --git a/users/froidmpa/mpd.nix b/users/froidmpa/mpd.nix deleted file mode 100644 index a63867c..0000000 --- a/users/froidmpa/mpd.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - services.mpd = - { - enable = true; - network.listenAddress = "any"; - musicDirectory = "${config.home.homeDirectory}/Nextcloud/Media/Music"; - playlistDirectory = "${config.home.homeDirectory}/Nextcloud/Playlists"; - extraConfig = '' - max_output_buffer_size "16384" - auto_update "yes" - audio_output { - type "pulse" - name "pulse audio" - device "pulse" - mixer_type "hardware" - } - audio_output { - type "fifo" - name "toggle_visualizer" - path "/tmp/mpd.fifo" - format "44100:16:2" - } - ''; - }; -} diff --git a/users/froidmpa/neovim.nix b/users/froidmpa/neovim.nix deleted file mode 100644 index 7002cfc..0000000 --- a/users/froidmpa/neovim.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - programs.neovim = { - enable = true; - vimAlias = true; - plugins = with pkgs; [ - vimPlugins.gruvbox-community - vimPlugins.vim-airline - vimPlugins.vim-airline-themes - vimPlugins.vim-gitgutter - vimPlugins.nerdtree - vimPlugins.nerdtree-git-plugin - vimPlugins.ctrlp-vim - vimPlugins.tabular - ]; - extraConfig = '' - let g:gruvbox_italic=1 - colorscheme gruvbox - set background=dark - let g:airline_powerline_fonts = 1 - autocmd VimEnter * hi Normal ctermbg=NONE guibg=NONE - - "Toggle NERDTree with Ctrl-N - map :NERDTreeToggle - - "Show hidden files in NERDTree - let NERDTreeShowHidden=1 - - set number relativenumber - set ignorecase - - vnoremap . :norm. - ''; - }; -} diff --git a/users/froidmpa/vscode.nix b/users/froidmpa/vscode.nix deleted file mode 100644 index 3a60701..0000000 --- a/users/froidmpa/vscode.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - programs.vscode = { - enable = true; - package = pkgs.vscodium; - extensions = ( - with pkgs.vscode-extensions; [ - pkief.material-icon-theme - jnoortheen.nix-ide - arrterian.nix-env-selector - scala-lang.scala - scalameta.metals - hashicorp.terraform - bradlc.vscode-tailwindcss - asciidoctor.asciidoctor-vscode - ] - ); - userSettings = { - "editor.formatOnSave" = true; - "editor.quickSuggestions" = { - "strings" = true; - }; - "tailwindCSS.includeLanguages" = { - "scala" = "html"; - }; - "tailwindCSS.experimental.classRegex" = [ - [ "cls\\(([^)]*)\\)" "\"([^']*)\"" ] - [ "cls\\s*:=\\s*\\(?([^,^\\n^\\)]*)" "\"([^']*)\"" ] - ]; - - "files.autoSave" = "onFocusChange"; - "files.watcherExclude" = { - "**/.bloop" = true; - "**/.metals" = true; - "**/.ammonite" = true; - }; - "gruvboxMaterial.darkContrast" = "hard"; - "metals.millScript" = "mill"; - "nix.enableLanguageServer" = true; - "terminal.integrated.confirmOnExit" = "hasChildProcesses"; - "terraform.languageServer" = { - "external" = true; - "pathToBinary" = ""; - "args" = [ - "serve" - ]; - "maxNumberOfProblems" = 100; - "trace.server" = "off"; - }; - "workbench.colorTheme" = "Gruvbox Material Dark"; - "workbench.iconTheme" = "material-icon-theme"; - "asciidoc.use_kroki" = true; - "explorer.confirmDelete" = false; - "explorer.confirmDragAndDrop" = false; - "terminal.integrated.shellIntegration.enabled" = false; - "terminal.external.linuxExec" = "alacritty"; - "terminal.integrated.scrollback" = 65535; - }; - }; -} diff --git a/users/froidmpa/zsh.nix b/users/froidmpa/zsh.nix deleted file mode 100644 index f78cd7a..0000000 --- a/users/froidmpa/zsh.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - programs.zsh = - { - enable = true; - history = { - save = 50000; - size = 50000; - }; - enableCompletion = true; - enableAutosuggestions = true; - enableSyntaxHighlighting = true; - initExtra = '' - source ${./p10k.zsh} - autoload -Uz up-line-or-beginning-search down-line-or-beginning-search - zle -N up-line-or-beginning-search - zle -N down-line-or-beginning-search - - [[ -n "$key[Up]" ]] && bindkey -- "$key[Up]" up-line-or-beginning-search - [[ -n "$key[Down]" ]] && bindkey -- "$key[Down]" down-line-or-beginning-search - - eval $(${pkgs.thefuck}/bin/thefuck --alias) - ''; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "terraform" - "systemd" - ]; - }; - plugins = [ - { - name = "powerlevel10k"; - src = pkgs.zsh-powerlevel10k; - file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; - } - { - name = "powerlevel10k-config"; - src = ./p10k.zsh; - } - { - name = "nix-zsh-completions"; - src = pkgs.nix-zsh-completions; - } - { - name = "zsh-completions"; - src = pkgs.zsh-completions; - } - ]; - }; -}