diff --git a/flake.nix b/flake.nix
index 3b01cf03..89b160f6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,197 +32,57 @@
};
outputs =
+ inputs@{ nixpkgs, ... }:
{
- nixpkgs,
- home-manager,
- plasma-manager,
- nix-index-database,
- iosevka-custom,
- base16,
- tt-schemes,
- ...
- }@inputs:
- let
- defaultSpecialArgs =
- {
- system ? "x86_64-linux",
- ...
- }:
- {
- inherit inputs;
- iosevkaCustom = {
- packages = iosevka-custom.outputs.packages.${system};
- names = iosevka-custom.outputs.names;
- };
- };
- defaultExtraSpecialArgs =
- { system }:
- let
- iosevkaCustom = {
- packages = iosevka-custom.outputs.packages.${system};
- names = iosevka-custom.outputs.names;
- };
- in
- {
- inherit inputs iosevkaCustom;
- inherit (plasma-manager.packages.${system}) rc2nix;
- accentColourName = "base0E";
- fonts = with iosevkaCustom; rec {
- sizes = {
- applications = 12;
- desktop = 10;
- popups = 14;
- terminal = 12;
- };
- serif = sansSerif;
- sansSerif = {
- name = names.iosevka-custom-aile;
- package = packages.iosevka-custom-aile;
- };
- monospace = {
- name = names.iosevka-custom-nerdfont;
- package = packages.iosevka-custom-nerdfont;
- };
- };
- };
- defaultModules =
- {
- system ? "x86_64-linux",
- username ? "pixelifytica",
- hostName ? "Atlas",
- loginShell ? "bash",
- ...
- }:
- [
- home-manager.nixosModules.home-manager
- ./system/default.nix
- ./system/${hostName}.nix
- ./system/hardware-configuration/${hostName}.nix
- (
- {
- config,
- lib,
- pkgs,
- ...
- }:
- {
- networking = {
- inherit hostName;
- };
- nix = {
- package = pkgs.nixVersions.latest;
- settings.trusted-users = [ username ];
- };
- programs.${loginShell} = lib.mkIf (loginShell != "bash") { enable = true; };
- users.users.${username} = {
- shell = pkgs.${loginShell};
- group = "users";
- isNormalUser = true;
- description = "Evie Litherland-Smith";
- extraGroups = [
- "networkmanager"
- "wheel"
- "video"
- "input"
- "uinput"
- "dialout"
- ];
- initialHashedPassword = "$y$j9T$tHIPQt09Kf3KH2eIRze3g/$2mwSlcq27DTGvHNPJ5EP9/1CfL3bXP0F6oS/Vuffmn3";
- openssh = {
- inherit (config.users.users.root.openssh) authorizedKeys;
- };
- };
- home-manager = {
- extraSpecialArgs = defaultExtraSpecialArgs { inherit system; };
- useGlobalPkgs = true;
- useUserPackages = true;
- backupFileExtension = "backup";
- users.${username} = {
- imports = [
- base16.homeManagerModule
- nix-index-database.hmModules.nix-index
- { scheme = "${tt-schemes}/base16/one-light.yaml"; }
- ./home/${hostName}.nix
- ];
- home = {
- inherit username;
- homeDirectory = "/home/${username}";
- stateVersion = "23.05";
- };
- programs.home-manager.enable = true;
- nixpkgs.config.allowUnfree = true;
- };
- };
- }
- )
- ];
- in
- {
- devShells.x86_64-linux.default =
- let
- pkgs = import nixpkgs { system = "x86_64-linux"; };
- in
- pkgs.mkShellNoCC {
- packages = with pkgs; [
- nil
- pre-commit
- ];
- shellHook = "pre-commit install --install-hooks";
- };
nixosConfigurations = {
## Server
- Legion =
- let
- system = "x86_64-linux";
+ Legion = nixpkgs.lib.nixosSystem {
+ specialArgs = {
+ inherit inputs;
username = "pixelifytica";
hostName = "Legion";
- in
- nixpkgs.lib.nixosSystem {
- specialArgs = defaultSpecialArgs { inherit system; };
- modules = defaultModules { inherit system username hostName; };
+ loginShell = "bash";
};
+ modules = [ ./system/default.nix ];
+ };
## Personal
- Vanguard =
- let
- system = "x86_64-linux";
+ Vanguard = nixpkgs.lib.nixosSystem {
+ specialArgs = {
+ inherit inputs;
username = "pixelifytica";
hostName = "Vanguard";
- in
- nixpkgs.lib.nixosSystem {
- specialArgs = defaultSpecialArgs { inherit system; };
- modules = defaultModules { inherit system username hostName; };
+ loginShell = "bash";
};
- Northstar =
- let
- system = "x86_64-linux";
+ modules = [ ./system/default.nix ];
+ };
+ Northstar = nixpkgs.lib.nixosSystem {
+ specialArgs = {
+ inherit inputs;
username = "pixelifytica";
hostName = "Northstar";
- in
- nixpkgs.lib.nixosSystem {
- specialArgs = defaultSpecialArgs { inherit system; };
- modules = defaultModules { inherit system username hostName; };
+ loginShell = "bash";
};
+ modules = [ ./system/default.nix ];
+ };
## Work
- Tone =
- let
- system = "x86_64-linux";
+ Tone = nixpkgs.lib.nixosSystem {
+ specialArgs = {
+ inherit inputs;
username = "elitherl";
hostName = "Tone";
- in
- nixpkgs.lib.nixosSystem {
- specialArgs = defaultSpecialArgs { inherit system; };
- modules = defaultModules { inherit system username hostName; };
+ loginShell = "bash";
};
- Ronin =
- let
- system = "x86_64-linux";
+ modules = [ ./system/default.nix ];
+ };
+ Ronin = nixpkgs.lib.nixosSystem {
+ specialArgs = {
+ inherit inputs;
username = "elitherl";
hostName = "Ronin";
- in
- nixpkgs.lib.nixosSystem {
- specialArgs = defaultSpecialArgs { inherit system; };
- modules = defaultModules { inherit system username hostName; };
+ loginShell = "bash";
};
+ modules = [ ./system/default.nix ];
+ };
};
};
}
diff --git a/home/Legion.nix b/home/Legion.nix
deleted file mode 100644
index 46c1ed21..00000000
--- a/home/Legion.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
- imports = [ ./shell/default.nix ];
-}
diff --git a/home/Northstar.nix b/home/Northstar.nix
deleted file mode 100644
index ddad79e3..00000000
--- a/home/Northstar.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ ... }:
-{
- imports = [
- ./personal.nix
- ./desktop/plasma/default.nix
- ];
- programs.plasma = {
- # input.touchpads = [
- # {
- # disableWhileTyping = true;
- # enable = true;
- # name = "SYNA32AA:00 06CB:CE17 Touchpad";
- # naturalScroll = true;
- # productId = "52759";
- # tapToClick = true;
- # vendorId = "1739";
- # }
- # ];
- configFile = {
- bluedevilglobalrc.Global.launchState.value = "disable";
- };
- };
-}
diff --git a/home/Ronin.nix b/home/Ronin.nix
deleted file mode 100644
index 8c3dc6d8..00000000
--- a/home/Ronin.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ ... }:
-{
- imports = [
- ./work.nix
- ./desktop/plasma/default.nix
- ];
- programs.plasma = {
- # input.touchpads = [
- # {
- # disableWhileTyping = true;
- # enable = true;
- # name = "DELL0A21:00 0488:1024 Touchpad";
- # naturalScroll = true;
- # productId = "1024";
- # tapToClick = true;
- # vendorId = "0488";
- # }
- # ];
- configFile = {
- bluedevilglobalrc.Global.launchState.value = "disable";
- };
- };
-}
diff --git a/home/Tone.nix b/home/Tone.nix
deleted file mode 100644
index 214ba4fc..00000000
--- a/home/Tone.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
- imports = [
- ./work.nix
- ./desktop/plasma/default.nix
- ];
-}
diff --git a/home/Vanguard.nix b/home/Vanguard.nix
deleted file mode 100644
index 7990e1dc..00000000
--- a/home/Vanguard.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ pkgs, osConfig, ... }:
-{
- imports = [
- ./personal.nix
- ./games/default.nix
- ./streaming/default.nix
- ./desktop/plasma/default.nix
- ];
- home.packages = with pkgs; [
- kdePackages.ktorrent
- krita
- prusa-slicer
- blender
- freecad
- openscad
- kicad-small
- ];
- programs.plasma = {
- configFile = {
- bluedevilglobalrc.Global.launchState.value = "enable";
- };
- };
- xdg.configFile = {
- "autostart/org.kde.ktorrent.desktop".source = "${pkgs.kdePackages.ktorrent}/share/applications/org.kde.ktorrent.desktop";
- "autostart/webcord.desktop".source = "${pkgs.webcord}/share/applications/webcord.desktop";
- "autostart/steam.desktop".source = "${osConfig.programs.steam.package}/share/applications/steam.desktop";
- };
-}
diff --git a/home/default.nix b/home/default.nix
deleted file mode 100644
index 9cd7becf..00000000
--- a/home/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- config,
- pkgs,
- accentColourName,
- ...
-}:
-{
- imports = [
- # Programs
- ./desktop/default.nix
- ./shell/default.nix
- ./alacritty/default.nix
- ./emacs/default.nix
- ./browser/default.nix
- # Services
- ./services/email/default.nix
- ./services/password-store/default.nix
- # Additional Scripts
- ./scripts/default.nix
- ];
- home.packages = with pkgs; [
- libreoffice-qt-fresh
- krdc
- tokodon
- ferdium
- webcord
- signal-desktop
- teams-for-linux
- ];
- xdg.configFile = {
- "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
- "autostart/ferdium.desktop".source = "${pkgs.ferdium}/share/applications/ferdium.desktop";
- "Ferdium/config/settings.json".text =
- let
- accentColor = config.scheme.withHashtag.${accentColourName};
- in
- builtins.toJSON (
- import ./config/ferdium.nix {
- inherit accentColor;
- progressbarAccentColor = accentColor;
- }
- );
- "teams-for-linux/config.json".text = builtins.toJSON (import ./config/teams-for-linux.nix);
- };
-}
diff --git a/home/desktop/sway/avizo/default.nix b/home/desktop/sway/avizo/default.nix
deleted file mode 100644
index 5790cf47..00000000
--- a/home/desktop/sway/avizo/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, accentColourName, ... }:
-{
- services.avizo = {
- enable = true;
- settings.default =
- let
- sc = config.scheme;
- rgba =
- colourName: "${sc."${colourName}-rgb-r"}, ${sc."${colourName}-rgb-g"}, ${sc."${colourName}-rgb-b"}";
- in
- {
- background = "rgba(${rgba "base00"}, 0.9)";
- bar-bg-color = "rgba(${rgba "base00"}, 0.9)";
- bar-fg-color = "rgba(${rgba "base05"}, 1.0)";
- border-color = "rgba(${rgba accentColourName}, 1.0)";
- image-opacity = "1.0";
- };
- };
-}
diff --git a/home/desktop/sway/default.nix b/home/desktop/sway/default.nix
deleted file mode 100644
index 48958818..00000000
--- a/home/desktop/sway/default.nix
+++ /dev/null
@@ -1,285 +0,0 @@
-{
- config,
- lib,
- pkgs,
- fonts,
- accentColourName,
- ...
-}:
-let
- set-background = pkgs.writeShellScriptBin "set-background" ''
- ${pkgs.swaybg}/bin/swaybg -m fill -i ${../wallpapers/landscapes/tropic_island_day.jpg}
- '';
-in
-{
- imports = [
- ../default.nix
- ./avizo/default.nix
- ./fuzzel/default.nix
- ./swaylock/default.nix
- ./swayidle/default.nix
- ./swaync/default.nix
- ./waybar/default.nix
- ./wlogout/default.nix
- ];
- home.packages = with pkgs; [
- set-background
- pinentry-gnome3
- gnome.seahorse
- ffmpeg
- evince
- grim
- slurp
- swayimg
- swaybg
- (writeShellScriptBin "protonmail-setup-bridge" ''
- pkill -9 -f protonmail-bridge
- ${protonmail-bridge}/bin/protonmail-bridge -c
- swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n"
- '')
- (writeShellScriptBin "davmail-setup" ''
- systemctl --user restart davmail # Ensure config file is present
- systemctl --user stop davmail
- ${davmail}/bin/davmail -n ~/.davmail.properties
- systemctl --user restart davmail
- '')
- ];
- programs = {
- waybar.systemd.target = "sway-session.target";
- alacritty.settings.window = {
- decorations = "none";
- opacity = 0.85;
- };
- };
- services = {
- kanshi.systemdTarget = "sway-session.target";
- gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
- avizo.enable = true;
- kdeconnect = {
- enable = true;
- indicator = true;
- };
- udiskie = {
- enable = true;
- notify = true;
- automount = true;
- tray = "never";
- };
- };
- gtk =
- let
- toCapital = import ../lib/to_capital.nix lib;
- in
- {
- enable = true;
- theme = {
- package = pkgs.materia-theme;
- name = "Materia-${config.scheme.variant}";
- };
- iconTheme = {
- package = pkgs.papirus-icon-theme.override { color = "violet"; };
- name = "Papirus-${toCapital config.scheme.variant}";
- };
- };
- wayland.windowManager.sway = {
- enable = true;
- package = pkgs.swayfx.overrideAttrs (old: {
- passthru.providedSessions = [ "sway" ];
- });
- swaynag.enable = true;
- systemd.enable = true;
- xwayland = true;
- checkConfig = false;
- config = {
- input = {
- "*" = {
- xkb_layout = "gb";
- xkb_options = "ctrl:nocaps";
- };
- "type:touchpad" = {
- tap = "enabled";
- natural_scroll = "enabled";
- };
- };
- seat = {
- "seat0" = {
- xcursor_theme = with config.gtk.cursorTheme; "${name} ${toString size}";
- };
- };
- modifier = "Mod4";
- terminal = "${config.programs.alacritty.package}/bin/alacritty";
- menu = "${config.programs.fuzzel.package}/bin/fuzzel";
- workspaceAutoBackAndForth = true;
- bars = [ ];
- gaps = {
- inner = 5;
- outer = 0;
- };
- fonts = {
- names = [ fonts.monospace.name ];
- style = "regular";
- size = fonts.sizes.desktop * 1.0;
- };
- colors =
- let
- sc = config.scheme.withHashtag;
- text = toString sc.base05;
- indicator = toString sc.${accentColourName};
- background = toString sc.base00;
- in
- {
- inherit background;
- focused =
- let
- border = toString sc.${accentColourName};
- in
- {
- inherit
- background
- text
- indicator
- border
- ;
- childBorder = border;
- };
- focusedInactive =
- let
- border = toString sc.base04;
- in
- {
- inherit
- background
- text
- indicator
- border
- ;
- childBorder = border;
- };
- unfocused =
- let
- border = toString sc.base03;
- in
- {
- inherit
- background
- text
- indicator
- border
- ;
- childBorder = border;
- };
- urgent =
- let
- border = toString sc.red;
- in
- {
- inherit
- background
- text
- indicator
- border
- ;
- childBorder = border;
- };
- };
- startup = [
- { command = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"; }
- { command = "${set-background}/bin/set-background"; }
- ];
- window = {
- border = 1;
- titlebar = false;
- commands = [
- {
- criteria.window_role = "(?:pop-up|bubble|dialog)";
- command = "floating enable";
- }
- {
- criteria.app_id = "(?:org\.kde\.polkit-kde-authentication-agent-1|Pinentry|pavucontrol|\.blueman-manager-wrapped|nm-connection-editor)";
- command = "floating enable";
- }
- {
- criteria.class = "(?:[Mm]atplotlib|.*\.py|Idl)";
- command = "floating enable";
- }
- {
- # Catch-all for file dialog windows
- criteria.title = "(?:Open|Save) (?:File|Folder|As)";
- command = "floating enable, resize set width 1030 height 710";
- }
- {
- # Inhibit idle when watching vidoes
- criteria.app_id = "(?:firefox|mpv)";
- command = "inhibit_idle fullscreen";
- }
- {
- # Window rules for game sessions.
- # Note: controllers don't reset idle timer
- criteria.class = "(?:steam_app|Minecraft).*";
- command = "floating enable, fullscreen enable, inhibit_idle focus";
- }
- ];
- };
- floating.border = 1;
- keybindings =
- with config;
- let
- modifier = wayland.windowManager.sway.config.modifier;
- in
- lib.mkOptionDefault {
- # Movement
- "${modifier}+comma" = "workspace prev";
- "${modifier}+period" = "workspace next";
- "${modifier}+shift+comma" = "move workspace prev";
- "${modifier}+shift+period" = "move workspace next";
- "${modifier}+bracketleft" = "move workspace to output left";
- "${modifier}+bracketright" = "move workspace to output right";
-
- # Function keys
- ## Sound
- "XF86AudioMute" = "exec ${services.avizo.package}/bin/volumectl %";
- "XF86AudioMicMute" = "exec ${services.avizo.package}/bin/volumectl -m %";
- "XF86AudioRaiseVolume" = "exec ${services.avizo.package}/bin/volumectl -u + 5";
- "XF86AudioLowerVolume" = "exec ${services.avizo.package}/bin/volumectl -u - 5";
-
- ## Playback
- "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
- "XF86AudioStop" = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
- "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl previous";
- "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl next";
-
- ## Brightness
- "XF86MonBrightnessUp" = "exec ${services.avizo.package}/bin/lightctl + 5";
- "XF86MonBrightnessDown" = "exec ${services.avizo.package}/bin/lightctl - 5";
-
- # System utilities
- "Mod4+Mod1+l" = "exec swaylockfx";
- "${modifier}+z" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw";
- "${modifier}+Shift+z" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client -d -sw";
- "${modifier}+Shift+p" = "exec ${programs.wlogout.package}/bin/wlogout";
- "${modifier}+Shift+Return" = "exec ${programs.emacs.finalPackage}/bin/emacsclient -c";
- };
- };
- extraConfig = ''
- bindgesture swipe:right workspace prev
- bindgesture swipe:left workspace next
- corner_radius 5
- blur enable
- blur_xray disable
- blur_passes 3
- blur_radius 5
- shadows enable
- shadow_blur_radius 5
- layer_effects "system-menu" blur enable; blur_ignore_transparent enable; shadows enable
- layer_effects "gtk-layer-shell" blur enable; blur_ignore_transparent enable; shadows enable
- layer_effects "notifications" blur enable; blur_ignore_transparent enable; shadows enable
- layer_effects "launcher" blur enable; blur_ignore_transparent enable; shadows enable
- layer_effects "logout_dialog" blur enable; blur_ignore_transparent enable; shadows enable
- layer_effects "waybar" blur enable; blur_ignore_transparent enable; shadows enable
- layer_effects "avizo" blur enable; blur_ignore_transparent enable; shadows enable
- layer_effects "swaync-notification-window" blur enable; blur_ignore_transparent enable; shadows enable
- layer_effects "swaync-control-center" blur enable; blur_ignore_transparent enable; shadows enable
- titlebar_separator enable
- '';
- };
-}
diff --git a/home/desktop/sway/foot/default.nix b/home/desktop/sway/foot/default.nix
deleted file mode 100644
index 7491e89a..00000000
--- a/home/desktop/sway/foot/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ config, fonts, ... }:
-{
- programs.foot = {
- enable = true;
- server.enable = true;
- settings = {
- main = {
- term = "xterm-256color";
- locked-title = false;
- font = "${fonts.monospace.name}:size=${toString fonts.sizes.applications}";
- dpi-aware = false;
- pad = "10x10";
- };
- bell = {
- urgent = false;
- notify = false;
- visual = false;
- };
- cursor = {
- blink = true;
- };
- mouse = {
- hide-when-typing = true;
- };
- colors = with config.scheme; rec {
- alpha = 0.85;
- background = base00;
- foreground = base05;
- regular0 = base02;
- regular1 = red;
- regular2 = green;
- regular3 = yellow;
- regular4 = blue;
- regular5 = magenta;
- regular6 = cyan;
- regular7 = base05;
- bright0 = base04;
- bright1 = regular1;
- bright2 = regular2;
- bright3 = regular3;
- bright4 = regular4;
- bright5 = regular5;
- bright6 = regular6;
- bright7 = base05;
- };
- };
- };
-}
diff --git a/home/desktop/sway/fuzzel/default.nix b/home/desktop/sway/fuzzel/default.nix
deleted file mode 100644
index 25aea3c2..00000000
--- a/home/desktop/sway/fuzzel/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- config,
- pkgs,
- fonts,
- accentColourName,
- ...
-}:
-{
- programs.fuzzel = {
- enable = true;
- settings = {
- main = {
- dpi-aware = false;
- font = "${fonts.monospace.name}:size=${toString fonts.sizes.popups}";
- icon-theme = config.gtk.iconTheme.name;
- icons-enabled = true;
- fields = "filename,name,generic,categories";
- fuzzy = true;
- filter-desktop = true;
- terminal =
- with config.programs;
- "${if alacritty.enable then alacritty.package else pkgs.alacritty}/bin/alacritty -e";
- lines = 24;
- width = 80;
- tabs = 4;
- layer = "overlay";
- };
- colors =
- let
- sc = config.scheme;
- in
- {
- background = "${sc.base00}cc"; # 80% Opacity
- text = "${sc.base05}ff";
- match = "${sc.red}ff";
- selection = "${sc.base01}ff";
- selection-text = "${sc.base05}ff";
- selection-match = "${sc.red}ff";
- border = "${sc.${accentColourName}}ff";
- };
- border = {
- width = 1;
- radius = 5;
- };
- };
- };
-}
diff --git a/home/desktop/sway/mako/default.nix b/home/desktop/sway/mako/default.nix
deleted file mode 100644
index 2c4fd4bc..00000000
--- a/home/desktop/sway/mako/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- config,
- fonts,
- accentColourName,
- ...
-}:
-{
- services.mako =
- let
- sc = config.scheme.withHashtag;
- in
- {
- enable = true;
- anchor = "top-right";
- font = "${fonts.monospace.name} ${toString fonts.sizes.popups}";
- layer = "top";
- markup = true;
- maxVisible = 10;
- icons = true;
- iconPath = with config.gtk.iconTheme; "${package}/share/icons/${name}";
- textColor = "${sc.base05}ff";
- progressColor = "over ${sc.red}ff";
- backgroundColor = "${sc.base00}cc";
- borderColor = "${sc.${accentColourName}}ff";
- borderRadius = 5;
- borderSize = 1;
- defaultTimeout = 0;
- };
-}
diff --git a/home/desktop/sway/rofi/default.nix b/home/desktop/sway/rofi/default.nix
deleted file mode 100644
index d027d3f3..00000000
--- a/home/desktop/sway/rofi/default.nix
+++ /dev/null
@@ -1,144 +0,0 @@
-{
- config,
- pkgs,
- fonts,
- accentColourName,
- ...
-}:
-{
- programs.rofi = {
- enable = true;
- package = pkgs.rofi-wayland;
- terminal =
- with config.programs;
- "${if alacritty.enable then alacritty.package else pkgs.alacritty}/bin/alacritty";
- font = fonts.monospace.name;
- location = "center";
- plugins = with pkgs; [ rofi-emoji ];
- extraConfig = {
- modi = "run,drun,ssh,window,emoji,combi";
- combi-modi = "drun,ssh,window,emoji";
- sidebar-mode = true;
- sort = true;
- sorting-method = "fzf";
- matching = "fuzzy";
- icon-theme = config.gtk.iconTheme.name;
- show-icons = true;
- application-fallback-icon = "application-x-addon";
- drun-display-format = "{icon} {name} ({categories})";
- disable-history = false;
- hide-scrollbar = true;
- display-run = " Run ";
- display-drun = " Apps ";
- display-ssh = " SSH ";
- display-window = " Move ";
- display-emoji = " Emoji ";
- display-combi = " Combi ";
- };
- theme =
- with builtins;
- let
- inherit (config.lib.formats.rasi) mkLiteral;
- sc = config.scheme;
- bg = mkLiteral "rgba (${sc.base00-rgb-r}, ${sc.base00-rgb-g}, ${sc.base00-rgb-b}, 80%)";
- bg2 = mkLiteral "rgba (${sc.base01-rgb-r}, ${sc.base01-rgb-g}, ${sc.base01-rgb-b}, 100%)";
- fg = mkLiteral sc.withHashtag.base05;
- fg2 = mkLiteral sc.withHashtag.base04;
- border = mkLiteral sc.withHashtag.${accentColour};
- blue = mkLiteral sc.withHashtag.blue;
- in
- {
- "*" = {
- background-color = mkLiteral "transparent";
- text-color = fg;
- font = with fonts; "${monospace.name} ${toString sizes.popups}";
- };
-
- window = {
- height = mkLiteral "75%";
- width = mkLiteral "75%";
- border = mkLiteral "1px";
- border-color = border;
- border-radius = mkLiteral "5px";
- background-color = bg;
- };
-
- inputbar = {
- children = map mkLiteral [
- "prompt"
- "entry"
- ];
- padding = mkLiteral "2px";
- };
-
- prompt = {
- background-color = bg2;
- padding = mkLiteral "6px";
- text-color = blue;
- border-radius = mkLiteral "5px";
- margin = mkLiteral "20px 0px 0px 20px";
- };
-
- textbox-prompt-colon = {
- expand = false;
- str = "=";
- };
-
- entry = {
- padding = mkLiteral "6px";
- margin = mkLiteral "20px 0px 0px 10px";
- };
-
- listview = {
- border = mkLiteral "0px 0px 0px";
- padding = mkLiteral "6px 0px 0px";
- margin = mkLiteral "10px 0px 0px 20px";
- columns = 2;
- lines = 5;
- };
-
- element = {
- padding = mkLiteral "5px";
- };
-
- "element-icon" = {
- size = mkLiteral "25px";
- };
-
- "element selected" = {
- background-color = bg2;
- text-color = blue;
- border-radius = mkLiteral "5px";
- };
-
- mode-switcher = {
- spacing = 0;
- };
-
- button = {
- padding = mkLiteral "10px";
- text-color = fg2;
- border-radius = mkLiteral "5px";
- vertical-align = mkLiteral "0.5";
- horizontal-align = mkLiteral "0.5";
- };
-
- "button selected" = {
- background-color = bg2;
- text-color = blue;
- };
-
- message = {
- margin = mkLiteral "2px";
- padding = mkLiteral "2px";
- border-radius = mkLiteral "5px";
- };
-
- textbox = {
- padding = mkLiteral "6px";
- margin = mkLiteral "20px 0px 0px 20px";
- text-color = blue;
- };
- };
- };
-}
diff --git a/home/desktop/sway/swayidle/default.nix b/home/desktop/sway/swayidle/default.nix
deleted file mode 100644
index 298a2a73..00000000
--- a/home/desktop/sway/swayidle/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, pkgs, ... }:
-{
- imports = [ ../swaylock/default.nix ];
- services.swayidle =
- let
- swaylockfx = pkgs.callPackage ../swaylock/swaylockfx.nix {
- swaylock-effects = config.programs.swaylock.package;
- };
- in
- {
- enable = true;
- timeouts = [
- {
- timeout = 60 * 15; # 15 minutes
- command = "${swaylockfx}/bin/swaylockfx";
- }
- ];
- };
-}
diff --git a/home/desktop/sway/swaylock/default.nix b/home/desktop/sway/swaylock/default.nix
deleted file mode 100644
index 443fe794..00000000
--- a/home/desktop/sway/swaylock/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- config,
- pkgs,
- accentColourName,
- ...
-}:
-{
- home.packages = with pkgs; [
- (callPackage ./swaylockfx.nix { swaylock-effects = config.programs.swaylock.package; })
- ];
- programs.swaylock = {
- enable = true;
- package = pkgs.swaylock-effects;
- # Settings are specifically for swaylock-effects
- settings =
- let
- sc = config.scheme;
- in
- {
- indicator-radius = 100;
- indicator-thickness = 10;
- indicator-caps-lock = true;
- ignore-empty-password = true;
- show-failed-attempts = true;
- effect-blur = "5x3";
- effect-vignette = "0.5:0.5";
- grace = 2;
- fade-in = 0.2;
- bs-hl-color = sc.base06;
- caps-lock-bs-hl-color = sc.base06;
- caps-lock-key-hl-color = sc.green;
- inside-color = "${sc.base00}cc";
- key-hl-color = sc.green;
- layout-bg-color = "${sc.base00}cc";
- layout-border-color = sc.${accentColourName};
- layout-text-color = sc.base05;
- ring-color = sc.${accentColourName};
- ring-clear-color = sc.base06;
- ring-caps-lock-color = sc.base09;
- ring-ver-color = sc.blue;
- ring-wrong-color = sc.red;
- separator-color = sc.base01;
- text-color = sc.base05;
- text-clear-color = sc.base06;
- text-caps-lock-color = sc.base09;
- text-ver-color = sc.blue;
- text-wrong-color = sc.red;
- };
- };
-}
diff --git a/home/desktop/sway/swaylock/swaylockfx.nix b/home/desktop/sway/swaylock/swaylockfx.nix
deleted file mode 100644
index c4d7945b..00000000
--- a/home/desktop/sway/swaylock/swaylockfx.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{ writeShellScriptBin, swaylock-effects, ... }:
-writeShellScriptBin "swaylockfx" "${swaylock-effects}/bin/swaylock --screenshots --clock --indicator --grace-no-mouse"
diff --git a/home/desktop/sway/swaync/default.nix b/home/desktop/sway/swaync/default.nix
deleted file mode 100644
index 2a234d6a..00000000
--- a/home/desktop/sway/swaync/default.nix
+++ /dev/null
@@ -1,363 +0,0 @@
-{
- config,
- pkgs,
- fonts,
- accentColourName,
- ...
-}:
-{
- home.packages = [ pkgs.swaynotificationcenter ];
- xdg.configFile."swaync/style.css".text =
- let
- sc = config.scheme.withHashtag;
- alpha = "0.85";
- alpha-background = "rgba(${config.scheme.base00-rgb-r}, ${config.scheme.base00-rgb-g}, ${config.scheme.base00-rgb-b}, ${alpha})";
- in
- ''
- * {
- all: unset;
- font-size: 1.2rem;
- font-family: "${fonts.monospace.name}";
- transition: 200ms;
- box-shadow: none;
- }
-
- .floating-notifications.background .notification-row .notification-background {
- border-radius: 5px;
- border: 1px solid ${sc.${accentColourName}};
- margin: 18px;
- background-color: ${alpha-background};
- color: ${sc.base05};
- padding: 0;
- }
-
- .floating-notifications.background
- .notification-row
- .notification-background
- .notification {
- padding: 7px;
- border-radius: 5px;
- }
-
- .floating-notifications.background
- .notification-row
- .notification-background
- .notification
- .notification-content {
- margin: 7px;
- }
-
- .floating-notifications.background
- .notification-row
- .notification-background
- .notification
- .notification-content
- .summary {
- color: ${sc.base05};
- }
-
- .floating-notifications.background
- .notification-row
- .notification-background
- .notification
- .notification-content
- .time {
- color: ${sc.base04};
- }
-
- .floating-notifications.background
- .notification-row
- .notification-background
- .notification
- .notification-content
- .body {
- color: ${sc.base05};
- }
-
- .floating-notifications.background
- .notification-row
- .notification-background
- .notification
- > *:last-child
- > * {
- min-height: 3.4em;
- }
-
- .floating-notifications.background
- .notification-row
- .notification-background
- .notification
- > *:last-child
- > *
- .notification-action {
- border-radius: 5px;
- background-color: ${sc.base01};
- color: ${sc.base05};
- margin: 7px;
- }
-
- .floating-notifications.background
- .notification-row
- .notification-background
- .notification
- > *:last-child
- > *
- .notification-action:hover {
- background-color: ${sc.base01};
- color: ${sc.base05};
- }
-
- .floating-notifications.background
- .notification-row
- .notification-background
- .notification
- > *:last-child
- > *
- .notification-action:active {
- background-color: ${sc.blue};
- color: ${sc.base00};
- }
-
- .floating-notifications.background
- .notification-row
- .notification-background
- .close-button {
- margin: 7px;
- padding: 2px;
- border-radius: 5px;
- background-color: ${sc.red};
- color: ${sc.base00};
- }
-
- .floating-notifications.background
- .notification-row
- .notification-background
- .close-button:hover {
- background-color: ${sc.red};
- color: ${sc.base00};
- }
-
- .floating-notifications.background
- .notification-row
- .notification-background
- .close-button:active {
- background-color: ${sc.red};
- color: ${sc.base00};
- }
-
- .control-center {
- border-radius: 5px;
- border: 1px solid ${sc.${accentColourName}};
- margin: 18px;
- background-color: ${alpha-background};
- color: ${sc.base05};
- padding: 14px;
- }
-
- .control-center .widget-title {
- color: ${sc.base05};
- font-size: 1.3em;
- }
-
- .control-center .widget-title button {
- border-radius: 7px;
- background-color: ${sc.base01};
- color: ${sc.base05};
- padding: 8px;
- }
-
- .control-center .widget-title button:hover {
- background-color: ${sc.base02};
- color: ${sc.base05};
- }
-
- .control-center .widget-title button:active {
- background-color: ${sc.base03};
- color: ${sc.base05};
- }
-
- .control-center .notification-row .notification-background {
- border-radius: 5px;
- background-color: ${sc.base01};
- color: ${sc.base05};
- margin-top: 14px;
- }
-
- .control-center .notification-row .notification-background .notification {
- padding: 7px;
- border-radius: 7px;
- }
-
- .control-center
- .notification-row
- .notification-background
- .notification
- .notification-content {
- margin: 7px;
- }
-
- .control-center
- .notification-row
- .notification-background
- .notification
- .notification-content
- .summary {
- color: ${sc.base05};
- }
-
- .control-center
- .notification-row
- .notification-background
- .notification
- .notification-content
- .time {
- color: ${sc.base04};
- }
-
- .control-center
- .notification-row
- .notification-background
- .notification
- .notification-content
- .body {
- color: ${sc.base05};
- }
-
- .control-center
- .notification-row
- .notification-background
- .notification
- > *:last-child
- > * {
- min-height: 3.4em;
- }
-
- .control-center
- .notification-row
- .notification-background
- .notification
- > *:last-child
- > *
- .notification-action {
- border-radius: 7px;
- background-color: ${sc.base00};
- color: ${sc.base05};
- margin: 7px;
- }
-
- .control-center
- .notification-row
- .notification-background
- .notification
- > *:last-child
- > *
- .notification-action:hover {
- background-color: ${sc.base01};;
- color: ${sc.base05};
- }
-
- .control-center
- .notification-row
- .notification-background
- .notification
- > *:last-child
- > *
- .notification-action:active {
- background-color: ${sc.blue};
- color: ${sc.base05};
- }
-
- .control-center .notification-row .notification-background .close-button {
- margin: 7px;
- padding: 2px;
- border-radius: 6.3px;
- background-color: ${sc.red};
- color: ${sc.base00};
- }
-
- .control-center .notification-row .notification-background .close-button:hover {
- background-color: ${sc.red};
- color: ${sc.base00};
- }
-
- .control-center
- .notification-row
- .notification-background
- .close-button:active {
- background-color: ${sc.red};
- color: ${sc.base00};
- }
-
- .control-center .notification-row .notification-background:hover {
- background-color: ${sc.base00};
- color: ${sc.base05};
- }
-
- .control-center .notification-row .notification-background:active {
- background-color: ${sc.blue};
- color: ${sc.base05};
- }
-
- progressbar,
- progress,
- trough {
- border-radius: 12.6px;
- }
-
- .notification.critical progress {
- background-color: ${sc.red};
- }
-
- .notification.low progress,
- .notification.normal progress {
- background-color: ${sc.blue};
- }
-
- trough {
- background-color: ${sc.base00};
- }
-
- .control-center trough {
- background-color: ${sc.base03};
- }
-
- .control-center-dnd {
- margin-top: 5px;
- border-radius: 8px;
- background: ${sc.base00};
- border: 1px solid ${sc.base03};
- }
-
- .control-center-dnd:checked {
- background: ${sc.base00};
- }
-
- .control-center-dnd slider {
- background: ${sc.base03};
- border-radius: 8px;
- }
-
- .widget-dnd {
- margin: 0px;
- font-size: 1.1rem;
- }
-
- .widget-dnd > switch {
- font-size: initial;
- border-radius: 8px;
- background: ${sc.base00};
- border: 1px solid ${sc.base03};
- }
-
- .widget-dnd > switch:checked {
- background: ${sc.base00};
- }
-
- .widget-dnd > switch slider {
- background: ${sc.base01};
- border-radius: 8px;
- border: 1px solid ${sc.${accentColourName}};
- }
-
- '';
-}
diff --git a/home/desktop/sway/waybar/default.nix b/home/desktop/sway/waybar/default.nix
deleted file mode 100644
index 51313064..00000000
--- a/home/desktop/sway/waybar/default.nix
+++ /dev/null
@@ -1,386 +0,0 @@
-{
- config,
- pkgs,
- fonts,
- accentColourName,
- ...
-}:
-{
- systemd.user.targets.tray.Unit = {
- Description = "Home Manager System Tray";
- Requires = [ "graphical-session.target" ];
- };
- programs.waybar = {
- enable = true;
- systemd.enable = true;
- settings.main = {
- name = "main";
- layer = "top";
- position = "top";
- # Layout
- "modules-left" = [
- "sway/workspaces"
- "sway/window"
- ];
- "modules-center" = [ ];
- "modules-right" = [
- "mpris"
- "custom/notification"
- "pulseaudio"
- "network"
- "bluetooth"
- "clock#calendar"
- "clock"
- "backlight"
- "battery"
- "custom/weather"
- "tray"
- ];
- # Module config
- "sway/workspaces" = {
- format = "{icon}";
- format-icons = {
- "1" = " ";
- "2" = " ";
- "3" = " ";
- "4" = " ";
- "5" = " ";
- "6" = " ";
- default = " ";
- urgent = " ";
- };
- all-outputs = false;
- persistent-workspaces = {
- "1" = [ ];
- "2" = [ ];
- "3" = [ ];
- "4" = [ ];
- "5" = [ ];
- "6" = [ ];
- };
- };
- "sway/window" = {
- "format" = "{title}";
- "max-length" = 50;
- "rewrite" = {
- "(.*) - GNU Emacs at (.*)" = " $1 [$2]";
- "(alacritty.*)" = " $1";
- "(.*) - mpv" = " $1";
- "swayimg: (.*)" = " $1";
- "(btm)" = " Resource Usage [$1]";
- "(cava)" = " Music Visualiser [$1]";
- "(.*) - Thunar" = " $1";
- "Mozilla Firefox" = " $1";
- "(.*) — Mozilla Firefox" = " $1";
- "Nyxt - (.*)" = " $1";
- "(.*) - Chromium" = " $1";
- "(Signal.*)" = " $1";
- "((?:.*)WebCord.*)" = " $1";
- "(Cartridges.*)" = " $1";
- "([Ss]team.*)" = " $1";
- "(Prism Launcher.*)" = " Minecraft ($1)";
- "(X2Go Client)" = " $1";
- "(NoMachine|Nxplayer.bin) (.*)" = " $1 $2";
- };
- };
- mpris = {
- "format" = "{player_icon} {artist} - {title} {status_icon}";
- "tooltip-format" = "{player_icon} ({player}) {dynamic}";
- "title-len" = 64;
- "interval" = 1;
- "dynamic-order" = [
- "album"
- "artist"
- "title"
- "position"
- "length"
- ];
- "player-icons" = {
- "default" = " ";
- "emms" = " ";
- "firefox" = " ";
- "mpv" = " ";
- };
- "status-icons" = {
- "playing" = "";
- "paused" = "";
- "stopped" = "";
- };
- "ignored-players" = [ ];
- };
- pulseaudio = {
- scroll-step = 5;
- format = "{format_source}{icon}{volume}%";
- format-muted = "{format_source} ";
- format-source = " ";
- format-source-muted = " ";
- format-icons = {
- car = " ";
- default = [
- " "
- " "
- " "
- ];
- hands-free = " ";
- headset = " ";
- phone = " ";
- portable = " ";
- headphone = " ";
- };
- on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
- on-click-right = "${pkgs.pamixer}/bin/pamixer -t";
- on-scroll-up = "${pkgs.pamixer}/bin/pamixer -i 5";
- on-scroll-down = "${pkgs.pamixer}/bin/pamixer -d 5";
- };
- disk = {
- format = " {percentage_used}%";
- path = config.home.homeDirectory;
- };
- cpu = {
- format = " {usage}%";
- tooltip = false;
- };
- memory = {
- format = " {}%";
- };
- temperature = {
- critical-threshold = 80;
- format = "{icon} {temperatureC}°C";
- format-icons = [
- ""
- ""
- ""
- ];
- };
- network = {
- format-icons = [
- " "
- " "
- " "
- " "
- ];
- format-wifi = "{icon}";
- format-ethernet = " ";
- format-linked = " ";
- format-disconnected = " ";
- tooltip-format = "{essid} ({signalStrength}%)";
- on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor";
- };
- bluetooth = {
- format = "";
- format-disabled = "";
- format-off = "";
- format-on = "";
- format-connected = "";
- tooltip-format = "{status} | {device_alias}";
- on-click = "${pkgs.blueman}/bin/blueman-manager";
- };
- "clock#calendar" = {
- format = " {:%Y-%m-%d}";
- tooltip-format = "{calendar}";
- calendar = {
- mode = "month";
- mode-mon-col = 3;
- weeks-pos = "left";
- on-scroll = 1;
- format =
- let
- sc = config.scheme.withHashtag;
- in
- {
- months = "{}";
- weeks = "W{}";
- weekdays = "{}";
- days = "{}";
- today = "{}";
- };
- };
- actions = {
- on-scroll-up = "shift_up";
- on-scroll-down = "shift_down";
- };
- };
- clock.format = " {:%R}";
- backlight = {
- format = "{icon}";
- tooltip-format = "{percent}%";
- format-icons = [
- " "
- " "
- " "
- " "
- " "
- " "
- " "
- " "
- " "
- ];
- };
- battery = {
- states = {
- warning = 30;
- critical = 20;
- };
- format = "{icon}";
- format-charging = " ";
- format-plugged = " ";
- tooltip-format = "{capacity}% {time}";
- format-icons = [
- " "
- " "
- " "
- " "
- " "
- " "
- " "
- " "
- " "
- " "
- " "
- ];
- };
- "custom/notification" =
- let
- swaync = pkgs.swaynotificationcenter;
- in
- {
- tooltip = false;
- format = "{icon}{}";
- format-icons = {
- notification = " ";
- none = " ";
- dnd-notification = " ";
- dnd-none = " ";
- inhibited-notification = " ";
- inhibited-none = " ";
- dnd-inhibited-notification = " ";
- dnd-inhibited-none = " ";
- };
- return-type = "json";
- exec-if = "which ${swaync}/bin/swaync-client";
- exec = "${swaync}/bin/swaync-client -swb";
- on-click = "${swaync}/bin/swaync-client -t -sw";
- on-click-right = "${swaync}/bin/swaync-client -d -sw";
- escape = true;
- };
- "custom/weather" =
- let
- date-format = "%Y-%m-%d";
- custom-indicator = "{ICON}{temp_C}({FeelsLikeC})";
- in
- {
- format = "{}°";
- tooltip = true;
- interval = 900; # Every 15 minutes
- exec = ''${pkgs.wttrbar}/bin/wttrbar --location Didcot --date-format "${date-format}" --custom-indicator "${custom-indicator}"'';
- return-type = "json";
- };
- tray = {
- icon-size = builtins.floor fonts.sizes.popups;
- show-passive-items = true;
- spacing = 5;
- };
- };
- style =
- let
- sc = config.scheme.withHashtag;
- alpha = "0.85";
- in
- ''
- * {
- all: unset;
- font-size: ${toString fonts.sizes.popups}px;
- font-family: ${fonts.monospace.name};
- }
-
- window {
- background: transparent;
- box-shadow: none;
- }
-
- window > box {
- color: ${sc.base05};
- background: alpha(${sc.base00}, ${alpha});
- margin: 5px 5px 0px;
- padding: 0px;
- border-top: 1px solid ${sc.base04};
- border-radius: 5px;
- }
-
- tooltip {
- background: ${sc.base00};
- border: 1px solid ${sc.${accentColourName}};
- border-radius: 5px;
- box-shadow: none;
- }
-
- tooltip label {
- color: ${sc.base05};
- border: none;
- padding: 5px;
- margin: 0px;
- }
-
- #workspaces,
- #window,
- #mpris,
- #pulseaudio,
- #network,
- #bluetooth,
- #backlight,
- #battery,
- #clock,
- #custom-notification,
- #custom-weather,
- #tray {
- margin: 0px;
- padding: 1px 5px;
- }
-
- #workspaces,
- #window,
- #mpris,
- #tray,
- #backlight,
- #battery,
- #custom-weather {
- color: ${sc.base05};
- }
-
- #workspaces button {
- background: transparent;
- color: ${sc.base05};
- margin: 0px;
- padding: 0px 5px;
- }
- #workspaces button.persistent {
- color: ${sc.base03};
- }
- #workspaces button.focused {
- color: ${sc.${accentColourName}};
- }
- #workspaces button.urgent {
- color: ${sc.base09};
- }
-
- #custom-notification {
- color: ${sc.base08};
- }
- #pulseaudio {
- color: ${sc.base09};
- }
- #network {
- color: ${sc.base0A};
- }
- #bluetooth {
- color: ${sc.base0B};
- }
- #clock.calendar {
- color: ${sc.base0C};
- }
- #clock {
- color: ${sc.base0D};
- }
- '';
- };
-}
diff --git a/home/desktop/sway/wlogout/default.nix b/home/desktop/sway/wlogout/default.nix
deleted file mode 100644
index c0ef7c8b..00000000
--- a/home/desktop/sway/wlogout/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ config, fonts, ... }:
-{
- programs.wlogout = {
- enable = true;
- layout = [
- {
- label = "reboot";
- action = "systemctl reboot";
- text = "Reboot";
- keybind = "r";
- }
- {
- label = "shutdown";
- action = "systemctl poweroff";
- text = "Shutdown";
- keybind = "s";
- }
- {
- label = "logout";
- action = "swaymsg exit";
- text = "Logout";
- keybind = "l";
- }
- ];
- style =
- let
- sc = config.scheme.withHashtag;
- shutdownIcon = ./icons/shutdown.png;
- rebootIcon = ./icons/reboot.png;
- logoutIcon = ./icons/logout.png;
- in
- ''
- * {
- font-size: ${toString fonts.sizes.popups}px;
- font-family: "${fonts.sansSerif.name}";
- }
-
- window {
- border: none;
- background-color: transparent;
- }
-
- button {
- background-color: ${sc.base00};
- background-repeat: no-repeat;
- background-position: center;
- background-size: 25%;
- box-shadow: none;
- margin: 5px;
- color: ${sc.base05};
- }
-
- button:hover {
- background-color: ${sc.base01};
- color: ${sc.base05};
- }
-
- button:focus {
- background-color: ${sc.base02};
- color: ${sc.base05};
- }
-
- #shutdown {
- background-image: url("${shutdownIcon}");
- }
-
- #reboot {
- background-image: url("${rebootIcon}");
- }
-
- #logout {
- background-image: url("${logoutIcon}");
- }
- '';
- };
-}
diff --git a/home/desktop/sway/wlogout/icons/hibernate.png b/home/desktop/sway/wlogout/icons/hibernate.png
deleted file mode 100644
index a6322aa2..00000000
Binary files a/home/desktop/sway/wlogout/icons/hibernate.png and /dev/null differ
diff --git a/home/desktop/sway/wlogout/icons/lock.png b/home/desktop/sway/wlogout/icons/lock.png
deleted file mode 100644
index f0b1eaf9..00000000
Binary files a/home/desktop/sway/wlogout/icons/lock.png and /dev/null differ
diff --git a/home/desktop/sway/wlogout/icons/logout.png b/home/desktop/sway/wlogout/icons/logout.png
deleted file mode 100644
index 345a8aa8..00000000
Binary files a/home/desktop/sway/wlogout/icons/logout.png and /dev/null differ
diff --git a/home/desktop/sway/wlogout/icons/reboot.png b/home/desktop/sway/wlogout/icons/reboot.png
deleted file mode 100644
index 29cfa2ff..00000000
Binary files a/home/desktop/sway/wlogout/icons/reboot.png and /dev/null differ
diff --git a/home/desktop/sway/wlogout/icons/shutdown.png b/home/desktop/sway/wlogout/icons/shutdown.png
deleted file mode 100644
index 4d7d4995..00000000
Binary files a/home/desktop/sway/wlogout/icons/shutdown.png and /dev/null differ
diff --git a/home/desktop/sway/wlogout/icons/suspend.png b/home/desktop/sway/wlogout/icons/suspend.png
deleted file mode 100644
index 647bd663..00000000
Binary files a/home/desktop/sway/wlogout/icons/suspend.png and /dev/null differ
diff --git a/home/games/default.nix b/home/games/default.nix
deleted file mode 100644
index 72191e37..00000000
--- a/home/games/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-{
- home.packages = [
- pkgs.prismlauncher
- pkgs.cartridges
- (pkgs.lutris.override {
- extraPkgs =
- pkgs: with pkgs; [
- wineWowPackages.waylandFull
- winetricks
- dxvk
- ];
- })
- ];
-}
diff --git a/home/personal.nix b/home/personal.nix
deleted file mode 100644
index e1250b84..00000000
--- a/home/personal.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
- imports = [ ./default.nix ];
-}
diff --git a/home/streaming/default.nix b/home/streaming/default.nix
deleted file mode 100644
index 7ecc671f..00000000
--- a/home/streaming/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-{
- home.packages = with pkgs; [
- helvum
- kdenlive
- ];
- programs.obs-studio = {
- enable = true;
- plugins = with pkgs.obs-studio-plugins; [
- wlrobs
- obs-vkcapture
- obs-pipewire-audio-capture
- input-overlay
- ];
- };
-}
diff --git a/system/Northstar.nix b/system/Northstar.nix
index 56577ee6..003f39f5 100644
--- a/system/Northstar.nix
+++ b/system/Northstar.nix
@@ -1,7 +1,4 @@
{ ... }:
{
- imports = [
- ./laptop.nix
- ./desktop/plasma.nix
- ];
+ imports = [ ./laptop.nix ];
}
diff --git a/system/Ronin.nix b/system/Ronin.nix
index c96fa292..2d294c29 100644
--- a/system/Ronin.nix
+++ b/system/Ronin.nix
@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, username, ... }:
{
- imports = [
- ./laptop.nix
- ./desktop/plasma.nix
- ];
+ imports = [ ./laptop.nix ];
+ home-manager.users.${username} = {
+ imports = [ ./home/work.nix ];
+ };
boot.initrd = {
secrets = {
"/crypto_keyfile.bin" = null;
diff --git a/system/Tone.nix b/system/Tone.nix
index bba0c7be..79b55edf 100644
--- a/system/Tone.nix
+++ b/system/Tone.nix
@@ -1,6 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, username, ... }:
{
- imports = [ ./desktop/plasma.nix ];
+ imports = [ ./desktop.nix ];
+ home-manager.users.${username} = {
+ imports = [ ./home/work.nix ];
+ };
boot = {
loader.efi.efiSysMountPoint = "/boot/efi";
initrd = {
diff --git a/system/Vanguard.nix b/system/Vanguard.nix
index afc30182..553c577b 100644
--- a/system/Vanguard.nix
+++ b/system/Vanguard.nix
@@ -1,15 +1,58 @@
-{ config, ... }:
{
- imports = [ ./desktop/plasma.nix ];
+ config,
+ pkgs,
+ username,
+ ...
+}:
+{
+ imports = [ ./desktop.nix ];
+ home-manager.users.${username} = {
+ home.packages = with pkgs; [
+ kdePackages.ktorrent
+ krita
+ kdenlive
+ helvum
+ prusa-slicer
+ blender
+ freecad
+ openscad
+ kicad-small
+ prismlauncher
+ cartridges
+ (lutris.override {
+ extraPkgs =
+ pkg: with pkg; [
+ wineWowPackages.waylandFull
+ winetricks
+ dxvk
+ ];
+ })
+ ];
+ programs.obs-studio = {
+ enable = true;
+ plugins = with pkgs.obs-studio-plugins; [
+ wlrobs
+ obs-vkcapture
+ obs-pipewire-audio-capture
+ input-overlay
+ ];
+ };
+ xdg.configFile = {
+ "autostart/org.kde.ktorrent.desktop".source = "${pkgs.kdePackages.ktorrent}/share/applications/org.kde.ktorrent.desktop";
+ "autostart/webcord.desktop".source = "${pkgs.webcord}/share/applications/webcord.desktop";
+ "autostart/steam.desktop".source = "${config.programs.steam.package}/share/applications/steam.desktop";
+ };
+ };
boot = {
- initrd.kernelModules = [ "amdgpu" ];
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
extraModprobeConfig = ''
options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
'';
};
hardware = {
+ amdgpu.initrd.enable = true;
opengl = {
+ enable = true;
driSupport = true;
driSupport32Bit = true;
};
@@ -18,5 +61,6 @@
programs.steam = {
enable = true;
remotePlay.openFirewall = true;
+ gamescopeSession.enable = true;
};
}
diff --git a/system/default.nix b/system/default.nix
index da01e405..b52a89f1 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -2,16 +2,28 @@
config,
lib,
pkgs,
- iosevkaCustom,
+ inputs,
+ username,
+ hostName,
+ loginShell,
...
}:
{
+ imports = [
+ inputs.home-manager.nixosModules.home-manager
+ ./${hostName}.nix
+ ./hardware-configuration/${hostName}.nix
+ ];
nix = {
enable = true;
+ package = pkgs.nixVersions.latest;
settings = {
cores = 0;
max-jobs = "auto";
- trusted-users = [ "root" ];
+ trusted-users = [
+ "root"
+ username
+ ];
experimental-features = [
"nix-command"
"flakes"
@@ -41,7 +53,16 @@
max-free = ${toString (1024 * 1024 * 1024)}
'';
};
- nixpkgs.config.allowUnfree = true;
+ nixpkgs = {
+ config.allowUnfreePredicate =
+ pkg:
+ builtins.elem (lib.getName pkg) [
+ "steam"
+ "steam-original"
+ "steam-run"
+ ];
+ overlays = [ (final: prev: { inherit (inputs.plasma-manager.packages.${prev.system}) rc2nix; }) ];
+ };
system = {
stateVersion = "23.05";
autoUpgrade = {
@@ -71,15 +92,75 @@
efi.canTouchEfiVariables = true;
};
networking = {
+ inherit hostName;
networkmanager.enable = true;
firewall.enable = true;
nameservers = [ "9.9.9.9" ];
};
- users.users.root.openssh.authorizedKeys.keys = [
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINI1dWlS16Keil0MGPWmMsBzx8F9ylfz+fRwxUr8/tZ/ ion"
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC4M1zV3yLMMI1tYwdY9QDXJDlOBugm7UXKC+Xk89yHq pixelifytica@Vanguard"
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICPypUUGVAdpl0SHrUDVw0RureuFNsljrXQvrf0uc055 pixelifytica@Northstar"
- ];
+ users.users =
+ let
+ authorizedKeys.keys = [
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINI1dWlS16Keil0MGPWmMsBzx8F9ylfz+fRwxUr8/tZ/ ion"
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC4M1zV3yLMMI1tYwdY9QDXJDlOBugm7UXKC+Xk89yHq pixelifytica@Vanguard"
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICPypUUGVAdpl0SHrUDVw0RureuFNsljrXQvrf0uc055 pixelifytica@Northstar"
+ ];
+ in
+ {
+ root.openssh = {
+ inherit authorizedKeys;
+ };
+ ${username} = {
+ shell = pkgs.${loginShell};
+ group = "users";
+ isNormalUser = true;
+ description = "Evie Litherland-Smith";
+ extraGroups = [
+ "networkmanager"
+ "wheel"
+ "video"
+ "input"
+ "uinput"
+ "dialout"
+ ];
+ initialHashedPassword = "$y$j9T$tHIPQt09Kf3KH2eIRze3g/$2mwSlcq27DTGvHNPJ5EP9/1CfL3bXP0F6oS/Vuffmn3";
+ openssh = {
+ inherit authorizedKeys;
+ };
+ };
+ };
+ home-manager = {
+ useGlobalPkgs = true;
+ useUserPackages = true;
+ backupFileExtension = "backup";
+ users.${username} = {
+ imports = [ ./home/default.nix ];
+ home = {
+ inherit username;
+ stateVersion = "23.05";
+ homeDirectory = "/home/${username}";
+ };
+ };
+ extraSpecialArgs = {
+ inherit inputs;
+ accentColourName = "base0E";
+ # Emulating stylix behaviour, rewrite at some point
+ fonts =
+ let
+ monospace.name = inputs.iosevka-custom.outputs.names.iosevka-custom-nerdfont;
+ serif.name = inputs.iosevka-custom.outputs.names.iosevka-custom-aile;
+ sansSerif.name = serif.name;
+ in
+ {
+ inherit monospace serif sansSerif;
+ sizes = {
+ applications = 12;
+ desktop = 10;
+ popups = 14;
+ terminal = 12;
+ };
+ };
+ };
+ };
environment = {
pathsToLink = [ "/share/zsh" ];
sessionVariables = {
@@ -104,6 +185,7 @@
localBinInPath = true;
};
programs = {
+ ${loginShell} = lib.mkIf (loginShell != "bash") { enable = true; };
command-not-found.enable = false;
ssh.startAgent = true;
nano = {
@@ -130,18 +212,19 @@
i18n.defaultLocale = "en_GB.UTF-8";
console.useXkbConfig = true;
fonts = {
- packages = [
- iosevkaCustom.packages.iosevka-custom-nerdfont
- iosevkaCustom.packages.iosevka-custom-aile
- pkgs.emacs-all-the-icons-fonts # Emacs
- pkgs.weather-icons # Emacs
- pkgs.lmodern # LaTeX
- pkgs.noto-fonts-emoji # Emoji
- (pkgs.nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
- ];
+ packages =
+ (with inputs.iosevka-custom.outputs.packages.${pkgs.system}; [
+ iosevka-custom-nerdfont
+ iosevka-custom-aile
+ ])
+ ++ (with pkgs; [
+ lmodern # LaTeX
+ noto-fonts-emoji # Emoji
+ (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
+ ]);
fontconfig = {
enable = true;
- defaultFonts = with iosevkaCustom.names; {
+ defaultFonts = with inputs.iosevka-custom.outputs.names; {
serif = [ iosevka-custom-aile ];
sansSerif = [ iosevka-custom-aile ];
monospace = [ iosevka-custom-nerdfont ];
diff --git a/system/desktop/default.nix b/system/desktop.nix
similarity index 71%
rename from system/desktop/default.nix
rename to system/desktop.nix
index 97530d0c..f03a4d85 100644
--- a/system/desktop/default.nix
+++ b/system/desktop.nix
@@ -1,10 +1,15 @@
-{ pkgs, ... }:
+{ pkgs, username, ... }:
{
+ home-manager.users.${username}.imports = [ ./home/desktop.nix ];
nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
system.autoUpgrade.operation = "boot";
hardware.bluetooth.enable = true;
environment = {
- sessionVariables.NIXOS_OZONE_WL = "1";
+ plasma6.excludePackages = [ pkgs.kdePackages.plasma-browser-integration ];
+ sessionVariables = {
+ NIXOS_OZONE_WL = "1";
+ QT_QPA_PLATFORM = "wayland";
+ };
systemPackages = with pkgs; [
libsecret
libnotify
@@ -46,6 +51,14 @@
support32Bit = true;
};
};
+ displayManager.sddm = {
+ enable = true;
+ wayland.enable = true;
+ };
+ desktopManager.plasma6 = {
+ enable = true;
+ enableQt5Integration = true;
+ };
xserver = {
enable = true;
xkb = {
diff --git a/system/desktop/plasma.nix b/system/desktop/plasma.nix
deleted file mode 100644
index 586f9a20..00000000
--- a/system/desktop/plasma.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-{
- imports = [ ./default.nix ];
- environment = {
- plasma6.excludePackages = with pkgs.kdePackages; [ plasma-browser-integration ];
- sessionVariables.QT_QPA_PLATFORM = "wayland";
- };
- services = {
- displayManager.sddm = {
- enable = true;
- wayland.enable = true;
- };
- desktopManager.plasma6 = {
- enable = true;
- enableQt5Integration = true;
- };
- };
-}
diff --git a/system/desktop/sway.nix b/system/desktop/sway.nix
deleted file mode 100644
index 45db7f54..00000000
--- a/system/desktop/sway.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{ lib, pkgs, ... }:
-{
- imports = [ ./default.nix ];
- environment = {
- sessionVariables = {
- QT_QPA_PLATFORM = "wayland";
- GRIM_DEFAULT_DIR = "$HOME/Pictures/Grim";
- };
- systemPackages = with pkgs; [
- wtype
- wl-clipboard
- libnotify
- libcamera
- glib
- gsettings-desktop-schemas
- pamixer
- pavucontrol
- playerctl
- brightnessctl
- ];
- };
- security.pam.services.swaylock = { };
- programs = {
- light.enable = true;
- nm-applet.enable = true;
- file-roller.enable = true;
- thunar = {
- enable = true;
- plugins = with pkgs.xfce; [
- thunar-archive-plugin
- thunar-volman
- ];
- };
- sway = {
- enable = true;
- package = pkgs.swayfx.overrideAttrs (old: {
- passthru.providedSessions = [ "sway" ];
- });
- extraPackages = [ ];
- wrapperFeatures.gtk = true;
- xwayland.enable = true;
- };
- };
- services = {
- dbus.packages = with pkgs; [ gcr ];
- gnome.gnome-keyring.enable = true;
- blueman.enable = true;
- accounts-daemon.enable = true;
- tumbler.enable = true;
- udisks2.enable = true;
- gvfs = {
- enable = true;
- package = lib.mkForce pkgs.gnome3.gvfs;
- };
- greetd = {
- enable = true;
- settings =
- let
- command = "sway";
- in
- {
- initial_session = {
- inherit command;
- };
- default_session = {
- inherit command;
- };
- };
- };
- };
- qt = {
- enable = true;
- style = "gtk2";
- platformTheme = "gtk2";
- };
- xdg.portal = {
- enable = true;
- config.common.default = "*"; # TODO change for xdg-desktop-portal > 1.17 changes
- extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
- };
-}
diff --git a/home/alacritty/default.nix b/system/home/alacritty/default.nix
similarity index 100%
rename from home/alacritty/default.nix
rename to system/home/alacritty/default.nix
diff --git a/home/desktop/base16/gtk.nix b/system/home/base16/gtk.nix
similarity index 100%
rename from home/desktop/base16/gtk.nix
rename to system/home/base16/gtk.nix
diff --git a/home/browser/bookmarks.json b/system/home/browser/bookmarks.json
similarity index 100%
rename from home/browser/bookmarks.json
rename to system/home/browser/bookmarks.json
diff --git a/home/browser/config.lisp b/system/home/browser/config.lisp
similarity index 100%
rename from home/browser/config.lisp
rename to system/home/browser/config.lisp
diff --git a/home/browser/default.nix b/system/home/browser/default.nix
similarity index 100%
rename from home/browser/default.nix
rename to system/home/browser/default.nix
diff --git a/home/browser/firefox.nix b/system/home/browser/firefox.nix
similarity index 100%
rename from home/browser/firefox.nix
rename to system/home/browser/firefox.nix
diff --git a/home/browser/librewolf.nix b/system/home/browser/librewolf.nix
similarity index 100%
rename from home/browser/librewolf.nix
rename to system/home/browser/librewolf.nix
diff --git a/home/browser/nyxt.nix b/system/home/browser/nyxt.nix
similarity index 100%
rename from home/browser/nyxt.nix
rename to system/home/browser/nyxt.nix
diff --git a/home/config/ferdium.nix b/system/home/config/ferdium.nix
similarity index 100%
rename from home/config/ferdium.nix
rename to system/home/config/ferdium.nix
diff --git a/home/config/teams-for-linux.nix b/system/home/config/teams-for-linux.nix
similarity index 100%
rename from home/config/teams-for-linux.nix
rename to system/home/config/teams-for-linux.nix
diff --git a/system/home/default.nix b/system/home/default.nix
new file mode 100644
index 00000000..0746d80e
--- /dev/null
+++ b/system/home/default.nix
@@ -0,0 +1,18 @@
+{ inputs, osConfig, ... }:
+{
+ imports = [
+ inputs.base16.homeManagerModule
+ inputs.nix-index-database.hmModules.nix-index
+ inputs.plasma-manager.homeManagerModules.plasma-manager
+ ./shell/default.nix
+ ./emacs/default.nix
+ ./services/password-store/default.nix
+ ./scripts/default.nix
+ ];
+ programs.home-manager.enable = true;
+ scheme = "${inputs.tt-schemes}/base16/one-light.yaml";
+ fonts.fontconfig = {
+ enable = true;
+ inherit (osConfig.fonts.fontconfig) defaultFonts;
+ };
+}
diff --git a/home/desktop/default.nix b/system/home/desktop.nix
similarity index 58%
rename from home/desktop/default.nix
rename to system/home/desktop.nix
index fa149086..6d0674b8 100644
--- a/home/desktop/default.nix
+++ b/system/home/desktop.nix
@@ -1,6 +1,26 @@
-{ config, pkgs, ... }:
{
+ config,
+ pkgs,
+ accentColourName,
+ ...
+}:
+{
+ imports = [
+ ./plasma/default.nix
+ ./alacritty/default.nix
+ ./browser/default.nix
+ ./services/email/default.nix
+ ];
home = {
+ packages = with pkgs; [
+ libreoffice-qt-fresh
+ krdc
+ tokodon
+ ferdium
+ webcord
+ signal-desktop
+ teams-for-linux
+ ];
pointerCursor =
let
name = if config.scheme.variant == "light" then "volantes_cursors" else "volantes_light_cursors";
@@ -22,7 +42,7 @@
mime.enable = true;
mimeApps =
let
- defaultApplications = import ./mimeapps.nix;
+ defaultApplications = import ./mimeapps/default.nix;
in
{
enable = true;
@@ -41,6 +61,21 @@
XDG_PROJECTS_DIR = "${config.home.homeDirectory}/Projects";
};
};
+ configFile = {
+ "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
+ "autostart/ferdium.desktop".source = "${pkgs.ferdium}/share/applications/ferdium.desktop";
+ "Ferdium/config/settings.json".text =
+ let
+ accentColor = config.scheme.withHashtag.${accentColourName};
+ in
+ builtins.toJSON (
+ import ./config/ferdium.nix {
+ inherit accentColor;
+ progressbarAccentColor = accentColor;
+ }
+ );
+ "teams-for-linux/config.json".text = builtins.toJSON (import ./config/teams-for-linux.nix);
+ };
};
xresources.properties = with config.scheme.withHashtag; {
"*background" = base00;
diff --git a/home/emacs/default.nix b/system/home/emacs/default.nix
similarity index 100%
rename from home/emacs/default.nix
rename to system/home/emacs/default.nix
diff --git a/home/emacs/emacs-packages.nix b/system/home/emacs/emacs-packages.nix
similarity index 100%
rename from home/emacs/emacs-packages.nix
rename to system/home/emacs/emacs-packages.nix
diff --git a/home/emacs/luarocks/graph-toolkit.nix b/system/home/emacs/luarocks/graph-toolkit.nix
similarity index 100%
rename from home/emacs/luarocks/graph-toolkit.nix
rename to system/home/emacs/luarocks/graph-toolkit.nix
diff --git a/home/emacs/luarocks/scilua.nix b/system/home/emacs/luarocks/scilua.nix
similarity index 100%
rename from home/emacs/luarocks/scilua.nix
rename to system/home/emacs/luarocks/scilua.nix
diff --git a/home/emacs/luarocks/xsys.nix b/system/home/emacs/luarocks/xsys.nix
similarity index 100%
rename from home/emacs/luarocks/xsys.nix
rename to system/home/emacs/luarocks/xsys.nix
diff --git a/home/emacs/pypoetry.toml b/system/home/emacs/pypoetry.toml
similarity index 100%
rename from home/emacs/pypoetry.toml
rename to system/home/emacs/pypoetry.toml
diff --git a/home/emacs/ruff.toml b/system/home/emacs/ruff.toml
similarity index 100%
rename from home/emacs/ruff.toml
rename to system/home/emacs/ruff.toml
diff --git a/home/desktop/icons/nix/nix-owo-transparent.png b/system/home/icons/nix/nix-owo-transparent.png
similarity index 100%
rename from home/desktop/icons/nix/nix-owo-transparent.png
rename to system/home/icons/nix/nix-owo-transparent.png
diff --git a/home/desktop/icons/nix/nix-owo-white.png b/system/home/icons/nix/nix-owo-white.png
similarity index 100%
rename from home/desktop/icons/nix/nix-owo-white.png
rename to system/home/icons/nix/nix-owo-white.png
diff --git a/home/desktop/icons/nix/nix-shooting.png b/system/home/icons/nix/nix-shooting.png
similarity index 100%
rename from home/desktop/icons/nix/nix-shooting.png
rename to system/home/icons/nix/nix-shooting.png
diff --git a/home/desktop/icons/nix/nix-snowflake-cute.png b/system/home/icons/nix/nix-snowflake-cute.png
similarity index 100%
rename from home/desktop/icons/nix/nix-snowflake-cute.png
rename to system/home/icons/nix/nix-snowflake-cute.png
diff --git a/home/desktop/icons/nix/nixos-confetti.png b/system/home/icons/nix/nixos-confetti.png
similarity index 100%
rename from home/desktop/icons/nix/nixos-confetti.png
rename to system/home/icons/nix/nixos-confetti.png
diff --git a/system/home/laptop.nix b/system/home/laptop.nix
new file mode 100644
index 00000000..225450ed
--- /dev/null
+++ b/system/home/laptop.nix
@@ -0,0 +1,9 @@
+{ ... }:
+{
+ imports = [ ./desktop.nix ];
+ programs.plasma = {
+ configFile = {
+ bluedevilglobalrc.Global.launchState.value = "disable";
+ };
+ };
+}
diff --git a/home/desktop/lib/to_capital.nix b/system/home/lib/to_capital.nix
similarity index 100%
rename from home/desktop/lib/to_capital.nix
rename to system/home/lib/to_capital.nix
diff --git a/home/desktop/mimeapps.nix b/system/home/mimeapps/default.nix
similarity index 100%
rename from home/desktop/mimeapps.nix
rename to system/home/mimeapps/default.nix
diff --git a/home/openfortivpn/jetdata-vpn.conf b/system/home/openfortivpn/jetdata-vpn.conf
similarity index 100%
rename from home/openfortivpn/jetdata-vpn.conf
rename to system/home/openfortivpn/jetdata-vpn.conf
diff --git a/home/openfortivpn/ukaea-vpn.conf b/system/home/openfortivpn/ukaea-vpn.conf
similarity index 100%
rename from home/openfortivpn/ukaea-vpn.conf
rename to system/home/openfortivpn/ukaea-vpn.conf
diff --git a/home/openfortivpn/ukaea.nix b/system/home/openfortivpn/ukaea.nix
similarity index 100%
rename from home/openfortivpn/ukaea.nix
rename to system/home/openfortivpn/ukaea.nix
diff --git a/home/desktop/plasma/default.nix b/system/home/plasma/default.nix
similarity index 96%
rename from home/desktop/plasma/default.nix
rename to system/home/plasma/default.nix
index 76617065..74f4ed76 100644
--- a/home/desktop/plasma/default.nix
+++ b/system/home/plasma/default.nix
@@ -2,22 +2,16 @@
config,
lib,
pkgs,
- inputs,
fonts,
- rc2nix,
accentColourName,
...
}:
{
- imports = [
- inputs.plasma-manager.homeManagerModules.plasma-manager
- ../default.nix
- ./konsole.nix
- ];
- home.packages = [
+ imports = [ ./konsole.nix ];
+ home.packages = with pkgs; [
rc2nix
- pkgs.wl-clipboard
- (pkgs.papirus-icon-theme.override { color = "violet"; })
+ wl-clipboard
+ (papirus-icon-theme.override { color = "violet"; })
];
services.gpg-agent.pinentryPackage = pkgs.pinentry-qt;
programs.plasma = {
@@ -41,7 +35,7 @@
inherit (config.home.pointerCursor) size;
theme = config.home.pointerCursor.name;
};
- wallpaper = "${../wallpapers/landscapes/tropic_island_day.jpg}";
+ wallpaper = "${./wallpapers/landscapes/tropic_island_day.jpg}";
};
fonts =
diff --git a/home/desktop/plasma/klassy.nix b/system/home/plasma/klassy.nix
similarity index 100%
rename from home/desktop/plasma/klassy.nix
rename to system/home/plasma/klassy.nix
diff --git a/home/desktop/plasma/konsole.nix b/system/home/plasma/konsole.nix
similarity index 100%
rename from home/desktop/plasma/konsole.nix
rename to system/home/plasma/konsole.nix
diff --git a/home/desktop/plasma/krohnkite.nix b/system/home/plasma/krohnkite.nix
similarity index 100%
rename from home/desktop/plasma/krohnkite.nix
rename to system/home/plasma/krohnkite.nix
diff --git a/home/desktop/plasma/onelight.colorscheme b/system/home/plasma/onelight.colorscheme
similarity index 100%
rename from home/desktop/plasma/onelight.colorscheme
rename to system/home/plasma/onelight.colorscheme
diff --git a/home/desktop/wallpapers/LICENSE b/system/home/plasma/wallpapers/LICENSE
similarity index 100%
rename from home/desktop/wallpapers/LICENSE
rename to system/home/plasma/wallpapers/LICENSE
diff --git a/home/desktop/wallpapers/README.md b/system/home/plasma/wallpapers/README.md
similarity index 100%
rename from home/desktop/wallpapers/README.md
rename to system/home/plasma/wallpapers/README.md
diff --git a/home/desktop/wallpapers/blake.png b/system/home/plasma/wallpapers/blake.png
similarity index 100%
rename from home/desktop/wallpapers/blake.png
rename to system/home/plasma/wallpapers/blake.png
diff --git a/home/desktop/wallpapers/default.jpg b/system/home/plasma/wallpapers/default.jpg
similarity index 100%
rename from home/desktop/wallpapers/default.jpg
rename to system/home/plasma/wallpapers/default.jpg
diff --git a/home/desktop/wallpapers/dithered/barn.png b/system/home/plasma/wallpapers/dithered/barn.png
similarity index 100%
rename from home/desktop/wallpapers/dithered/barn.png
rename to system/home/plasma/wallpapers/dithered/barn.png
diff --git a/home/desktop/wallpapers/dithered/lighthouse.png b/system/home/plasma/wallpapers/dithered/lighthouse.png
similarity index 100%
rename from home/desktop/wallpapers/dithered/lighthouse.png
rename to system/home/plasma/wallpapers/dithered/lighthouse.png
diff --git a/home/desktop/wallpapers/dithered/marketplace.png b/system/home/plasma/wallpapers/dithered/marketplace.png
similarity index 100%
rename from home/desktop/wallpapers/dithered/marketplace.png
rename to system/home/plasma/wallpapers/dithered/marketplace.png
diff --git a/home/desktop/wallpapers/dithered/motorbikes.png b/system/home/plasma/wallpapers/dithered/motorbikes.png
similarity index 100%
rename from home/desktop/wallpapers/dithered/motorbikes.png
rename to system/home/plasma/wallpapers/dithered/motorbikes.png
diff --git a/home/desktop/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png b/system/home/plasma/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png
similarity index 100%
rename from home/desktop/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png
rename to system/home/plasma/wallpapers/flatppuccin/flatppuccin_4k_macchiato.png
diff --git a/home/desktop/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png b/system/home/plasma/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png
similarity index 100%
rename from home/desktop/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png
rename to system/home/plasma/wallpapers/flatppuccin/flatppuccin_4k_macchiato_inverted.png
diff --git a/home/desktop/wallpapers/gradients/bkg1_bkg5.png b/system/home/plasma/wallpapers/gradients/bkg1_bkg5.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/bkg1_bkg5.png
rename to system/home/plasma/wallpapers/gradients/bkg1_bkg5.png
diff --git a/home/desktop/wallpapers/gradients/bkg3_bkg5.png b/system/home/plasma/wallpapers/gradients/bkg3_bkg5.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/bkg3_bkg5.png
rename to system/home/plasma/wallpapers/gradients/bkg3_bkg5.png
diff --git a/home/desktop/wallpapers/gradients/blue_bkg5.png b/system/home/plasma/wallpapers/gradients/blue_bkg5.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/blue_bkg5.png
rename to system/home/plasma/wallpapers/gradients/blue_bkg5.png
diff --git a/home/desktop/wallpapers/gradients/blue_green.png b/system/home/plasma/wallpapers/gradients/blue_green.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/blue_green.png
rename to system/home/plasma/wallpapers/gradients/blue_green.png
diff --git a/home/desktop/wallpapers/gradients/cyan_bkg5.png b/system/home/plasma/wallpapers/gradients/cyan_bkg5.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/cyan_bkg5.png
rename to system/home/plasma/wallpapers/gradients/cyan_bkg5.png
diff --git a/home/desktop/wallpapers/gradients/flamingo_bkg1.png b/system/home/plasma/wallpapers/gradients/flamingo_bkg1.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/flamingo_bkg1.png
rename to system/home/plasma/wallpapers/gradients/flamingo_bkg1.png
diff --git a/home/desktop/wallpapers/gradients/flamingo_bkg5.png b/system/home/plasma/wallpapers/gradients/flamingo_bkg5.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/flamingo_bkg5.png
rename to system/home/plasma/wallpapers/gradients/flamingo_bkg5.png
diff --git a/home/desktop/wallpapers/gradients/flamingo_peach.png b/system/home/plasma/wallpapers/gradients/flamingo_peach.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/flamingo_peach.png
rename to system/home/plasma/wallpapers/gradients/flamingo_peach.png
diff --git a/home/desktop/wallpapers/gradients/flamingo_yellow.png b/system/home/plasma/wallpapers/gradients/flamingo_yellow.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/flamingo_yellow.png
rename to system/home/plasma/wallpapers/gradients/flamingo_yellow.png
diff --git a/home/desktop/wallpapers/gradients/green_bkg5.png b/system/home/plasma/wallpapers/gradients/green_bkg5.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/green_bkg5.png
rename to system/home/plasma/wallpapers/gradients/green_bkg5.png
diff --git a/home/desktop/wallpapers/gradients/magenta_blue.png b/system/home/plasma/wallpapers/gradients/magenta_blue.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/magenta_blue.png
rename to system/home/plasma/wallpapers/gradients/magenta_blue.png
diff --git a/home/desktop/wallpapers/gradients/magenta_pink.png b/system/home/plasma/wallpapers/gradients/magenta_pink.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/magenta_pink.png
rename to system/home/plasma/wallpapers/gradients/magenta_pink.png
diff --git a/home/desktop/wallpapers/gradients/peach_bkg5.png b/system/home/plasma/wallpapers/gradients/peach_bkg5.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/peach_bkg5.png
rename to system/home/plasma/wallpapers/gradients/peach_bkg5.png
diff --git a/home/desktop/wallpapers/gradients/red_bkg5.png b/system/home/plasma/wallpapers/gradients/red_bkg5.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/red_bkg5.png
rename to system/home/plasma/wallpapers/gradients/red_bkg5.png
diff --git a/home/desktop/wallpapers/gradients/red_peach.png b/system/home/plasma/wallpapers/gradients/red_peach.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/red_peach.png
rename to system/home/plasma/wallpapers/gradients/red_peach.png
diff --git a/home/desktop/wallpapers/gradients/red_pink.png b/system/home/plasma/wallpapers/gradients/red_pink.png
similarity index 100%
rename from home/desktop/wallpapers/gradients/red_pink.png
rename to system/home/plasma/wallpapers/gradients/red_pink.png
diff --git a/home/desktop/wallpapers/hypr/HYPRCHAN.png b/system/home/plasma/wallpapers/hypr/HYPRCHAN.png
similarity index 100%
rename from home/desktop/wallpapers/hypr/HYPRCHAN.png
rename to system/home/plasma/wallpapers/hypr/HYPRCHAN.png
diff --git a/home/desktop/wallpapers/hypr/Hyprscreeen_of_death.png b/system/home/plasma/wallpapers/hypr/Hyprscreeen_of_death.png
similarity index 100%
rename from home/desktop/wallpapers/hypr/Hyprscreeen_of_death.png
rename to system/home/plasma/wallpapers/hypr/Hyprscreeen_of_death.png
diff --git a/home/desktop/wallpapers/hypr/Hyprscreeen_of_death_mascot.png b/system/home/plasma/wallpapers/hypr/Hyprscreeen_of_death_mascot.png
similarity index 100%
rename from home/desktop/wallpapers/hypr/Hyprscreeen_of_death_mascot.png
rename to system/home/plasma/wallpapers/hypr/Hyprscreeen_of_death_mascot.png
diff --git a/home/desktop/wallpapers/hypr/hyprfog-2.png b/system/home/plasma/wallpapers/hypr/hyprfog-2.png
similarity index 100%
rename from home/desktop/wallpapers/hypr/hyprfog-2.png
rename to system/home/plasma/wallpapers/hypr/hyprfog-2.png
diff --git a/home/desktop/wallpapers/hypr/tetrahedra5.png b/system/home/plasma/wallpapers/hypr/tetrahedra5.png
similarity index 100%
rename from home/desktop/wallpapers/hypr/tetrahedra5.png
rename to system/home/plasma/wallpapers/hypr/tetrahedra5.png
diff --git a/home/desktop/wallpapers/hypr/w4X1t93.png b/system/home/plasma/wallpapers/hypr/w4X1t93.png
similarity index 100%
rename from home/desktop/wallpapers/hypr/w4X1t93.png
rename to system/home/plasma/wallpapers/hypr/w4X1t93.png
diff --git a/home/desktop/wallpapers/landscapes/Clearday.jpg b/system/home/plasma/wallpapers/landscapes/Clearday.jpg
similarity index 100%
rename from home/desktop/wallpapers/landscapes/Clearday.jpg
rename to system/home/plasma/wallpapers/landscapes/Clearday.jpg
diff --git a/home/desktop/wallpapers/landscapes/Clearnight.jpg b/system/home/plasma/wallpapers/landscapes/Clearnight.jpg
similarity index 100%
rename from home/desktop/wallpapers/landscapes/Clearnight.jpg
rename to system/home/plasma/wallpapers/landscapes/Clearnight.jpg
diff --git a/home/desktop/wallpapers/landscapes/Cloudsday.jpg b/system/home/plasma/wallpapers/landscapes/Cloudsday.jpg
similarity index 100%
rename from home/desktop/wallpapers/landscapes/Cloudsday.jpg
rename to system/home/plasma/wallpapers/landscapes/Cloudsday.jpg
diff --git a/home/desktop/wallpapers/landscapes/Cloudsnight.jpg b/system/home/plasma/wallpapers/landscapes/Cloudsnight.jpg
similarity index 100%
rename from home/desktop/wallpapers/landscapes/Cloudsnight.jpg
rename to system/home/plasma/wallpapers/landscapes/Cloudsnight.jpg
diff --git a/home/desktop/wallpapers/landscapes/Rainnight.jpg b/system/home/plasma/wallpapers/landscapes/Rainnight.jpg
similarity index 100%
rename from home/desktop/wallpapers/landscapes/Rainnight.jpg
rename to system/home/plasma/wallpapers/landscapes/Rainnight.jpg
diff --git a/home/desktop/wallpapers/landscapes/evening-sky.png b/system/home/plasma/wallpapers/landscapes/evening-sky.png
similarity index 100%
rename from home/desktop/wallpapers/landscapes/evening-sky.png
rename to system/home/plasma/wallpapers/landscapes/evening-sky.png
diff --git a/home/desktop/wallpapers/landscapes/forrest.png b/system/home/plasma/wallpapers/landscapes/forrest.png
similarity index 100%
rename from home/desktop/wallpapers/landscapes/forrest.png
rename to system/home/plasma/wallpapers/landscapes/forrest.png
diff --git a/home/desktop/wallpapers/landscapes/salty_mountains.png b/system/home/plasma/wallpapers/landscapes/salty_mountains.png
similarity index 100%
rename from home/desktop/wallpapers/landscapes/salty_mountains.png
rename to system/home/plasma/wallpapers/landscapes/salty_mountains.png
diff --git a/home/desktop/wallpapers/landscapes/shaded_landscape.png b/system/home/plasma/wallpapers/landscapes/shaded_landscape.png
similarity index 100%
rename from home/desktop/wallpapers/landscapes/shaded_landscape.png
rename to system/home/plasma/wallpapers/landscapes/shaded_landscape.png
diff --git a/home/desktop/wallpapers/landscapes/tropic_island_day.jpg b/system/home/plasma/wallpapers/landscapes/tropic_island_day.jpg
similarity index 100%
rename from home/desktop/wallpapers/landscapes/tropic_island_day.jpg
rename to system/home/plasma/wallpapers/landscapes/tropic_island_day.jpg
diff --git a/home/desktop/wallpapers/landscapes/tropic_island_evening.jpg b/system/home/plasma/wallpapers/landscapes/tropic_island_evening.jpg
similarity index 100%
rename from home/desktop/wallpapers/landscapes/tropic_island_evening.jpg
rename to system/home/plasma/wallpapers/landscapes/tropic_island_evening.jpg
diff --git a/home/desktop/wallpapers/landscapes/tropic_island_morning.jpg b/system/home/plasma/wallpapers/landscapes/tropic_island_morning.jpg
similarity index 100%
rename from home/desktop/wallpapers/landscapes/tropic_island_morning.jpg
rename to system/home/plasma/wallpapers/landscapes/tropic_island_morning.jpg
diff --git a/home/desktop/wallpapers/landscapes/tropic_island_night.jpg b/system/home/plasma/wallpapers/landscapes/tropic_island_night.jpg
similarity index 100%
rename from home/desktop/wallpapers/landscapes/tropic_island_night.jpg
rename to system/home/plasma/wallpapers/landscapes/tropic_island_night.jpg
diff --git a/home/desktop/wallpapers/landscapes/yosemite.png b/system/home/plasma/wallpapers/landscapes/yosemite.png
similarity index 100%
rename from home/desktop/wallpapers/landscapes/yosemite.png
rename to system/home/plasma/wallpapers/landscapes/yosemite.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_blue.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_blue.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_blue.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_blue.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_flamingo.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_flamingo.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_flamingo.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_flamingo.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_green.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_green.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_green.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_green.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_lavender.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_lavender.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_lavender.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_lavender.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_magenta.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_magenta.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_magenta.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_magenta.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_maroon.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_maroon.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_maroon.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_maroon.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_peach.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_peach.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_peach.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_peach.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_pink.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_pink.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_pink.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_pink.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_red.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_red.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_red.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_red.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_rosewater.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_rosewater.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_rosewater.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_rosewater.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_sky.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_sky.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_sky.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_sky.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_teal.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_teal.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_teal.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_teal.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_full_yellow.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_yellow.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_full_yellow.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_full_yellow.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_blue.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_blue.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_blue.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_blue.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_flamingo.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_green.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_green.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_green.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_green.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_lavender.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_lavender.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_lavender.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_lavender.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_magenta.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_magenta.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_magenta.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_magenta.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_maroon.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_maroon.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_maroon.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_maroon.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_peach.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_peach.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_peach.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_peach.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_pink.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_pink.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_pink.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_pink.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_red.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_red.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_red.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_red.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_rosewater.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_sky.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_sky.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_sky.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_sky.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_teal.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_teal.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_teal.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_teal.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_gap_yellow.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_yellow.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_gap_yellow.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_gap_yellow.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_blue.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_blue.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_blue.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_blue.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_flamingo.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_flamingo.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_flamingo.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_flamingo.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_green.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_green.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_green.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_green.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_lavender.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_lavender.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_lavender.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_lavender.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_magenta.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_magenta.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_magenta.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_magenta.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_maroon.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_maroon.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_maroon.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_maroon.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_peach.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_peach.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_peach.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_peach.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_pink.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_pink.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_pink.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_pink.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_red.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_red.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_red.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_red.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_rosewater.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_rosewater.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_rosewater.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_rosewater.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_sky.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_sky.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_sky.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_sky.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_teal.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_teal.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_teal.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_teal.png
diff --git a/home/desktop/wallpapers/mandelbrot/mandelbrot_side_yellow.png b/system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_yellow.png
similarity index 100%
rename from home/desktop/wallpapers/mandelbrot/mandelbrot_side_yellow.png
rename to system/home/plasma/wallpapers/mandelbrot/mandelbrot_side_yellow.png
diff --git a/home/desktop/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml b/system/home/plasma/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml
rename to system/home/plasma/wallpapers/minimalistic/.comments/catppuccin_triangle.png.xml
diff --git a/home/desktop/wallpapers/minimalistic/.comments/heart.jpg.xml b/system/home/plasma/wallpapers/minimalistic/.comments/heart.jpg.xml
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/.comments/heart.jpg.xml
rename to system/home/plasma/wallpapers/minimalistic/.comments/heart.jpg.xml
diff --git a/home/desktop/wallpapers/minimalistic/black5_unicat.png b/system/home/plasma/wallpapers/minimalistic/black5_unicat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/black5_unicat.png
rename to system/home/plasma/wallpapers/minimalistic/black5_unicat.png
diff --git a/home/desktop/wallpapers/minimalistic/blue-cat.png b/system/home/plasma/wallpapers/minimalistic/blue-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/blue-cat.png
rename to system/home/plasma/wallpapers/minimalistic/blue-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/blue_unicat.png b/system/home/plasma/wallpapers/minimalistic/blue_unicat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/blue_unicat.png
rename to system/home/plasma/wallpapers/minimalistic/blue_unicat.png
diff --git a/home/desktop/wallpapers/minimalistic/buttons.png b/system/home/plasma/wallpapers/minimalistic/buttons.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/buttons.png
rename to system/home/plasma/wallpapers/minimalistic/buttons.png
diff --git a/home/desktop/wallpapers/minimalistic/catppuccin_triangle.png b/system/home/plasma/wallpapers/minimalistic/catppuccin_triangle.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/catppuccin_triangle.png
rename to system/home/plasma/wallpapers/minimalistic/catppuccin_triangle.png
diff --git a/home/desktop/wallpapers/minimalistic/cats.png b/system/home/plasma/wallpapers/minimalistic/cats.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/cats.png
rename to system/home/plasma/wallpapers/minimalistic/cats.png
diff --git a/home/desktop/wallpapers/minimalistic/dark-cat-rosewater.png b/system/home/plasma/wallpapers/minimalistic/dark-cat-rosewater.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/dark-cat-rosewater.png
rename to system/home/plasma/wallpapers/minimalistic/dark-cat-rosewater.png
diff --git a/home/desktop/wallpapers/minimalistic/dark-cat.png b/system/home/plasma/wallpapers/minimalistic/dark-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/dark-cat.png
rename to system/home/plasma/wallpapers/minimalistic/dark-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/darker_unicat.png b/system/home/plasma/wallpapers/minimalistic/darker_unicat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/darker_unicat.png
rename to system/home/plasma/wallpapers/minimalistic/darker_unicat.png
diff --git a/home/desktop/wallpapers/minimalistic/flamingo-cat.png b/system/home/plasma/wallpapers/minimalistic/flamingo-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/flamingo-cat.png
rename to system/home/plasma/wallpapers/minimalistic/flamingo-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/flamingo_unicat.png b/system/home/plasma/wallpapers/minimalistic/flamingo_unicat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/flamingo_unicat.png
rename to system/home/plasma/wallpapers/minimalistic/flamingo_unicat.png
diff --git a/home/desktop/wallpapers/minimalistic/gradient-synth-cat.png b/system/home/plasma/wallpapers/minimalistic/gradient-synth-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/gradient-synth-cat.png
rename to system/home/plasma/wallpapers/minimalistic/gradient-synth-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/green-cat.png b/system/home/plasma/wallpapers/minimalistic/green-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/green-cat.png
rename to system/home/plasma/wallpapers/minimalistic/green-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/hashtags-black.png b/system/home/plasma/wallpapers/minimalistic/hashtags-black.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/hashtags-black.png
rename to system/home/plasma/wallpapers/minimalistic/hashtags-black.png
diff --git a/home/desktop/wallpapers/minimalistic/hashtags-new.png b/system/home/plasma/wallpapers/minimalistic/hashtags-new.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/hashtags-new.png
rename to system/home/plasma/wallpapers/minimalistic/hashtags-new.png
diff --git a/home/desktop/wallpapers/minimalistic/heart.jpg b/system/home/plasma/wallpapers/minimalistic/heart.jpg
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/heart.jpg
rename to system/home/plasma/wallpapers/minimalistic/heart.jpg
diff --git a/home/desktop/wallpapers/minimalistic/hearts.png b/system/home/plasma/wallpapers/minimalistic/hearts.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/hearts.png
rename to system/home/plasma/wallpapers/minimalistic/hearts.png
diff --git a/home/desktop/wallpapers/minimalistic/lavender-cat.png b/system/home/plasma/wallpapers/minimalistic/lavender-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/lavender-cat.png
rename to system/home/plasma/wallpapers/minimalistic/lavender-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/list-aligned-left.png b/system/home/plasma/wallpapers/minimalistic/list-aligned-left.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/list-aligned-left.png
rename to system/home/plasma/wallpapers/minimalistic/list-aligned-left.png
diff --git a/home/desktop/wallpapers/minimalistic/list-aligned-right.png b/system/home/plasma/wallpapers/minimalistic/list-aligned-right.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/list-aligned-right.png
rename to system/home/plasma/wallpapers/minimalistic/list-aligned-right.png
diff --git a/home/desktop/wallpapers/minimalistic/list-horizontal.png b/system/home/plasma/wallpapers/minimalistic/list-horizontal.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/list-horizontal.png
rename to system/home/plasma/wallpapers/minimalistic/list-horizontal.png
diff --git a/home/desktop/wallpapers/minimalistic/magenta-cat.png b/system/home/plasma/wallpapers/minimalistic/magenta-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/magenta-cat.png
rename to system/home/plasma/wallpapers/minimalistic/magenta-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/maroon-cat.png b/system/home/plasma/wallpapers/minimalistic/maroon-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/maroon-cat.png
rename to system/home/plasma/wallpapers/minimalistic/maroon-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/peach-cat.png b/system/home/plasma/wallpapers/minimalistic/peach-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/peach-cat.png
rename to system/home/plasma/wallpapers/minimalistic/peach-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/peach_unicat.png b/system/home/plasma/wallpapers/minimalistic/peach_unicat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/peach_unicat.png
rename to system/home/plasma/wallpapers/minimalistic/peach_unicat.png
diff --git a/home/desktop/wallpapers/minimalistic/pink-cat.png b/system/home/plasma/wallpapers/minimalistic/pink-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/pink-cat.png
rename to system/home/plasma/wallpapers/minimalistic/pink-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/pink_unicat.png b/system/home/plasma/wallpapers/minimalistic/pink_unicat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/pink_unicat.png
rename to system/home/plasma/wallpapers/minimalistic/pink_unicat.png
diff --git a/home/desktop/wallpapers/minimalistic/red-cat.png b/system/home/plasma/wallpapers/minimalistic/red-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/red-cat.png
rename to system/home/plasma/wallpapers/minimalistic/red-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/red_unicat.png b/system/home/plasma/wallpapers/minimalistic/red_unicat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/red_unicat.png
rename to system/home/plasma/wallpapers/minimalistic/red_unicat.png
diff --git a/home/desktop/wallpapers/minimalistic/romb.png b/system/home/plasma/wallpapers/minimalistic/romb.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/romb.png
rename to system/home/plasma/wallpapers/minimalistic/romb.png
diff --git a/home/desktop/wallpapers/minimalistic/rosewater-cat.png b/system/home/plasma/wallpapers/minimalistic/rosewater-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/rosewater-cat.png
rename to system/home/plasma/wallpapers/minimalistic/rosewater-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/sky-cat.png b/system/home/plasma/wallpapers/minimalistic/sky-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/sky-cat.png
rename to system/home/plasma/wallpapers/minimalistic/sky-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/sports.png b/system/home/plasma/wallpapers/minimalistic/sports.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/sports.png
rename to system/home/plasma/wallpapers/minimalistic/sports.png
diff --git a/home/desktop/wallpapers/minimalistic/teal-cat.png b/system/home/plasma/wallpapers/minimalistic/teal-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/teal-cat.png
rename to system/home/plasma/wallpapers/minimalistic/teal-cat.png
diff --git a/home/desktop/wallpapers/minimalistic/teal_unicat.png b/system/home/plasma/wallpapers/minimalistic/teal_unicat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/teal_unicat.png
rename to system/home/plasma/wallpapers/minimalistic/teal_unicat.png
diff --git a/home/desktop/wallpapers/minimalistic/tetris.png b/system/home/plasma/wallpapers/minimalistic/tetris.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/tetris.png
rename to system/home/plasma/wallpapers/minimalistic/tetris.png
diff --git a/home/desktop/wallpapers/minimalistic/unicat.png b/system/home/plasma/wallpapers/minimalistic/unicat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/unicat.png
rename to system/home/plasma/wallpapers/minimalistic/unicat.png
diff --git a/home/desktop/wallpapers/minimalistic/yellow-cat.png b/system/home/plasma/wallpapers/minimalistic/yellow-cat.png
similarity index 100%
rename from home/desktop/wallpapers/minimalistic/yellow-cat.png
rename to system/home/plasma/wallpapers/minimalistic/yellow-cat.png
diff --git a/home/desktop/wallpapers/misc/cat-sound.png b/system/home/plasma/wallpapers/misc/cat-sound.png
similarity index 100%
rename from home/desktop/wallpapers/misc/cat-sound.png
rename to system/home/plasma/wallpapers/misc/cat-sound.png
diff --git a/home/desktop/wallpapers/misc/cat_bunnies.png b/system/home/plasma/wallpapers/misc/cat_bunnies.png
similarity index 100%
rename from home/desktop/wallpapers/misc/cat_bunnies.png
rename to system/home/plasma/wallpapers/misc/cat_bunnies.png
diff --git a/home/desktop/wallpapers/misc/cat_colors.png b/system/home/plasma/wallpapers/misc/cat_colors.png
similarity index 100%
rename from home/desktop/wallpapers/misc/cat_colors.png
rename to system/home/plasma/wallpapers/misc/cat_colors.png
diff --git a/home/desktop/wallpapers/misc/cat_pacman.png b/system/home/plasma/wallpapers/misc/cat_pacman.png
similarity index 100%
rename from home/desktop/wallpapers/misc/cat_pacman.png
rename to system/home/plasma/wallpapers/misc/cat_pacman.png
diff --git a/home/desktop/wallpapers/misc/comfy-home.png b/system/home/plasma/wallpapers/misc/comfy-home.png
similarity index 100%
rename from home/desktop/wallpapers/misc/comfy-home.png
rename to system/home/plasma/wallpapers/misc/comfy-home.png
diff --git a/home/desktop/wallpapers/misc/doggocat.png b/system/home/plasma/wallpapers/misc/doggocat.png
similarity index 100%
rename from home/desktop/wallpapers/misc/doggocat.png
rename to system/home/plasma/wallpapers/misc/doggocat.png
diff --git a/home/desktop/wallpapers/misc/feet-on-the-dashboard.png b/system/home/plasma/wallpapers/misc/feet-on-the-dashboard.png
similarity index 100%
rename from home/desktop/wallpapers/misc/feet-on-the-dashboard.png
rename to system/home/plasma/wallpapers/misc/feet-on-the-dashboard.png
diff --git a/home/desktop/wallpapers/misc/lonely-fish.png b/system/home/plasma/wallpapers/misc/lonely-fish.png
similarity index 100%
rename from home/desktop/wallpapers/misc/lonely-fish.png
rename to system/home/plasma/wallpapers/misc/lonely-fish.png
diff --git a/home/desktop/wallpapers/misc/rainbow-cat.png b/system/home/plasma/wallpapers/misc/rainbow-cat.png
similarity index 100%
rename from home/desktop/wallpapers/misc/rainbow-cat.png
rename to system/home/plasma/wallpapers/misc/rainbow-cat.png
diff --git a/home/desktop/wallpapers/misc/rainbow.png b/system/home/plasma/wallpapers/misc/rainbow.png
similarity index 100%
rename from home/desktop/wallpapers/misc/rainbow.png
rename to system/home/plasma/wallpapers/misc/rainbow.png
diff --git a/home/desktop/wallpapers/misc/virus.png b/system/home/plasma/wallpapers/misc/virus.png
similarity index 100%
rename from home/desktop/wallpapers/misc/virus.png
rename to system/home/plasma/wallpapers/misc/virus.png
diff --git a/home/desktop/wallpapers/misc/windows-error.jpg b/system/home/plasma/wallpapers/misc/windows-error.jpg
similarity index 100%
rename from home/desktop/wallpapers/misc/windows-error.jpg
rename to system/home/plasma/wallpapers/misc/windows-error.jpg
diff --git a/home/desktop/wallpapers/nix/nix-dracula.png b/system/home/plasma/wallpapers/nix/nix-dracula.png
similarity index 100%
rename from home/desktop/wallpapers/nix/nix-dracula.png
rename to system/home/plasma/wallpapers/nix/nix-dracula.png
diff --git a/home/desktop/wallpapers/nix/nix-glow-black.png b/system/home/plasma/wallpapers/nix/nix-glow-black.png
similarity index 100%
rename from home/desktop/wallpapers/nix/nix-glow-black.png
rename to system/home/plasma/wallpapers/nix/nix-glow-black.png
diff --git a/home/desktop/wallpapers/nix/nix-glow-gruvbox.png b/system/home/plasma/wallpapers/nix/nix-glow-gruvbox.png
similarity index 100%
rename from home/desktop/wallpapers/nix/nix-glow-gruvbox.png
rename to system/home/plasma/wallpapers/nix/nix-glow-gruvbox.png
diff --git a/home/desktop/wallpapers/nix/nix-glow.png b/system/home/plasma/wallpapers/nix/nix-glow.png
similarity index 100%
rename from home/desktop/wallpapers/nix/nix-glow.png
rename to system/home/plasma/wallpapers/nix/nix-glow.png
diff --git a/home/desktop/wallpapers/nix/nix-owo.png b/system/home/plasma/wallpapers/nix/nix-owo.png
similarity index 100%
rename from home/desktop/wallpapers/nix/nix-owo.png
rename to system/home/plasma/wallpapers/nix/nix-owo.png
diff --git a/home/desktop/wallpapers/nix/nixos-declarative.jpg b/system/home/plasma/wallpapers/nix/nixos-declarative.jpg
similarity index 100%
rename from home/desktop/wallpapers/nix/nixos-declarative.jpg
rename to system/home/plasma/wallpapers/nix/nixos-declarative.jpg
diff --git a/home/desktop/wallpapers/os/.comments/void-1920x1080.png.xml b/system/home/plasma/wallpapers/os/.comments/void-1920x1080.png.xml
similarity index 100%
rename from home/desktop/wallpapers/os/.comments/void-1920x1080.png.xml
rename to system/home/plasma/wallpapers/os/.comments/void-1920x1080.png.xml
diff --git a/home/desktop/wallpapers/os/alpine-black-4k.png b/system/home/plasma/wallpapers/os/alpine-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/alpine-black-4k.png
rename to system/home/plasma/wallpapers/os/alpine-black-4k.png
diff --git a/home/desktop/wallpapers/os/alpine-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/alpine-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/alpine-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/alpine-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/alpine-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/alpine-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/alpine-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/alpine-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/android-black-4k.png b/system/home/plasma/wallpapers/os/android-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/android-black-4k.png
rename to system/home/plasma/wallpapers/os/android-black-4k.png
diff --git a/home/desktop/wallpapers/os/android-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/android-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/android-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/android-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/android-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/android-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/android-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/android-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/apple-black-4k.png b/system/home/plasma/wallpapers/os/apple-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/apple-black-4k.png
rename to system/home/plasma/wallpapers/os/apple-black-4k.png
diff --git a/home/desktop/wallpapers/os/apple-blue-black-1920x1080.png b/system/home/plasma/wallpapers/os/apple-blue-black-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/apple-blue-black-1920x1080.png
rename to system/home/plasma/wallpapers/os/apple-blue-black-1920x1080.png
diff --git a/home/desktop/wallpapers/os/apple-colors-big-4k.png b/system/home/plasma/wallpapers/os/apple-colors-big-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/apple-colors-big-4k.png
rename to system/home/plasma/wallpapers/os/apple-colors-big-4k.png
diff --git a/home/desktop/wallpapers/os/apple-colors-small-4k.png b/system/home/plasma/wallpapers/os/apple-colors-small-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/apple-colors-small-4k.png
rename to system/home/plasma/wallpapers/os/apple-colors-small-4k.png
diff --git a/home/desktop/wallpapers/os/apple-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/apple-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/apple-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/apple-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/apple-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/apple-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/apple-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/apple-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/arch-black-4k.png b/system/home/plasma/wallpapers/os/arch-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/arch-black-4k.png
rename to system/home/plasma/wallpapers/os/arch-black-4k.png
diff --git a/home/desktop/wallpapers/os/arch-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/arch-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/arch-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/arch-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/arch-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/arch-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/arch-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/arch-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/arch-rainbow-1920x1080.png b/system/home/plasma/wallpapers/os/arch-rainbow-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/arch-rainbow-1920x1080.png
rename to system/home/plasma/wallpapers/os/arch-rainbow-1920x1080.png
diff --git a/home/desktop/wallpapers/os/arco-black-4k.png b/system/home/plasma/wallpapers/os/arco-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/arco-black-4k.png
rename to system/home/plasma/wallpapers/os/arco-black-4k.png
diff --git a/home/desktop/wallpapers/os/arco-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/arco-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/arco-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/arco-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/arco-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/arco-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/arco-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/arco-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/artix-black-4k.png b/system/home/plasma/wallpapers/os/artix-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/artix-black-4k.png
rename to system/home/plasma/wallpapers/os/artix-black-4k.png
diff --git a/home/desktop/wallpapers/os/artix-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/artix-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/artix-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/artix-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/artix-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/artix-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/artix-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/artix-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/centos-black-4k.png b/system/home/plasma/wallpapers/os/centos-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/centos-black-4k.png
rename to system/home/plasma/wallpapers/os/centos-black-4k.png
diff --git a/home/desktop/wallpapers/os/crystal-linux-4k.png b/system/home/plasma/wallpapers/os/crystal-linux-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/crystal-linux-4k.png
rename to system/home/plasma/wallpapers/os/crystal-linux-4k.png
diff --git a/home/desktop/wallpapers/os/crystal-linux-magenta_blue1920x1080.png b/system/home/plasma/wallpapers/os/crystal-linux-magenta_blue1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/crystal-linux-magenta_blue1920x1080.png
rename to system/home/plasma/wallpapers/os/crystal-linux-magenta_blue1920x1080.png
diff --git a/home/desktop/wallpapers/os/crystal-linux-magenta_pink1920x1080.png b/system/home/plasma/wallpapers/os/crystal-linux-magenta_pink1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/crystal-linux-magenta_pink1920x1080.png
rename to system/home/plasma/wallpapers/os/crystal-linux-magenta_pink1920x1080.png
diff --git a/home/desktop/wallpapers/os/debian-black-4k.png b/system/home/plasma/wallpapers/os/debian-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/debian-black-4k.png
rename to system/home/plasma/wallpapers/os/debian-black-4k.png
diff --git a/home/desktop/wallpapers/os/debian-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/debian-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/debian-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/debian-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/debian-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/debian-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/debian-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/debian-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/deepin-black-4k.png b/system/home/plasma/wallpapers/os/deepin-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/deepin-black-4k.png
rename to system/home/plasma/wallpapers/os/deepin-black-4k.png
diff --git a/home/desktop/wallpapers/os/deepin-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/deepin-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/deepin-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/deepin-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/deepin-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/deepin-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/deepin-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/deepin-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/elementary-black-4k.png b/system/home/plasma/wallpapers/os/elementary-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/elementary-black-4k.png
rename to system/home/plasma/wallpapers/os/elementary-black-4k.png
diff --git a/home/desktop/wallpapers/os/elementary-sky-lavender-ascii.png b/system/home/plasma/wallpapers/os/elementary-sky-lavender-ascii.png
similarity index 100%
rename from home/desktop/wallpapers/os/elementary-sky-lavender-ascii.png
rename to system/home/plasma/wallpapers/os/elementary-sky-lavender-ascii.png
diff --git a/home/desktop/wallpapers/os/endeavour-black-4k.png b/system/home/plasma/wallpapers/os/endeavour-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/endeavour-black-4k.png
rename to system/home/plasma/wallpapers/os/endeavour-black-4k.png
diff --git a/home/desktop/wallpapers/os/endeavour-blue-black-1920x1080.png b/system/home/plasma/wallpapers/os/endeavour-blue-black-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/endeavour-blue-black-1920x1080.png
rename to system/home/plasma/wallpapers/os/endeavour-blue-black-1920x1080.png
diff --git a/home/desktop/wallpapers/os/endeavour-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/endeavour-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/endeavour-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/endeavour-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/fedora-black-4k.png b/system/home/plasma/wallpapers/os/fedora-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/fedora-black-4k.png
rename to system/home/plasma/wallpapers/os/fedora-black-4k.png
diff --git a/home/desktop/wallpapers/os/fedora-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/fedora-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/fedora-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/fedora-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/fedora-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/fedora-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/fedora-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/fedora-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/freebsd-black-4k.png b/system/home/plasma/wallpapers/os/freebsd-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/freebsd-black-4k.png
rename to system/home/plasma/wallpapers/os/freebsd-black-4k.png
diff --git a/home/desktop/wallpapers/os/freebsd-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/freebsd-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/freebsd-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/freebsd-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/freebsd-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/freebsd-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/freebsd-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/freebsd-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/garuda-black-4k.png b/system/home/plasma/wallpapers/os/garuda-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/garuda-black-4k.png
rename to system/home/plasma/wallpapers/os/garuda-black-4k.png
diff --git a/home/desktop/wallpapers/os/gentoo-black-4k.png b/system/home/plasma/wallpapers/os/gentoo-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/gentoo-black-4k.png
rename to system/home/plasma/wallpapers/os/gentoo-black-4k.png
diff --git a/home/desktop/wallpapers/os/manjaro-black-4k.png b/system/home/plasma/wallpapers/os/manjaro-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/manjaro-black-4k.png
rename to system/home/plasma/wallpapers/os/manjaro-black-4k.png
diff --git a/home/desktop/wallpapers/os/manjaro-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/manjaro-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/manjaro-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/manjaro-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/manjaro-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/manjaro-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/manjaro-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/manjaro-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/mint-black-4k.png b/system/home/plasma/wallpapers/os/mint-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/mint-black-4k.png
rename to system/home/plasma/wallpapers/os/mint-black-4k.png
diff --git a/home/desktop/wallpapers/os/mint-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/mint-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/mint-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/mint-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/mint-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/mint-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/mint-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/mint-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/mxlinux-black-4k.png b/system/home/plasma/wallpapers/os/mxlinux-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/mxlinux-black-4k.png
rename to system/home/plasma/wallpapers/os/mxlinux-black-4k.png
diff --git a/home/desktop/wallpapers/os/mxlinux-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/mxlinux-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/mxlinux-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/mxlinux-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/mxlinux-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/mxlinux-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/mxlinux-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/mxlinux-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/nix-black-4k.png b/system/home/plasma/wallpapers/os/nix-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/nix-black-4k.png
rename to system/home/plasma/wallpapers/os/nix-black-4k.png
diff --git a/home/desktop/wallpapers/os/nix-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/nix-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/nix-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/nix-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/nix-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/nix-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/nix-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/nix-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/opensuse-black-4k.png b/system/home/plasma/wallpapers/os/opensuse-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/opensuse-black-4k.png
rename to system/home/plasma/wallpapers/os/opensuse-black-4k.png
diff --git a/home/desktop/wallpapers/os/opensuse-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/opensuse-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/opensuse-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/opensuse-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/opensuse-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/opensuse-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/opensuse-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/opensuse-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/pop-black-4k.png b/system/home/plasma/wallpapers/os/pop-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/pop-black-4k.png
rename to system/home/plasma/wallpapers/os/pop-black-4k.png
diff --git a/home/desktop/wallpapers/os/pop-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/pop-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/pop-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/pop-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/pop-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/pop-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/pop-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/pop-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/raspberry-black-4k.png b/system/home/plasma/wallpapers/os/raspberry-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/raspberry-black-4k.png
rename to system/home/plasma/wallpapers/os/raspberry-black-4k.png
diff --git a/home/desktop/wallpapers/os/raspberry-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/raspberry-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/raspberry-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/raspberry-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/raspberry-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/raspberry-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/raspberry-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/raspberry-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/solus-black-4k.png b/system/home/plasma/wallpapers/os/solus-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/solus-black-4k.png
rename to system/home/plasma/wallpapers/os/solus-black-4k.png
diff --git a/home/desktop/wallpapers/os/solus-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/solus-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/solus-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/solus-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/solus-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/solus-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/solus-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/solus-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/tux-black-4k.png b/system/home/plasma/wallpapers/os/tux-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/tux-black-4k.png
rename to system/home/plasma/wallpapers/os/tux-black-4k.png
diff --git a/home/desktop/wallpapers/os/tux-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/tux-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/tux-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/tux-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/tux-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/tux-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/tux-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/tux-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/ubuntu-black-4k.png b/system/home/plasma/wallpapers/os/ubuntu-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/ubuntu-black-4k.png
rename to system/home/plasma/wallpapers/os/ubuntu-black-4k.png
diff --git a/home/desktop/wallpapers/os/ubuntu-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/ubuntu-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/ubuntu-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/ubuntu-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/ubuntu-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/ubuntu-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/ubuntu-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/ubuntu-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/various-arch-1-4k.png b/system/home/plasma/wallpapers/os/various-arch-1-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/various-arch-1-4k.png
rename to system/home/plasma/wallpapers/os/various-arch-1-4k.png
diff --git a/home/desktop/wallpapers/os/various-arch-2-4k.png b/system/home/plasma/wallpapers/os/various-arch-2-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/various-arch-2-4k.png
rename to system/home/plasma/wallpapers/os/various-arch-2-4k.png
diff --git a/home/desktop/wallpapers/os/various-os-1-4k.png b/system/home/plasma/wallpapers/os/various-os-1-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/various-os-1-4k.png
rename to system/home/plasma/wallpapers/os/various-os-1-4k.png
diff --git a/home/desktop/wallpapers/os/various-os-2-4k.png b/system/home/plasma/wallpapers/os/various-os-2-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/various-os-2-4k.png
rename to system/home/plasma/wallpapers/os/various-os-2-4k.png
diff --git a/home/desktop/wallpapers/os/various-os-3-4k.png b/system/home/plasma/wallpapers/os/various-os-3-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/various-os-3-4k.png
rename to system/home/plasma/wallpapers/os/various-os-3-4k.png
diff --git a/home/desktop/wallpapers/os/void-1920x1080.png b/system/home/plasma/wallpapers/os/void-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/void-1920x1080.png
rename to system/home/plasma/wallpapers/os/void-1920x1080.png
diff --git a/home/desktop/wallpapers/os/void-black-4k.png b/system/home/plasma/wallpapers/os/void-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/void-black-4k.png
rename to system/home/plasma/wallpapers/os/void-black-4k.png
diff --git a/home/desktop/wallpapers/os/void-black3-1920x1080.png b/system/home/plasma/wallpapers/os/void-black3-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/void-black3-1920x1080.png
rename to system/home/plasma/wallpapers/os/void-black3-1920x1080.png
diff --git a/home/desktop/wallpapers/os/void-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/void-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/void-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/void-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/void-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/void-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/void-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/void-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/windows-black.png b/system/home/plasma/wallpapers/os/windows-black.png
similarity index 100%
rename from home/desktop/wallpapers/os/windows-black.png
rename to system/home/plasma/wallpapers/os/windows-black.png
diff --git a/home/desktop/wallpapers/os/windows-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/windows-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/windows-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/windows-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/windows-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/windows-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/windows-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/windows-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/os/zorin-black-4k.png b/system/home/plasma/wallpapers/os/zorin-black-4k.png
similarity index 100%
rename from home/desktop/wallpapers/os/zorin-black-4k.png
rename to system/home/plasma/wallpapers/os/zorin-black-4k.png
diff --git a/home/desktop/wallpapers/os/zorin-magenta-blue-1920x1080.png b/system/home/plasma/wallpapers/os/zorin-magenta-blue-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/zorin-magenta-blue-1920x1080.png
rename to system/home/plasma/wallpapers/os/zorin-magenta-blue-1920x1080.png
diff --git a/home/desktop/wallpapers/os/zorin-magenta-pink-1920x1080.png b/system/home/plasma/wallpapers/os/zorin-magenta-pink-1920x1080.png
similarity index 100%
rename from home/desktop/wallpapers/os/zorin-magenta-pink-1920x1080.png
rename to system/home/plasma/wallpapers/os/zorin-magenta-pink-1920x1080.png
diff --git a/home/desktop/wallpapers/patterns/emojis.png b/system/home/plasma/wallpapers/patterns/emojis.png
similarity index 100%
rename from home/desktop/wallpapers/patterns/emojis.png
rename to system/home/plasma/wallpapers/patterns/emojis.png
diff --git a/home/desktop/wallpapers/patterns/line_icons.png b/system/home/plasma/wallpapers/patterns/line_icons.png
similarity index 100%
rename from home/desktop/wallpapers/patterns/line_icons.png
rename to system/home/plasma/wallpapers/patterns/line_icons.png
diff --git a/home/desktop/wallpapers/science/2422830.jpg b/system/home/plasma/wallpapers/science/2422830.jpg
similarity index 100%
rename from home/desktop/wallpapers/science/2422830.jpg
rename to system/home/plasma/wallpapers/science/2422830.jpg
diff --git a/home/desktop/wallpapers/science/5636374.png b/system/home/plasma/wallpapers/science/5636374.png
similarity index 100%
rename from home/desktop/wallpapers/science/5636374.png
rename to system/home/plasma/wallpapers/science/5636374.png
diff --git a/home/desktop/wallpapers/science/JET interior with superimposed plasma 2560px.jpg b/system/home/plasma/wallpapers/science/JET interior with superimposed plasma 2560px.jpg
similarity index 100%
rename from home/desktop/wallpapers/science/JET interior with superimposed plasma 2560px.jpg
rename to system/home/plasma/wallpapers/science/JET interior with superimposed plasma 2560px.jpg
diff --git a/home/desktop/wallpapers/science/JET plasmas.png b/system/home/plasma/wallpapers/science/JET plasmas.png
similarity index 100%
rename from home/desktop/wallpapers/science/JET plasmas.png
rename to system/home/plasma/wallpapers/science/JET plasmas.png
diff --git a/home/desktop/wallpapers/science/JET wallpaper.jpg b/system/home/plasma/wallpapers/science/JET wallpaper.jpg
similarity index 100%
rename from home/desktop/wallpapers/science/JET wallpaper.jpg
rename to system/home/plasma/wallpapers/science/JET wallpaper.jpg
diff --git a/home/desktop/wallpapers/science/LHC Science.jpg b/system/home/plasma/wallpapers/science/LHC Science.jpg
similarity index 100%
rename from home/desktop/wallpapers/science/LHC Science.jpg
rename to system/home/plasma/wallpapers/science/LHC Science.jpg
diff --git a/home/desktop/wallpapers/science/MAST wallpaper.png b/system/home/plasma/wallpapers/science/MAST wallpaper.png
similarity index 100%
rename from home/desktop/wallpapers/science/MAST wallpaper.png
rename to system/home/plasma/wallpapers/science/MAST wallpaper.png
diff --git a/home/desktop/wallpapers/science/MAST-U 16x9.jpg b/system/home/plasma/wallpapers/science/MAST-U 16x9.jpg
similarity index 100%
rename from home/desktop/wallpapers/science/MAST-U 16x9.jpg
rename to system/home/plasma/wallpapers/science/MAST-U 16x9.jpg
diff --git a/home/desktop/wallpapers/science/chang_hyun_vvts6_1a.jpg b/system/home/plasma/wallpapers/science/chang_hyun_vvts6_1a.jpg
similarity index 100%
rename from home/desktop/wallpapers/science/chang_hyun_vvts6_1a.jpg
rename to system/home/plasma/wallpapers/science/chang_hyun_vvts6_1a.jpg
diff --git a/home/desktop/wallpapers/science/jet_glass_side_auto_pass_latest.png b/system/home/plasma/wallpapers/science/jet_glass_side_auto_pass_latest.png
similarity index 100%
rename from home/desktop/wallpapers/science/jet_glass_side_auto_pass_latest.png
rename to system/home/plasma/wallpapers/science/jet_glass_side_auto_pass_latest.png
diff --git a/home/desktop/wallpapers/science/jet_glass_side_s100_pass_latest.png b/system/home/plasma/wallpapers/science/jet_glass_side_s100_pass_latest.png
similarity index 100%
rename from home/desktop/wallpapers/science/jet_glass_side_s100_pass_latest.png
rename to system/home/plasma/wallpapers/science/jet_glass_side_s100_pass_latest.png
diff --git a/home/desktop/wallpapers/science/jet_glass_side_s250_pass_latest.png b/system/home/plasma/wallpapers/science/jet_glass_side_s250_pass_latest.png
similarity index 100%
rename from home/desktop/wallpapers/science/jet_glass_side_s250_pass_latest.png
rename to system/home/plasma/wallpapers/science/jet_glass_side_s250_pass_latest.png
diff --git a/home/desktop/wallpapers/science/jet_glass_side_s50_pass_latest.png b/system/home/plasma/wallpapers/science/jet_glass_side_s50_pass_latest.png
similarity index 100%
rename from home/desktop/wallpapers/science/jet_glass_side_s50_pass_latest.png
rename to system/home/plasma/wallpapers/science/jet_glass_side_s50_pass_latest.png
diff --git a/home/desktop/wallpapers/science/jet_glass_top_auto_pass_latest.png b/system/home/plasma/wallpapers/science/jet_glass_top_auto_pass_latest.png
similarity index 100%
rename from home/desktop/wallpapers/science/jet_glass_top_auto_pass_latest.png
rename to system/home/plasma/wallpapers/science/jet_glass_top_auto_pass_latest.png
diff --git a/home/desktop/wallpapers/science/jet_glass_top_s100_pass_latest.png b/system/home/plasma/wallpapers/science/jet_glass_top_s100_pass_latest.png
similarity index 100%
rename from home/desktop/wallpapers/science/jet_glass_top_s100_pass_latest.png
rename to system/home/plasma/wallpapers/science/jet_glass_top_s100_pass_latest.png
diff --git a/home/desktop/wallpapers/science/jet_glass_top_s250_pass_latest.png b/system/home/plasma/wallpapers/science/jet_glass_top_s250_pass_latest.png
similarity index 100%
rename from home/desktop/wallpapers/science/jet_glass_top_s250_pass_latest.png
rename to system/home/plasma/wallpapers/science/jet_glass_top_s250_pass_latest.png
diff --git a/home/desktop/wallpapers/science/jet_glass_top_s50_pass_latest.png b/system/home/plasma/wallpapers/science/jet_glass_top_s50_pass_latest.png
similarity index 100%
rename from home/desktop/wallpapers/science/jet_glass_top_s50_pass_latest.png
rename to system/home/plasma/wallpapers/science/jet_glass_top_s50_pass_latest.png
diff --git a/home/desktop/wallpapers/science/luca_z_56_iter_i_small.jpg b/system/home/plasma/wallpapers/science/luca_z_56_iter_i_small.jpg
similarity index 100%
rename from home/desktop/wallpapers/science/luca_z_56_iter_i_small.jpg
rename to system/home/plasma/wallpapers/science/luca_z_56_iter_i_small.jpg
diff --git a/home/desktop/wallpapers/science/mastu_glass_side_s3.png b/system/home/plasma/wallpapers/science/mastu_glass_side_s3.png
similarity index 100%
rename from home/desktop/wallpapers/science/mastu_glass_side_s3.png
rename to system/home/plasma/wallpapers/science/mastu_glass_side_s3.png
diff --git a/home/desktop/wallpapers/science/oct5-selfie.jpg b/system/home/plasma/wallpapers/science/oct5-selfie.jpg
similarity index 100%
rename from home/desktop/wallpapers/science/oct5-selfie.jpg
rename to system/home/plasma/wallpapers/science/oct5-selfie.jpg
diff --git a/home/desktop/wallpapers/science/pit_02-07-2021_small.jpg b/system/home/plasma/wallpapers/science/pit_02-07-2021_small.jpg
similarity index 100%
rename from home/desktop/wallpapers/science/pit_02-07-2021_small.jpg
rename to system/home/plasma/wallpapers/science/pit_02-07-2021_small.jpg
diff --git a/home/desktop/wallpapers/science/vsm6_almost_there_1_small.jpg b/system/home/plasma/wallpapers/science/vsm6_almost_there_1_small.jpg
similarity index 100%
rename from home/desktop/wallpapers/science/vsm6_almost_there_1_small.jpg
rename to system/home/plasma/wallpapers/science/vsm6_almost_there_1_small.jpg
diff --git a/home/desktop/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg b/system/home/plasma/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg
similarity index 100%
rename from home/desktop/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg
rename to system/home/plasma/wallpapers/science/vvs6_from_chang-hyun_1_small.jpg
diff --git a/home/desktop/wallpapers/solids/bkg1.png b/system/home/plasma/wallpapers/solids/bkg1.png
similarity index 100%
rename from home/desktop/wallpapers/solids/bkg1.png
rename to system/home/plasma/wallpapers/solids/bkg1.png
diff --git a/home/desktop/wallpapers/solids/bkg2.png b/system/home/plasma/wallpapers/solids/bkg2.png
similarity index 100%
rename from home/desktop/wallpapers/solids/bkg2.png
rename to system/home/plasma/wallpapers/solids/bkg2.png
diff --git a/home/desktop/wallpapers/solids/bkg3.png b/system/home/plasma/wallpapers/solids/bkg3.png
similarity index 100%
rename from home/desktop/wallpapers/solids/bkg3.png
rename to system/home/plasma/wallpapers/solids/bkg3.png
diff --git a/home/desktop/wallpapers/solids/bkg4.png b/system/home/plasma/wallpapers/solids/bkg4.png
similarity index 100%
rename from home/desktop/wallpapers/solids/bkg4.png
rename to system/home/plasma/wallpapers/solids/bkg4.png
diff --git a/home/desktop/wallpapers/solids/bkg5.png b/system/home/plasma/wallpapers/solids/bkg5.png
similarity index 100%
rename from home/desktop/wallpapers/solids/bkg5.png
rename to system/home/plasma/wallpapers/solids/bkg5.png
diff --git a/home/desktop/wallpapers/solids/blue.png b/system/home/plasma/wallpapers/solids/blue.png
similarity index 100%
rename from home/desktop/wallpapers/solids/blue.png
rename to system/home/plasma/wallpapers/solids/blue.png
diff --git a/home/desktop/wallpapers/solids/cyan.png b/system/home/plasma/wallpapers/solids/cyan.png
similarity index 100%
rename from home/desktop/wallpapers/solids/cyan.png
rename to system/home/plasma/wallpapers/solids/cyan.png
diff --git a/home/desktop/wallpapers/solids/flamingo.png b/system/home/plasma/wallpapers/solids/flamingo.png
similarity index 100%
rename from home/desktop/wallpapers/solids/flamingo.png
rename to system/home/plasma/wallpapers/solids/flamingo.png
diff --git a/home/desktop/wallpapers/solids/gray.png b/system/home/plasma/wallpapers/solids/gray.png
similarity index 100%
rename from home/desktop/wallpapers/solids/gray.png
rename to system/home/plasma/wallpapers/solids/gray.png
diff --git a/home/desktop/wallpapers/solids/green.png b/system/home/plasma/wallpapers/solids/green.png
similarity index 100%
rename from home/desktop/wallpapers/solids/green.png
rename to system/home/plasma/wallpapers/solids/green.png
diff --git a/home/desktop/wallpapers/solids/magenta.png b/system/home/plasma/wallpapers/solids/magenta.png
similarity index 100%
rename from home/desktop/wallpapers/solids/magenta.png
rename to system/home/plasma/wallpapers/solids/magenta.png
diff --git a/home/desktop/wallpapers/solids/peach.png b/system/home/plasma/wallpapers/solids/peach.png
similarity index 100%
rename from home/desktop/wallpapers/solids/peach.png
rename to system/home/plasma/wallpapers/solids/peach.png
diff --git a/home/desktop/wallpapers/solids/pink.png b/system/home/plasma/wallpapers/solids/pink.png
similarity index 100%
rename from home/desktop/wallpapers/solids/pink.png
rename to system/home/plasma/wallpapers/solids/pink.png
diff --git a/home/desktop/wallpapers/solids/red.png b/system/home/plasma/wallpapers/solids/red.png
similarity index 100%
rename from home/desktop/wallpapers/solids/red.png
rename to system/home/plasma/wallpapers/solids/red.png
diff --git a/home/desktop/wallpapers/solids/white.png b/system/home/plasma/wallpapers/solids/white.png
similarity index 100%
rename from home/desktop/wallpapers/solids/white.png
rename to system/home/plasma/wallpapers/solids/white.png
diff --git a/home/desktop/wallpapers/solids/yellow.png b/system/home/plasma/wallpapers/solids/yellow.png
similarity index 100%
rename from home/desktop/wallpapers/solids/yellow.png
rename to system/home/plasma/wallpapers/solids/yellow.png
diff --git a/home/desktop/wallpapers/space.png b/system/home/plasma/wallpapers/space.png
similarity index 100%
rename from home/desktop/wallpapers/space.png
rename to system/home/plasma/wallpapers/space.png
diff --git a/home/desktop/wallpapers/sweet/Sweet-S1.png b/system/home/plasma/wallpapers/sweet/Sweet-S1.png
similarity index 100%
rename from home/desktop/wallpapers/sweet/Sweet-S1.png
rename to system/home/plasma/wallpapers/sweet/Sweet-S1.png
diff --git a/home/desktop/wallpapers/sweet/Sweet-S2.png b/system/home/plasma/wallpapers/sweet/Sweet-S2.png
similarity index 100%
rename from home/desktop/wallpapers/sweet/Sweet-S2.png
rename to system/home/plasma/wallpapers/sweet/Sweet-S2.png
diff --git a/home/desktop/wallpapers/sweet/Sweet-S3.png b/system/home/plasma/wallpapers/sweet/Sweet-S3.png
similarity index 100%
rename from home/desktop/wallpapers/sweet/Sweet-S3.png
rename to system/home/plasma/wallpapers/sweet/Sweet-S3.png
diff --git a/home/desktop/wallpapers/sweet/Sweet-S4.png b/system/home/plasma/wallpapers/sweet/Sweet-S4.png
similarity index 100%
rename from home/desktop/wallpapers/sweet/Sweet-S4.png
rename to system/home/plasma/wallpapers/sweet/Sweet-S4.png
diff --git a/home/desktop/wallpapers/sweet/Sweet-S5.png b/system/home/plasma/wallpapers/sweet/Sweet-S5.png
similarity index 100%
rename from home/desktop/wallpapers/sweet/Sweet-S5.png
rename to system/home/plasma/wallpapers/sweet/Sweet-S5.png
diff --git a/home/desktop/wallpapers/sweet/Sweet-space.png b/system/home/plasma/wallpapers/sweet/Sweet-space.png
similarity index 100%
rename from home/desktop/wallpapers/sweet/Sweet-space.png
rename to system/home/plasma/wallpapers/sweet/Sweet-space.png
diff --git a/home/desktop/wallpapers/sweet/source.svg b/system/home/plasma/wallpapers/sweet/source.svg
similarity index 100%
rename from home/desktop/wallpapers/sweet/source.svg
rename to system/home/plasma/wallpapers/sweet/source.svg
diff --git a/home/desktop/wallpapers/waves/Waves Dark 6016x6016.jpg b/system/home/plasma/wallpapers/waves/Waves Dark 6016x6016.jpg
similarity index 100%
rename from home/desktop/wallpapers/waves/Waves Dark 6016x6016.jpg
rename to system/home/plasma/wallpapers/waves/Waves Dark 6016x6016.jpg
diff --git a/home/desktop/wallpapers/waves/Waves Dark Alt 6016x6016.jpg b/system/home/plasma/wallpapers/waves/Waves Dark Alt 6016x6016.jpg
similarity index 100%
rename from home/desktop/wallpapers/waves/Waves Dark Alt 6016x6016.jpg
rename to system/home/plasma/wallpapers/waves/Waves Dark Alt 6016x6016.jpg
diff --git a/home/desktop/wallpapers/waves/Waves Light 6016x6016.jpg b/system/home/plasma/wallpapers/waves/Waves Light 6016x6016.jpg
similarity index 100%
rename from home/desktop/wallpapers/waves/Waves Light 6016x6016.jpg
rename to system/home/plasma/wallpapers/waves/Waves Light 6016x6016.jpg
diff --git a/home/desktop/wallpapers/waves/cat-blue-eye.png b/system/home/plasma/wallpapers/waves/cat-blue-eye.png
similarity index 100%
rename from home/desktop/wallpapers/waves/cat-blue-eye.png
rename to system/home/plasma/wallpapers/waves/cat-blue-eye.png
diff --git a/home/desktop/wallpapers/waves/cat-waves.png b/system/home/plasma/wallpapers/waves/cat-waves.png
similarity index 100%
rename from home/desktop/wallpapers/waves/cat-waves.png
rename to system/home/plasma/wallpapers/waves/cat-waves.png
diff --git a/home/desktop/wallpapers/waves/wavy_lines_v01_5120x2880.png b/system/home/plasma/wallpapers/waves/wavy_lines_v01_5120x2880.png
similarity index 100%
rename from home/desktop/wallpapers/waves/wavy_lines_v01_5120x2880.png
rename to system/home/plasma/wallpapers/waves/wavy_lines_v01_5120x2880.png
diff --git a/home/desktop/wallpapers/waves/wavy_lines_v02_5120x2880.png b/system/home/plasma/wallpapers/waves/wavy_lines_v02_5120x2880.png
similarity index 100%
rename from home/desktop/wallpapers/waves/wavy_lines_v02_5120x2880.png
rename to system/home/plasma/wallpapers/waves/wavy_lines_v02_5120x2880.png
diff --git a/home/desktop/wallpapers/waves/wavy_lines_v03_5120x2880.png b/system/home/plasma/wallpapers/waves/wavy_lines_v03_5120x2880.png
similarity index 100%
rename from home/desktop/wallpapers/waves/wavy_lines_v03_5120x2880.png
rename to system/home/plasma/wallpapers/waves/wavy_lines_v03_5120x2880.png
diff --git a/home/scripts/default.nix b/system/home/scripts/default.nix
similarity index 100%
rename from home/scripts/default.nix
rename to system/home/scripts/default.nix
diff --git a/home/scripts/lua/sync-all.lua b/system/home/scripts/lua/sync-all.lua
similarity index 100%
rename from home/scripts/lua/sync-all.lua
rename to system/home/scripts/lua/sync-all.lua
diff --git a/home/scripts/python/sync-all.py b/system/home/scripts/python/sync-all.py
similarity index 100%
rename from home/scripts/python/sync-all.py
rename to system/home/scripts/python/sync-all.py
diff --git a/home/scripts/shell/esync.sh b/system/home/scripts/shell/esync.sh
similarity index 100%
rename from home/scripts/shell/esync.sh
rename to system/home/scripts/shell/esync.sh
diff --git a/home/scripts/shell/git-sync-all.sh b/system/home/scripts/shell/git-sync-all.sh
similarity index 100%
rename from home/scripts/shell/git-sync-all.sh
rename to system/home/scripts/shell/git-sync-all.sh
diff --git a/home/scripts/shell/rsync-local-config.sh b/system/home/scripts/shell/rsync-local-config.sh
similarity index 100%
rename from home/scripts/shell/rsync-local-config.sh
rename to system/home/scripts/shell/rsync-local-config.sh
diff --git a/home/scripts/shell/xdg-query-program.sh b/system/home/scripts/shell/xdg-query-program.sh
similarity index 100%
rename from home/scripts/shell/xdg-query-program.sh
rename to system/home/scripts/shell/xdg-query-program.sh
diff --git a/home/services/email/davmail.properties b/system/home/services/email/davmail.properties
similarity index 100%
rename from home/services/email/davmail.properties
rename to system/home/services/email/davmail.properties
diff --git a/home/services/email/default.nix b/system/home/services/email/default.nix
similarity index 100%
rename from home/services/email/default.nix
rename to system/home/services/email/default.nix
diff --git a/home/services/email/mbsync-ensure-pass.sh b/system/home/services/email/mbsync-ensure-pass.sh
similarity index 100%
rename from home/services/email/mbsync-ensure-pass.sh
rename to system/home/services/email/mbsync-ensure-pass.sh
diff --git a/home/services/email/signatures/personal b/system/home/services/email/signatures/personal
similarity index 100%
rename from home/services/email/signatures/personal
rename to system/home/services/email/signatures/personal
diff --git a/home/services/email/signatures/work b/system/home/services/email/signatures/work
similarity index 100%
rename from home/services/email/signatures/work
rename to system/home/services/email/signatures/work
diff --git a/home/services/password-store/default.nix b/system/home/services/password-store/default.nix
similarity index 100%
rename from home/services/password-store/default.nix
rename to system/home/services/password-store/default.nix
diff --git a/home/services/password-store/git-pass-mapping.ini b/system/home/services/password-store/git-pass-mapping.ini
similarity index 100%
rename from home/services/password-store/git-pass-mapping.ini
rename to system/home/services/password-store/git-pass-mapping.ini
diff --git a/home/shell/bottom.nix b/system/home/shell/bottom.nix
similarity index 100%
rename from home/shell/bottom.nix
rename to system/home/shell/bottom.nix
diff --git a/home/shell/default.nix b/system/home/shell/default.nix
similarity index 100%
rename from home/shell/default.nix
rename to system/home/shell/default.nix
diff --git a/home/shell/fastfetch.nix b/system/home/shell/fastfetch.nix
similarity index 100%
rename from home/shell/fastfetch.nix
rename to system/home/shell/fastfetch.nix
diff --git a/home/shell/git.nix b/system/home/shell/git.nix
similarity index 100%
rename from home/shell/git.nix
rename to system/home/shell/git.nix
diff --git a/home/shell/ssh.nix b/system/home/shell/ssh.nix
similarity index 100%
rename from home/shell/ssh.nix
rename to system/home/shell/ssh.nix
diff --git a/home/shell/starship.nix b/system/home/shell/starship.nix
similarity index 100%
rename from home/shell/starship.nix
rename to system/home/shell/starship.nix
diff --git a/home/shell/transient.zsh b/system/home/shell/transient.zsh
similarity index 100%
rename from home/shell/transient.zsh
rename to system/home/shell/transient.zsh
diff --git a/home/shell/zellij.nix b/system/home/shell/zellij.nix
similarity index 100%
rename from home/shell/zellij.nix
rename to system/home/shell/zellij.nix
diff --git a/home/shell/zsh.nix b/system/home/shell/zsh.nix
similarity index 100%
rename from home/shell/zsh.nix
rename to system/home/shell/zsh.nix
diff --git a/home/work.nix b/system/home/work.nix
similarity index 88%
rename from home/work.nix
rename to system/home/work.nix
index 59c456b7..7e690165 100644
--- a/home/work.nix
+++ b/system/home/work.nix
@@ -5,10 +5,7 @@
...
}:
{
- imports = [
- ./default.nix
- ./openfortivpn/ukaea.nix
- ];
+ imports = [ ./openfortivpn/ukaea.nix ];
home.packages = [ pkgs.twinkle ];
programs.git.userEmail = config.accounts.email.accounts.outlook.address;
accounts.email.accounts = {
diff --git a/system/laptop.nix b/system/laptop.nix
index c56fe686..6eace01a 100644
--- a/system/laptop.nix
+++ b/system/laptop.nix
@@ -1,6 +1,7 @@
-{ ... }:
+{ username, ... }:
{
- imports = [ ./desktop/default.nix ];
+ imports = [ ./desktop.nix ];
+ home-manager.users.${username}.imports = [ ./home/laptop.nix ];
powerManagement.enable = true;
services.auto-cpufreq = {
enable = true;