yes

2025-04-29 13:39:02 -05:00
commit 9cbb583982
2257 changed files with 77258 additions and 0 deletions
--- a/WE-Lake.png
+++ b/WE-Lake.png
--- a/Wallpapers/WE-Lake.png
+++ b/Wallpapers/WE-Lake.png
--- a/Wallpapers/sDpJ0mPGhn4FnbWOsOI4HoiYUvnyKjJck4RJnPZo-3609584059.jpg
+++ b/Wallpapers/sDpJ0mPGhn4FnbWOsOI4HoiYUvnyKjJck4RJnPZo-3609584059.jpg
--- a/47
+++ b/47
@@ -0,0 +1,47 @@
+{
+  description = "Laptop Flake";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    zen-browser.url = "github:VCPYC/zen-browser-flake";
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
+    nixpkgs.follows = "nixos-cosmic/nixpkgs";
+    nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
+    nixvim = {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nix-flatpak.url = "github:gmodena/nix-flatpak";
+  };
+
+  outputs = { nixpkgs, nixos-cosmic, nix-flatpak, hyprpanel, nixvim, zen-browser, ... }@inputs: 
+  {
+  
+  nixosConfigurations.nixos-laptop = nixpkgs.lib.nixosSystem {
+    modules = [
+      nix-flatpak.nixosModules.nix-flatpak
+      ./configuration.nix
+      ./hardware-configuration.nix
+      {
+        nix.settings = {
+	  substituters = ["https://cosmic.cachix.org"];
+	  trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+        };
+      }
+      nixos-cosmic.nixosModules.default
+      nixpkgs.overlays =
+	[ inputs.hyprpanel.overlay ];
+        _module.args = { inherit inputs; };
+        
+      home-manager.nixosModules.home-manager 
+	{
+	  home-manager.useUserPackages = true;
+	  home-manager.users.joshuaelm = {
+	    imports = [ ./home.nix nixvim.homeManagerModules.nixvim];
+	    };
+	}  
+     ];
+     specialArgs.inputs = inputs;
+   };
+  };
+}
--- a/configuration.nix
+++ b/configuration.nix
@@ -0,0 +1,236 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, inputs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+  powerManagement.enable = true;
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot = {
+
+    plymouth = {
+      enable = true;
+      theme = "square_hud";
+      themePackages = with pkgs; [
+        # By default we would install all themes
+        (adi1090x-plymouth-themes.override {
+          selected_themes = [ "square_hud" ];
+        })
+      ];
+    };
+
+    # Enable "Silent Boot"
+    consoleLogLevel = 0;
+    initrd.verbose = false;
+    kernelParams = [
+      "quiet"
+      "splash"
+      "boot.shell_on_fail"
+      "loglevel=3"
+      "rd.systemd.show_status=false"
+      "rd.udev.log_level=3"
+      "udev.log_priority=3"
+    ];
+    # Hide the OS choice for bootloaders.
+    # It's still possible to open the bootloader list by pressing any key
+    # It will just not appear on screen unless a key is pressed
+    loader.timeout = 0;
+
+  };
+
+  networking.hostName = "nixos-laptop"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Set your time zone.
+  time.timeZone = "America/Chicago";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+
+  # Enable Cosmic
+  services.desktopManager.cosmic.enable = true;
+  services.displayManager.cosmic-greeter.enable = false;
+  services.xserver.desktopManager.gnome.enable = false;
+  services.libinput.enable = true;
+  programs.hyprland.enable = true;
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+  services.greetd = {
+    enable = true;
+    settings = rec {
+    initial_session = {
+    command = "${pkgs.hyprland}/bin/Hyprland";
+      user = "joshuaelm";
+    };
+        default_session = initial_session;
+    };
+  };
+  	 
+
+  # Swap
+  swapDevices = [ {
+    device = "/var/lib/swapfile";
+    size = 16*1024;
+  } ];
+
+  # Exclude gnome bloat
+
+  environment.gnome.excludePackages = (with pkgs; [
+  atomix # puzzle game
+  cheese # webcam tool
+  epiphany # web browser
+  evince # document viewer
+  geary # email reader
+  gedit # text editor
+  gnome-characters
+  gnome-music
+  gnome-photos
+  gnome-terminal
+  gnome-tour
+  hitori # sudoku game
+  iagno # go game
+  tali # poker game
+  totem # video player
+]);
+
+
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      intel-media-driver
+    ];
+  };
+
+  # touchscreen
+  services.xserver = {
+  modules = [ pkgs.xf86_input_wacom ];
+  wacom.enable = true;
+};
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "";
+  };
+
+  # fingerprint
+  systemd.services.fprintd = {
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig.Type = "simple";
+  };
+  services.fprintd.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.joshuaelm = {
+    isNormalUser = true;
+    description = "Joshua Elmasri";
+    extraGroups = [ "networkmanager" "wheel" "adbusers" "dialout" ];
+    packages = with pkgs; [];
+  };
+
+  programs.adb.enable = true;
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  # Flatpak
+  services.flatpak.enable = true;
+  services.flatpak.update.onActivation = true;
+  services.flatpak.packages = [
+    "app.bluebubbles.BlueBubbles"
+    "com.github.johnfactotum.Foliate"
+    "org.jdownloader.JDownloader"
+  ];
+
+ # Fonts
+
+  fonts.packages = with pkgs; [
+  fira-code
+  fira-code-symbols
+  roboto
+  nerd-fonts.fira-code
+  nerd-fonts.jetbrains-mono
+  ];
+
+
+
+  environment.systemPackages = with pkgs; [
+  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #  wget
+  neovim
+  killall
+  hypridle
+  git
+  pkgs.hyprpanel
+  bibata-cursors
+  element-desktop
+  wvkbd
+  rofi-wayland
+  playerctl
+  cava
+  moonlight-qt
+  ];
+
+  # Bluetooth
+  hardware.bluetooth.enable = true;
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Enable Flakes
+  nix.settings.experimental-features = [ "nix-command" "flakes"  ];
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.11"; # Did you read the comment?
+
+}
--- a/flake.lock
+++ b/flake.lock
@@ -0,0 +1,823 @@
+{
+  "nodes": {
+    "ags": {
+      "inputs": {
+        "astal": "astal",
+        "nixpkgs": [
+          "hyprpanel",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1736090999,
+        "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=",
+        "owner": "aylur",
+        "repo": "ags",
+        "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "aylur",
+        "repo": "ags",
+        "type": "github"
+      }
+    },
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739298463,
+        "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
+    "astal": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprpanel",
+          "ags",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1735172721,
+        "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=",
+        "owner": "aylur",
+        "repo": "astal",
+        "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "aylur",
+        "repo": "astal",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1717312683,
+        "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
+        "owner": "nix-community",
+        "repo": "flake-compat",
+        "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1741345870,
+        "narHash": "sha256-KTpoO4oaucdFr3oJJBYpGK+aWVVrLvtiT17EQE7Cf4Y=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "04c915bcf1a1eac3519372ff3185beef053fba7c",
+        "type": "github"
+      },
+      "original": {
+        "id": "home-manager",
+        "type": "indirect"
+      }
+    },
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738664950,
+        "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739049071,
+        "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
+    "hyprgrass": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ]
+      },
+      "locked": {
+        "lastModified": 1741008259,
+        "narHash": "sha256-gXZ4CvL1cpkSA1/dJSjfeyTspRF8B+n1IPbs1LzVQAw=",
+        "owner": "horriblename",
+        "repo": "hyprgrass",
+        "rev": "e59bc280b71be8c45638806f3123fc36834435bc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "horriblename",
+        "repo": "hyprgrass",
+        "type": "github"
+      }
+    },
+    "hyprland": {
+      "inputs": {
+        "aquamarine": "aquamarine",
+        "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-qtutils": "hyprland-qtutils",
+        "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
+        "hyprwayland-scanner": "hyprwayland-scanner",
+        "nixpkgs": "nixpkgs_2",
+        "pre-commit-hooks": "pre-commit-hooks",
+        "systems": "systems",
+        "xdph": "xdph"
+      },
+      "locked": {
+        "lastModified": 1741298937,
+        "narHash": "sha256-kZuqcoVaP+e0wRS2z9y64DXYJYDOputA0BmOlfzj3LY=",
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "rev": "7753e8ea686ba0aeaa825502f27e5b3f813faade",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738422629,
+        "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprland-qt-support": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-qtutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-qtutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737634706,
+        "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "rev": "8810df502cdee755993cb803eba7b23f189db795",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qt-support",
+        "type": "github"
+      }
+    },
+    "hyprland-qtutils": {
+      "inputs": {
+        "hyprland-qt-support": "hyprland-qt-support",
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-qtutils",
+          "hyprlang",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739048983,
+        "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=",
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-qtutils",
+        "type": "github"
+      }
+    },
+    "hyprlang": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739048914,
+        "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "a7334904d591f38757c46fbe2ab68651877d9099",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprpanel": {
+      "inputs": {
+        "ags": "ags",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1740863579,
+        "narHash": "sha256-U4amsszfgPUTAa9FrIlYsCCpmAyko22h/nbjhmAZvAs=",
+        "owner": "Jas-SinghFSU",
+        "repo": "HyprPanel",
+        "rev": "2be9f1ef6c2df2ecf0eebe5a039e8029d8d151cd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Jas-SinghFSU",
+        "repo": "HyprPanel",
+        "type": "github"
+      }
+    },
+    "hyprutils": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739891528,
+        "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739049028,
+        "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "04146df74a8d5ec0b579657307be01f1e241125f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "type": "github"
+      }
+    },
+    "ixx": {
+      "inputs": {
+        "flake-utils": [
+          "nixvim",
+          "nuschtosSearch",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixvim",
+          "nuschtosSearch",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729958008,
+        "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "ref": "v0.0.6",
+        "repo": "ixx",
+        "type": "github"
+      }
+    },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1739444422,
+        "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
+    "nixos-cosmic": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": "nixpkgs_4",
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1741360124,
+        "narHash": "sha256-x9eHurxh8AhCmVplugQiYTyfz+NNU4DGRRLq1UqQ8g0=",
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "rev": "5be89641d8b9190460af05d59f6dbe4cb8695399",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lilyinstarlight",
+        "repo": "nixos-cosmic",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1741010256,
+        "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1741196730,
+        "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1739020877,
+        "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1736344531,
+        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1741246872,
+        "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1736344531,
+        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixvim": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nuschtosSearch": "nuschtosSearch"
+      },
+      "locked": {
+        "lastModified": 1741098523,
+        "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "03065fd4708bfdf47dd541d655392a60daa25ded",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "ixx": "ixx",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738508923,
+        "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737465171,
+        "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "hyprgrass": "hyprgrass",
+        "hyprland": "hyprland",
+        "hyprpanel": "hyprpanel",
+        "nix-flatpak": "nix-flatpak",
+        "nixos-cosmic": "nixos-cosmic",
+        "nixpkgs": [
+          "nixos-cosmic",
+          "nixpkgs"
+        ],
+        "nixvim": "nixvim",
+        "zen-browser": "zen-browser"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "xdph": {
+      "inputs": {
+        "hyprland-protocols": [
+          "hyprland",
+          "hyprland-protocols"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737634991,
+        "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
+    },
+    "zen-browser": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
+        "lastModified": 1736618040,
+        "narHash": "sha256-g6sO9WSuxThTB3P3og6TMsqfhomXbHRWWPtM//o5oVw=",
+        "owner": "VCPYC",
+        "repo": "zen-browser-flake",
+        "rev": "0c1f40a484ab48a1e9ef947c791fc9ca3d4d8113",
+        "type": "github"
+      },
+      "original": {
+        "owner": "VCPYC",
+        "repo": "zen-browser-flake",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
--- a/flake.nix
+++ b/flake.nix
@@ -0,0 +1,55 @@
+{
+  description = "Laptop Flake";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
+    nixpkgs.follows = "nixos-cosmic/nixpkgs";
+    nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
+    nixvim = {
+      url = "github:nix-community/nixvim";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nix-flatpak.url = "github:gmodena/nix-flatpak";
+    hyprland.url = "github:hyprwm/Hyprland";
+    hyprgrass = {
+      url = "github:horriblename/hyprgrass";
+      inputs.hyprland.follows = "hyprland"; # IMPORTANT
+    };
+  };
+
+  outputs = { nixpkgs, nixos-cosmic, nix-flatpak, hyprpanel, home-manager, nixvim, ... }@inputs: 
+  {
+      nixosConfigurations = {
+        nixos-laptop = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+	  specialArgs = {inherit nixvim;};
+	  specialArgs.inputs = inputs;
+          modules = [
+            {
+              nix.settings = {
+                substituters = [ "https://cosmic.cachix.org/" ];
+                trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
+              };
+	      nixpkgs.overlays =
+	        [ inputs.hyprpanel.overlay ];
+		_module.args = { inherit inputs; };
+            }
+	    nixos-cosmic.nixosModules.default
+            ./configuration.nix
+	    nix-flatpak.nixosModules.nix-flatpak
+	    home-manager.nixosModules.home-manager 
+	    {
+	      home-manager.useUserPackages = true;
+	      home-manager.users.joshuaelm = {
+		imports = [ ./home.nix nixvim.homeManagerModules.nixvim];
+	      };
+	    }  
+	  ];
+        };
+      };
+    };
+
+  }
+  
+
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -0,0 +1,38 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/2f8be994-adce-4cca-a9f1-eecf42b1acfb";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/29B6-5932";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
--- a/home.nix
+++ b/home.nix
@@ -0,0 +1,64 @@
+{ config, pkgs, inputs, ... }:
+
+{
+  # Home Manager needs a bit of information about you and the
+  # paths it should manage.
+  home.username = "joshuaelm";
+  home.homeDirectory = "/home/joshuaelm";
+
+  imports = [ modules/nvim ];
+
+
+  home.packages = [
+    pkgs.signal-desktop
+    pkgs.swaybg
+    pkgs.kitty
+    pkgs.supersonic-wayland
+    pkgs.adw-gtk3
+  ];
+
+  programs.hyprlock.enable = true;
+
+  xdg.configFile.hypr.source = ./modules/hypr;
+  xdg.configFile.waybar.source = ./modules/waybar;
+  xdg.configFile.cava.source = ./modules/cava;
+  xdg.configFile.kitty.source = ./modules/kitty;
+  xdg.configFile.rofi.source = ./modules/rofi;
+  xdg.configFile.dunst.source = ./modules/dunst;
+  home.file.".cache/ags/hyprpanel/options.json".source = ./modules/hyprpanel/options.json;
+
+  xdg.configFile.hypr.force = true;
+  xdg.configFile.waybar.force = true;
+  xdg.configFile.cava.force = true;
+  xdg.configFile.kitty.force = true;
+  xdg.configFile.rofi.force = true;
+  xdg.configFile.dunst.force = true;
+  home.file.".cache/ags/hyprpanel/options.json".force = true;
+
+  home.file.".icons/default".source = "${pkgs.bibata-cursors}/share/icons/Bibata-Modern-Classic";
+
+  services.mpd-mpris.enable = true;
+
+  wayland.windowManager.hyprland = {
+     plugins = [
+        inputs.hyprgrass.packages.${pkgs.system}.default
+
+        # optional integration with pulse-audio, see examples/hyprgrass-pulse/README.md
+        inputs.hyprgrass.packages.${pkgs.system}.hyprgrass-pulse
+     ];
+  };
+
+  # This value determines the Home Manager release that your
+  # configuration is compatible with. This helps avoid breakage
+  # when a new Home Manager release introduces backwards
+  # incompatible changes.
+  #
+  # You can update Home Manager without changing this value. See
+  # the Home Manager release notes for a list of state version
+  # changes in each release.
+  home.stateVersion = "23.11";
+
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+}
--- a/modules/cava/config
+++ b/modules/cava/config
@@ -0,0 +1,218 @@
+## Configuration file for CAVA.
+# Remove the ; to change parameters.
+
+
+[general]
+
+# Smoothing mode. Can be 'normal', 'scientific' or 'waves'. DEPRECATED as of 0.6.0
+; mode = normal
+
+# Accepts only non-negative values.
+; framerate = 60
+
+# 'autosens' will attempt to decrease sensitivity if the bars peak. 1 = on, 0 = off
+# new as of 0.6.0 autosens of low values (dynamic range)
+# 'overshoot' allows bars to overshoot (in % of terminal height) without initiating autosens. DEPRECATED as of 0.6.0
+; autosens = 1
+; overshoot = 20
+
+# Manual sensitivity in %. If autosens is enabled, this will only be the initial value.
+# 200 means double height. Accepts only non-negative values.
+; sensitivity = 100
+
+# The number of bars (0-512). 0 sets it to auto (fill up console).
+# Bars' width and space between bars in number of characters.
+; bars = 0
+; bar_width = 2
+; bar_spacing = 1
+# bar_height is only used for output in "noritake" format
+; bar_height = 32
+
+# For SDL width and space between bars is in pixels, defaults are:
+; bar_width = 20
+; bar_spacing = 5
+
+# sdl_glsl have these default values, they are only used to calulate max number of bars.
+; bar_width = 1
+; bar_spacing = 0
+
+
+# Lower and higher cutoff frequencies for lowest and highest bars
+# the bandwidth of the visualizer.
+# Note: there is a minimum total bandwidth of 43Mhz x number of bars.
+# Cava will automatically increase the higher cutoff if a too low band is specified.
+; lower_cutoff_freq = 50
+; higher_cutoff_freq = 10000
+
+
+# Seconds with no input before cava goes to sleep mode. Cava will not perform FFT or drawing and
+# only check for input once per second. Cava will wake up once input is detected. 0 = disable.
+; sleep_timer = 0
+
+
+[input]
+
+# Audio capturing method. Possible methods are: 'pulse', 'alsa', 'fifo', 'sndio' or 'shmem'
+# Defaults to 'pulse', 'pipewire', 'alsa' or 'fifo', in that order, dependent on what support cava was built with.
+# On Mac it defaults to 'portaudio' or 'fifo'
+# On windows this is automatic and no input settings are needed.
+#
+# All input methods uses the same config variable 'source'
+# to define where it should get the audio.
+#
+# For pulseaudio and pipewire 'source' will be the source. Default: 'auto', which uses the monitor source of the default sink
+# (all pulseaudio sinks(outputs) have 'monitor' sources(inputs) associated with them).
+#
+# For pipewire 'source' will be the object name or object.serial of the device to capture from.
+# Both input and output devices are supported.
+#
+# For alsa 'source' will be the capture device.
+# For fifo 'source' will be the path to fifo-file.
+# For shmem 'source' will be /squeezelite-AA:BB:CC:DD:EE:FF where 'AA:BB:CC:DD:EE:FF' will be squeezelite's MAC address
+; method = pulse
+; source = auto
+
+; method = pipewire
+; source = auto
+
+; method = alsa
+; source = hw:Loopback,1
+
+; method = fifo
+; source = /tmp/mpd.fifo
+; sample_rate = 44100
+; sample_bits = 16
+
+; method = shmem
+; source = /squeezelite-AA:BB:CC:DD:EE:FF
+
+; method = portaudio
+; source = auto
+
+
+[output]
+
+# Output method. Can be 'ncurses', 'noncurses', 'raw', 'noritake', 'sdl'
+# or 'sdl_glsl'.
+# 'noncurses' uses a custom framebuffer technique and prints only changes
+# from frame to frame in the terminal. 'ncurses' is default if supported.
+#
+# 'raw' is an 8 or 16 bit (configurable via the 'bit_format' option) data
+# stream of the bar heights that can be used to send to other applications.
+# 'raw' defaults to 200 bars, which can be adjusted in the 'bars' option above.
+#
+# 'noritake' outputs a bitmap in the format expected by a Noritake VFD display
+#  in graphic mode. It only support the 3000 series graphical VFDs for now.
+#
+# 'sdl' uses the Simple DirectMedia Layer to render in a graphical context.
+# 'sdl_glsl' uses SDL to create an OpenGL context. Write your own shaders or
+# use one of the predefined ones.
+; method = ncurses
+
+# Orientation of the visualization. Can be 'bottom', 'top', 'left' or 'right'.
+# Default is 'bottom'. Other orientations are only supported on sdl and ncruses
+# output. Note: many fonts have weird glyphs for 'top' and 'right' characters,
+# which can make ncurses not look right.
+; orientation = bottom
+
+# Visual channels. Can be 'stereo' or 'mono'.
+# 'stereo' mirrors both channels with low frequencies in center.
+# 'mono' outputs left to right lowest to highest frequencies.
+# 'mono_option' set mono to either take input from 'left', 'right' or 'average'.
+# set 'reverse' to 1 to display frequencies the other way around.
+; channels = stereo
+; mono_option = average
+; reverse = 0
+
+# Raw output target. A fifo will be created if target does not exist.
+; raw_target = /dev/stdout
+
+# Raw data format. Can be 'binary' or 'ascii'.
+; data_format = binary
+
+# Binary bit format, can be '8bit' (0-255) or '16bit' (0-65530).
+; bit_format = 16bit
+
+# Ascii max value. In 'ascii' mode range will run from 0 to value specified here
+; ascii_max_range = 1000
+
+# Ascii delimiters. In ascii format each bar and frame is separated by a delimiters.
+# Use decimal value in ascii table (i.e. 59 = ';' and 10 = '\n' (line feed)).
+; bar_delimiter = 59
+; frame_delimiter = 10
+
+# sdl window size and position. -1,-1 is centered.
+; sdl_width = 1000
+; sdl_height = 500
+; sdl_x = -1
+; sdl_y= -1
+
+# set label on bars on the x-axis. Can be 'frequency' or 'none'. Default: 'none'
+# 'frequency' displays the lower cut off frequency of the bar above.
+# Only supported on ncurses and noncurses output.
+; xaxis = none
+
+# enable alacritty synchronized updates. 1 = on, 0 = off
+# removes flickering in alacritty terminal emulator.
+# defaults to off since the behaviour in other terminal emulators is unknown
+; alacritty_sync = 0
+
+# Shaders for sdl_glsl, located in $HOME/.config/cava/shaders
+; vertex_shader = pass_through.vert
+; fragment_shader = bar_spectrum.frag
+
+; for glsl output mode, keep rendering even if no audio
+; continuous_rendering = 0
+
+[color]
+gradient = 1
+gradient_count = 8
+
+#GruvBox Green to Red Gradient
+gradient_color_1 = '#98971a'
+gradient_color_2 = '#98971a'
+gradient_color_3 = '#fabd2f'
+gradient_color_4 = '#fabd2f'
+gradient_color_5 = '#fabd2f'
+gradient_color_6 = '#d65d0e'
+gradient_color_7 = '#cc241d'
+gradient_color_8 = '#cc241d'
+
+
+[smoothing]
+
+# Percentage value for integral smoothing. Takes values from 0 - 100.
+# Higher values means smoother, but less precise. 0 to disable.
+# DEPRECATED as of 0.8.0, use noise_reduction instead
+; integral = 77
+
+# Disables or enables the so-called "Monstercat smoothing" with or without "waves". Set to 0 to disable.
+; monstercat = 0
+; waves = 0
+
+# Set gravity percentage for "drop off". Higher values means bars will drop faster.
+# Accepts only non-negative values. 50 means half gravity, 200 means double. Set to 0 to disable "drop off".
+# DEPRECATED as of 0.8.0, use noise_reduction instead
+; gravity = 100
+
+
+# In bar height, bars that would have been lower that this will not be drawn.
+# DEPRECATED as of 0.8.0
+; ignore = 0
+
+# Noise reduction, int 0 - 100. default 77
+# the raw visualization is very noisy, this factor adjusts the integral and gravity filters to keep the signal smooth
+# 100 will be very slow and smooth, 0 will be fast but noisy.
+; noise_reduction = 77
+
+
+[eq]
+
+# This one is tricky. You can have as much keys as you want.
+# Remember to uncomment more than one key! More keys = more precision.
+# Look at readme.md on github for further explanations and examples.
+; 1 = 1 # bass
+; 2 = 1
+; 3 = 1 # midtone
+; 4 = 1
+; 5 = 1 # treble
--- a/modules/cava/shaders/bar_spectrum.frag
+++ b/modules/cava/shaders/bar_spectrum.frag
@@ -0,0 +1,79 @@
+#version 330
+
+in vec2 fragCoord;
+out vec4 fragColor;
+
+// bar values. defaults to left channels first (low to high), then right (high to low).
+uniform float bars[512];
+
+uniform int bars_count;    // number of bars (left + right) (configurable)
+uniform int bar_width;    // bar width (configurable), not used here
+uniform int bar_spacing;    // space bewteen bars (configurable)
+
+uniform vec3 u_resolution; // window resolution
+
+//colors, configurable in cava config file (r,g,b) (0.0 - 1.0)
+uniform vec3 bg_color; // background color
+uniform vec3 fg_color; // foreground color
+
+uniform int gradient_count;
+uniform vec3 gradient_colors[8]; // gradient colors
+
+vec3 normalize_C(float y,vec3 col_1, vec3 col_2, float y_min, float y_max)
+{
+    //create color based on fraction of this color and next color
+    float yr = (y - y_min) / (y_max - y_min);
+    return col_1 * (1.0 - yr) + col_2 * yr;
+}
+
+void main()
+{
+    // find which bar to use based on where we are on the x axis
+    float x = u_resolution.x * fragCoord.x;
+    int bar = int(bars_count * fragCoord.x);
+
+    //calculate a bar size
+    float bar_size = u_resolution.x / bars_count;
+
+    //the y coordinate and bar values are the same
+    float y =  bars[bar];
+
+    // make sure there is a thin line at bottom
+    if (y * u_resolution.y < 1.0)
+    {
+      y = 1.0 / u_resolution.y;
+    }
+
+    //draw the bar up to current height
+    if (y > fragCoord.y)
+    {
+        //make some space between bars basen on settings
+        if (x > (bar + 1) * (bar_size) - bar_spacing)
+        {
+            fragColor = vec4(bg_color,1.0);
+        }
+        else
+        {
+            if (gradient_count == 0)
+            {
+                fragColor = vec4(fg_color,1.0);
+            }
+            else
+            {
+                //find which color in the configured gradient we are at
+                int color = int((gradient_count - 1) * fragCoord.y);
+
+                //find where on y this and next color is supposed to be
+                float y_min = color / (gradient_count - 1.0);
+                float y_max = (color + 1.0) / (gradient_count - 1.0);
+
+                //make color
+                fragColor = vec4(normalize_C(fragCoord.y, gradient_colors[color], gradient_colors[color + 1], y_min, y_max), 1.0);
+            }
+        }
+    }
+    else
+    {
+        fragColor = vec4(bg_color,1.0);
+    }
+}
--- a/modules/cava/shaders/northern_lights.frag
+++ b/modules/cava/shaders/northern_lights.frag
@@ -0,0 +1,34 @@
+#version 330
+
+in vec2 fragCoord;
+out vec4 fragColor;
+
+// bar values. defaults to left channels first (low to high), then right (high to low).
+uniform float bars[512];
+
+uniform int bars_count;    // number of bars (left + right) (configurable)
+
+uniform vec3 u_resolution; // window resolution, not used here
+
+//colors, configurable in cava config file
+uniform vec3 bg_color; // background color(r,g,b) (0.0 - 1.0), not used here
+uniform vec3 fg_color; // foreground color, not used here
+
+void main()
+{
+    // find which bar to use based on where we are on the x axis
+    int bar = int(bars_count * fragCoord.x);
+
+    float bar_y = 1.0 - abs((fragCoord.y - 0.5)) * 2.0;
+    float y = (bars[bar]) * bar_y;
+
+    float bar_x = (fragCoord.x - float(bar) / float(bars_count)) * bars_count;
+    float bar_r = 1.0 - abs((bar_x - 0.5)) * 2;
+
+    bar_r = bar_r * bar_r * 2;
+
+    // set color
+    fragColor.r = fg_color.x * y * bar_r;
+    fragColor.g = fg_color.y * y * bar_r;
+    fragColor.b = fg_color.z * y * bar_r;
+}
--- a/modules/cava/shaders/pass_through.vert
+++ b/modules/cava/shaders/pass_through.vert
@@ -0,0 +1,14 @@
+#version 330
+
+
+// Input vertex data, different for all executions of this shader.
+layout(location = 0) in vec3 vertexPosition_modelspace;
+
+// Output data ; will be interpolated for each fragment.
+out vec2 fragCoord;
+
+void main()
+{
+    gl_Position =  vec4(vertexPosition_modelspace,1);
+    fragCoord  = (vertexPosition_modelspace.xy+vec2(1,1))/2.0;
+}
--- a/modules/dunst/dunstrc
+++ b/modules/dunst/dunstrc
@@ -0,0 +1,22 @@
+
+[global]
+separator_color= frame
+progress_bar = true
+progress_bar_corner_radius = 10
+corner_radius = 10
+icon_corner_radius = 10
+
+[urgency_low]
+background = "#1d2021"
+foreground = "#d4be98"
+frame_color = "#1d2021"
+
+[urgency_normal]
+background = "#1d2021"
+foreground = "#d4be98"
+frame_color = "#1d2021"
+
+[urgency_critical]
+background = "#3c1f1e"
+foreground = "#ddc7a1"
+frame_color = "#3c1f1e"
--- a/modules/hypr/hyprland.conf
+++ b/modules/hypr/hyprland.conf
@@ -0,0 +1,234 @@
+autogenerated = 0 # remove this line to remove the warning
+
+source=~/.config/hypr/rose-pine.conf
+
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor = eDP-1, highres@highrr, 0x0, 1
+#monitor = HDMI-A-1, disable
+#monitor = sunshine, highres@highrr, 0x0, 1
+exec-once = hyprctl dispatch workspace 1
+exec-once = swaybg -i ~/NixOS-Configs/Wallpapers/sDpJ0mPGhn4FnbWOsOI4HoiYUvnyKjJck4RJnPZo-3609584059.jpg
+#exec-once = linux-wallpaperengine --screen-root HDMI-A-1 --silent --fps 60 3000562427
+exec-once = hyprlock
+exec-once = hypridle
+# exec-once = waybar
+exec-once = hyprpanel 
+exec-once = systemctl --user start hyprpolkitagent
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more
+
+# Execute your favorite apps at launch
+# exec-once = waybar & hyprpaper & firefox
+
+# Source a file (multi-file configs)
+# source = ~/.config/hypr/myColors.conf
+
+# Set programs that you use
+$terminal = kitty
+$fileManager = cosmic-files 
+$menu = rofi -config ~/.config/rofi/apps.rasi -show drun
+
+# Some default env vars.
+env = XCURSOR_SIZE,24
+env = QT_QPA_PLATFORMTHEME,qt6ct # change to qt6ct if you have that
+
+# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
+input {
+    kb_layout = us
+    kb_variant =
+    kb_model =
+    kb_options =
+    kb_rules =
+    accel_profile = flat
+
+    follow_mouse = 1
+
+    touchpad {
+        natural_scroll = yes
+	tap-to-click = no
+	tap-and-drag = yes
+	clickfinger_behavior = yes
+    }
+
+    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+}
+
+general {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
+    gaps_in = 5
+    gaps_out = 5
+    border_size = 2
+    col.active_border = rgb(3d59a1)
+    col.inactive_border = rgb(787c99)
+    layout = dwindle
+
+    # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
+    allow_tearing = false
+}
+
+decoration {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
+    rounding = 10
+   
+    blur {
+        enabled = yes
+        size = 5
+        passes = 3
+        new_optimizations = on
+        ignore_opacity = on
+        xray = false
+    }
+
+    shadow {
+	enabled = true
+	offset = 3, 3
+	color = rgba(323232cc)
+    }
+}
+
+animations {
+    enabled = yes
+
+    # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+
+    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+
+    animation = windows, 1, 7, myBezier
+    animation = windowsOut, 1, 7, default, popin 80%
+    animation = border, 1, 10, default
+    animation = borderangle, 1, 8, default
+    animation = fade, 1, 7, default
+    animation = workspaces, 1, 6, default
+}
+
+dwindle {
+    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ fogr more
+    pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    preserve_split = yes # you probably want this
+}
+
+layerrule = unset, overlay
+
+gestures {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    workspace_swipe = true
+    workspace_swipe_cancel_ratio = 0.15
+}
+
+plugin {
+ touch_gestures {
+  # The default sensitivity is probably too low on tablet screens,
+  # I recommend turning it up to 4.0
+  sensitivity = 4.0
+
+  # must be >= 3
+  workspace_swipe_fingers = 3
+
+  # switching workspaces by swiping from an edge, this is separate from workspace_swipe_fingers
+  # and can be used at the same time
+  # possible values: l, r, u, or d
+  # to disable it set it to anything else
+  workspace_swipe_edge = d
+
+  
+  # in milliseconds
+  long_press_delay = 400
+
+  # resize windows by long-pressing on window borders and gaps.
+  # If general:resize_on_border is enabled, general:extend_border_grab_area is used for floating
+  # windows
+  resize_on_border_long_press = true
+
+  # in pixels, the distance from the edge that is considered an edge
+  edge_margin = 10
+
+  # emulates touchpad swipes when swiping in a direction that does not trigger workspace swipe.
+  # ONLY triggers when finger count is equal to workspace_swipe_fingers
+  #
+  # might be removed in the future in favor of event hooks
+  emulate_touchpad_swipe = false
+
+  experimental {
+    # send proper cancel events to windows instead of hacky touch_up events,
+    # NOT recommended as it crashed a few times, once it's stabilized I'll make it the default
+    send_cancel = 0
+  }
+ }
+}
+
+misc {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    force_default_wallpaper = 0 # Set to 0 to disable the anime mascot wallpapers
+}
+
+# Example per-device config
+# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
+
+
+# Example windowrule v1
+# windowrule = float, ^(kitty)$
+# Example windowrule v2
+# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+
+# Window Rules
+
+
+
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more
+$mainMod = SUPER
+
+# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+bind = $mainMod, Return, exec, $terminal
+bind = $mainMod, Q, killactive, 
+bind = $mainMod, M, exec, hyprlock 
+bind = $mainMod, E, exec, $fileManager
+bind = $mainMod, V, togglefloating, 
+bind = $mainMod, Space, exec, $menu
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, togglesplit, # dwindle
+bind = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+
+bind = , XF86AudioLowerVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%-
+
+# Move focus with mainMod + arrow keys
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, down, movefocus, d
+
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+# Example special workspace (scratchpad)
+bind = $mainMod, S, togglespecialworkspace, magic
+bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
--- a/modules/hypr/hyprlock.conf
+++ b/modules/hypr/hyprlock.conf
@@ -0,0 +1,84 @@
+background {
+    monitor =
+    path = ~/NixOS-Configs/Wallpapers/WE-Lake.png
+
+    # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+    blur_passes = 3 # 0 disables blurring
+    blur_size = 13
+    contrast = 0.8916
+    brightness = 0.8172
+    vibrancy = 0.1696
+    vibrancy_darkness = 0.0
+}
+
+
+image {
+    monitor =
+    path = ~/NixOS-Configs/pfp.jpg
+    border_size = 2
+    border_color = rgba(255, 255, 255, 0)
+    size = 130
+    rounding = 100
+    rotate = 0
+    reload_time = -1
+    reload_cmd = 
+    position = 0, 40
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = cmd[update:1000] echo -e "$(date +"%A, %B %d")"
+    color = rgba(122, 162, 247, 0.70)
+    font_size = 25
+    font_family = Roboto Bold
+    position = 0, 350
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = cmd[update:1000] echo "<span>$(date +"%I:%M")</span>"
+    color = rgba(122, 162, 247, 0.70)
+    font_size = 120
+    font_family = Roboto Bold
+    position = 0, 250
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = Joshua Elmasri
+    text_align = center # center/right or any value for default left. multi-line text alignment inside label container
+    color = rgba(122, 162, 247, 1.0)
+    font_size = 30
+    font_family = Roboto Bold
+    rotate = 0 # degrees, counter-clockwise
+
+    position = 0, -110
+    halign = center
+    valign = center
+}
+
+input-field {
+    monitor =
+    size = 300, 60
+    outline_thickness = 2
+    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = false
+    dots_fade_time = 0
+    outer_color = rgba(0, 0, 0, 0)
+    inner_color = rgba(255, 255, 255, 0.1)
+    font_color = rgb(169, 177, 214)
+    fade_on_empty = false
+    font_family = Roboto
+    placeholder_text = Password
+    hide_input = false
+    position = 0, -210
+    halign = center
+    valign = center
+}
--- a/modules/hypr/rose-pine.conf
+++ b/modules/hypr/rose-pine.conf
@@ -0,0 +1,19 @@
+## name: Rosé Pine
+## author: jishnurajendran
+## upstream: https://github.com/jishnurajendran/hyprland-rosepine/blob/main/rose-pine.conf
+## All natural pine, faux fur and a bit of soho vibes for the classy minimalist
+$base           = 0xff191724
+$surface        = 0xff1f1d2e
+$overlay        = 0xff26233a
+$muted          = 0xff6e6a86
+$subtle         = 0xff908caa
+$text           = 0xffe0def4
+$love           = 0xffeb6f92
+$gold           = 0xfff6c177
+$rose           = 0xffebbcba
+$pine           = 0xff31748f
+$foam           = 0xff9ccfd8
+$iris           = 0xffc4a7e7
+$highlightLow   = 0xff21202e
+$highlightMed   = 0xff403d52
+$highlightHigh  = 0xff524f67
--- a/modules/hyprpanel/options.json
+++ b/modules/hyprpanel/options.json
@@ -0,0 +1,110 @@
+{
+  "bar.customModules.updates.pollingInterval": 1440000,
+  "menus.transition": "none",
+  "theme.bar.menus.monochrome": false,
+  "theme.bar.transparent": false,
+  "theme.bar.menus.card_radius": "0.4em",
+  "theme.bar.menus.border.radius": "0.7em",
+  "theme.bar.menus.border.size": "5px",
+  "theme.bar.floating": true,
+  "theme.bar.outer_spacing": "1px",
+  "theme.bar.border.location": "none",
+  "theme.bar.location": "top",
+  "theme.bar.buttons.enableBorders": false,
+  "menus.clock.time.military": true,
+  "menus.clock.time.hideSeconds": true,
+  "menus.clock.weather.location": "Cedar Hill",
+  "theme.bar.border_radius": "10px",
+  "theme.bar.buttons.workspaces.enableBorder": false,
+  "theme.bar.buttons.radius": "10px",
+  "theme.bar.buttons.padding_y": "0.2rem",
+  "theme.bar.buttons.padding_x": "0.7rem",
+  "theme.bar.margin_sides": "0.5em",
+  "bar.launcher.autoDetectIcon": true,
+  "menus.dashboard.powermenu.avatar.image": "/home/joshuaelm/NixOS-Configs/pfp.jpg",
+  "menus.dashboard.powermenu.avatar.name": "Joshua Elmasri",
+  "theme.bar.menus.menu.dashboard.profile.radius": "100px",
+  "menus.dashboard.powermenu.logout": "hyprlock",
+  "menus.dashboard.controls.enabled": false,
+  "menus.dashboard.stats.enabled": true,
+  "menus.dashboard.shortcuts.enabled": false,
+  "menus.dashboard.directories.enabled": false,
+  "menus.dashboard.stats.enable_gpu": false,
+  "menus.bluetooth.showBattery": true,
+  "theme.font.name": "Roboto",
+  "scalingPriority": "hyprland",
+  "bar.customModules.netstat.dynamicIcon": false,
+  "theme.bar.buttons.modules.netstat.enableBorder": false,
+  "theme.bar.buttons.modules.power.enableBorder": false,
+  "menus.media.hideAuthor": false,
+  "menus.media.displayTimeTooltip": false,
+  "menus.media.displayTime": true,
+  "menus.volume.raiseMaximumVolume": false,
+  "bar.volume.label": true,
+  "bar.network.label": true,
+  "bar.network.truncation": true,
+  "bar.media.format": "{title}",
+  "bar.media.show_active_only": true,
+  "bar.media.truncation_size": 100,
+  "bar.clock.format": "%R",
+  "bar.clock.icon": "",
+  "bar.layouts": {
+    "0": {
+      "left": [
+        "dashboard",
+        "workspaces"
+      ],
+      "middle": [
+        "media"
+      ],
+      "right": [
+        "volume",
+        "network",
+        "bluetooth",
+        "battery",
+        "systray",
+        "clock",
+        "notifications"
+      ]
+    },
+    "1": {
+      "left": [
+        "dashboard",
+        "workspaces",
+        "windowtitle"
+      ],
+      "middle": [
+        "media"
+      ],
+      "right": [
+        "volume",
+        "clock",
+        "notifications"
+      ]
+    },
+    "2": {
+      "left": [
+        "dashboard",
+        "workspaces",
+        "windowtitle"
+      ],
+      "middle": [
+        "media"
+      ],
+      "right": [
+        "volume",
+        "clock",
+        "notifications"
+      ]
+    }
+  },
+  "theme.bar.buttons.workspaces.fontSize": "1.2em",
+  "bar.workspaces.show_numbered": false,
+  "theme.bar.buttons.workspaces.smartHighlight": true,
+  "bar.workspaces.show_icons": true,
+  "bar.workspaces.icons.occupied": "",
+  "theme.bar.opacity": 100,
+  "theme.bar.buttons.monochrome": false,
+  "theme.bar.buttons.notifications.enableBorder": false,
+  "menus.dashboard.powermenu.sleep": "systemctl suspend-then-hibernate"
+}
--- a/modules/kitty/kitty.conf
+++ b/modules/kitty/kitty.conf
@@ -0,0 +1,11 @@
+include themes/tokyo-night-kitty.conf
+
+font_family      Fira Code Nerd Font
+bold_font        auto
+italic_font      auto
+bold_italic_font auto
+
+confirm_os_window_close 0
+background_opacity 0.8
+background_blur 0
+cursor_shape beam
--- a/modules/kitty/themes/gruvbox.conf
+++ b/modules/kitty/themes/gruvbox.conf
@@ -0,0 +1,56 @@
+# vim:ft=kitty
+
+# gruvbox-dark colorscheme for kitty
+# snazzy theme used as base
+
+cursor                  #928374
+cursor_text_color       background
+
+visual_bell_color       #8ec07c
+bell_border_color       #8ec07c
+
+active_border_color     #d3869b
+inactive_border_color   #665c54
+
+active_tab_foreground   #fbf1c7
+active_tab_background   #665c54
+inactive_tab_foreground #a89984
+inactive_tab_background #3c3836
+
+foreground              #ebdbb2
+background              #272727
+selection_foreground    #655b53
+selection_background    #ebdbb2
+url_color               #d65c0d
+
+# black
+color0   #272727
+color8   #928373
+
+# red
+color1   #cc231c
+color9   #fb4833
+
+# green
+color2   #989719
+color10  #b8ba25
+
+# yellow
+color3   #d79920
+color11  #fabc2e
+
+# blue
+color4  #448488
+color12 #83a597
+
+# magenta
+color5   #b16185
+color13  #d3859a
+
+# cyan
+color6   #689d69
+color14  #8ec07b
+
+# white
+color7   #a89983
+color15  #ebdbb2
--- a/modules/kitty/themes/rose-pine-dawn.conf
+++ b/modules/kitty/themes/rose-pine-dawn.conf
@@ -0,0 +1,56 @@
+## name: Rosé Pine Dawn
+## author: mvllow
+## license: MIT
+## upstream: https://github.com/rose-pine/kitty/blob/main/dist/rose-pine-dawn.conf
+## blurb: All natural pine, faux fur and a bit of soho vibes for the classy minimalist
+
+foreground               #575279
+background               #faf4ed
+selection_foreground     #575279
+selection_background     #dfdad9
+
+cursor                   #cecacd
+cursor_text_color        #575279
+
+url_color                #907aa9
+
+active_tab_foreground    #575279
+active_tab_background    #f2e9e1
+inactive_tab_foreground  #9893a5
+inactive_tab_background  #faf4ed
+
+active_border_color      #286983
+inactive_border_color    #dfdad9
+
+# black
+color0   #f2e9e1
+color8   #9893a5
+
+# red
+color1   #b4637a
+color9   #b4637a
+
+# green
+color2   #286983
+color10  #286983
+
+# yellow
+color3   #ea9d34
+color11  #ea9d34
+
+# blue
+color4   #56949f
+color12  #56949f
+
+# magenta
+color5   #907aa9
+color13  #907aa9
+
+# cyan
+color6   #d7827e
+color14  #d7827e
+
+# white
+color7   #575279
+color15  #575279
+
--- a/modules/kitty/themes/rose-pine-moon.conf
+++ b/modules/kitty/themes/rose-pine-moon.conf
@@ -0,0 +1,56 @@
+## name: Rosé Pine Moon
+## author: mvllow
+## license: MIT
+## upstream: https://github.com/rose-pine/kitty/blob/main/dist/rose-pine-moon.conf
+## blurb: All natural pine, faux fur and a bit of soho vibes for the classy minimalist
+
+foreground               #e0def4
+background               #232136
+selection_foreground     #e0def4
+selection_background     #44415a
+
+cursor                   #56526e
+cursor_text_color        #e0def4
+
+url_color                #c4a7e7
+
+active_tab_foreground    #e0def4
+active_tab_background    #393552
+inactive_tab_foreground  #6e6a86
+inactive_tab_background  #232136
+
+active_border_color      #3e8fb0
+inactive_border_color    #44415a
+
+# black
+color0   #393552
+color8   #6e6a86
+
+# red
+color1   #eb6f92
+color9   #eb6f92
+
+# green
+color2   #3e8fb0
+color10  #3e8fb0
+
+# yellow
+color3   #f6c177
+color11  #f6c177
+
+# blue
+color4   #9ccfd8
+color12  #9ccfd8
+
+# magenta
+color5   #c4a7e7
+color13  #c4a7e7
+
+# cyan
+color6   #ea9a97
+color14  #ea9a97
+
+# white
+color7   #e0def4
+color15  #e0def4
+
--- a/modules/kitty/themes/rose-pine.conf
+++ b/modules/kitty/themes/rose-pine.conf
@@ -0,0 +1,56 @@
+## name: Rosé Pine
+## author: mvllow
+## license: MIT
+## upstream: https://github.com/rose-pine/kitty/blob/main/dist/rose-pine.conf
+## blurb: All natural pine, faux fur and a bit of soho vibes for the classy minimalist
+
+foreground               #e0def4
+background               #191724
+selection_foreground     #e0def4
+selection_background     #403d52
+
+cursor                   #524f67
+cursor_text_color        #e0def4
+
+url_color                #c4a7e7
+
+active_tab_foreground    #e0def4
+active_tab_background    #26233a
+inactive_tab_foreground  #6e6a86
+inactive_tab_background  #191724
+
+active_border_color      #31748f
+inactive_border_color    #403d52
+
+# black
+color0   #26233a
+color8   #6e6a86
+
+# red
+color1   #eb6f92
+color9   #eb6f92
+
+# green
+color2   #31748f
+color10  #31748f
+
+# yellow
+color3   #f6c177
+color11  #f6c177
+
+# blue
+color4   #9ccfd8
+color12  #9ccfd8
+
+# magenta
+color5   #c4a7e7
+color13  #c4a7e7
+
+# cyan
+color6   #ebbcba
+color14  #ebbcba
+
+# white
+color7   #e0def4
+color15  #e0def4
+
--- a/modules/kitty/themes/tokyo-night-kitty.conf
+++ b/modules/kitty/themes/tokyo-night-kitty.conf
@@ -0,0 +1,77 @@
+# Tokyo Night color scheme for kitty terminal emulator
+# https://github.com/davidmathers/tokyo-night-kitty-theme
+#
+# Based on Tokyo Night color theme for Visual Studio Code
+# https://github.com/enkia/tokyo-night-vscode-theme
+
+foreground #a9b1d6
+background #1a1b26
+
+# Black
+color0 #414868
+color8 #414868
+
+# Red
+color1 #f7768e
+color9 #f7768e
+
+# Green
+color2  #73daca
+color10 #73daca
+
+# Yellow
+color3  #e0af68
+color11 #e0af68
+
+# Blue
+color4  #7aa2f7
+color12 #7aa2f7
+
+# Magenta
+color5  #bb9af7
+color13 #bb9af7
+
+# Cyan
+color6  #7dcfff
+color14 #7dcfff
+
+# White
+color7  #c0caf5
+color15 #c0caf5
+
+# Cursor
+cursor #c0caf5
+cursor_text_color #1a1b26
+
+# Selection highlight
+selection_foreground none
+selection_background #28344a
+
+# The color for highlighting URLs on mouse-over
+url_color #9ece6a
+
+# Window borders
+active_border_color #3d59a1
+inactive_border_color #101014
+bell_border_color #e0af68
+
+# Tab bar
+tab_bar_style fade
+tab_fade 1
+active_tab_foreground   #3d59a1
+active_tab_background   #16161e
+active_tab_font_style   bold
+inactive_tab_foreground #787c99
+inactive_tab_background #16161e
+inactive_tab_font_style bold
+tab_bar_background #101014
+
+# Title bar
+macos_titlebar_color #16161e
+
+# Storm
+# background #24283b
+# cursor_text_color #24283b
+# active_tab_background   #1f2335
+# inactive_tab_background #1f2335
+# macos_titlebar_color #1f2335
--- a/modules/nvim/default.nix
+++ b/modules/nvim/default.nix
@@ -0,0 +1,21 @@
+{config, pkgs, lib, inputs, ...}:
+
+{
+  programs.nixvim = {
+    enable = true;
+    colorschemes.tokyonight.enable = true;
+    plugins.nvim-tree.enable = true;
+    plugins.treesitter.enable = true;
+    plugins.lualine.enable = true;
+    plugins.lsp.enable = true;
+    plugins.luasnip.enable = true;
+    plugins.toggleterm.enable = true;
+    plugins.cmp.enable = true;
+    plugins.gitsigns.enable = true;
+    plugins.web-devicons.enable = true;
+    plugins.which-key.enable = true;
+    plugins.cmp-nvim-lsp.enable = true;
+    plugins.telescope.enable = true;
+    plugins.indent-blankline.enable = true; 
+  };  
+}
--- a/modules/rofi/apps.rasi
+++ b/modules/rofi/apps.rasi
@@ -0,0 +1,17 @@
+configuration {
+    show-icons: true;
+    font: "FreeSans Regular 12";
+    icon-theme: "Gruvbox-Plus-Dark";
+
+    display-ssh:    "󰣀 ssh:";
+    display-run:    "󱓞 run:";
+    display-drun:   "󰣖 drun:";
+    display-window: "󱂬 window:";
+    display-combi:  "󰕘 combi:";
+    display-filebrowser: "󰉋 filebrowser:";
+
+    dpi: 110;
+}
+
+
+@theme "~/.config/rofi/tokyo-night.rasi"
--- a/modules/rofi/config.rasi
+++ b/modules/rofi/config.rasi
@@ -0,0 +1,16 @@
+configuration {
+    show-icons: true;
+    font: "FreeSans Regular 12";
+
+    display-ssh:    "󰣀 ssh:";
+    display-run:    "󱓞 run:";
+    display-drun:   "󰣖 drun:";
+    display-window: "󱂬 window:";
+    display-combi:  "󰕘 combi:";
+    display-filebrowser: "󰉋 filebrowser:";
+
+    dpi: 110;
+}
+
+
+@theme "~/.config/rofi/tokyo-night.rasi"
--- a/modules/rofi/tokyo-night.rasi
+++ b/modules/rofi/tokyo-night.rasi
@@ -0,0 +1,132 @@
+* {
+	scrollbar: false;
+
+	bg: #24283b;
+	bg-dark: #1f2335;
+	bg-highlight: #292e42;
+	fg: #c0caf5;
+	fg-dark: #3b4261;
+	red-dark: #db4b4b;
+	red-light: #f7768e;
+	yellow: #e0af68;
+	orange: #ff9e64;
+	gray: #565f89;
+
+	background: @bg-dark;
+	background-color: @background;
+	foreground: @fg;
+	border-color: @gray;
+	separatorcolor: @border-color;
+	scrollbar-handle: @border-color;
+
+	normal-background: @background;
+	normal-foreground: @foreground;
+	alternate-normal-background: @bg-dark;
+	alternate-normal-foreground: @fg;
+	selected-normal-background: @bg-highlight;
+	selected-normal-foreground: @fg;
+
+	active-background: @orange;
+	active-foreground: @bg;
+	alternate-active-background: @active-background;
+	alternate-active-foreground: @active-foreground;
+	selected-active-background: @yellow;
+	selected-active-foreground: @active-foreground;
+
+	urgent-background: @red-dark;
+	urgent-foreground: @background;
+	alternate-urgent-background: @urgent-background;
+	alternate-urgent-foreground: @urgent-foreground;
+	selected-urgent-background: @red-dark;
+	selected-urgent-foreground: @urgent-foreground;
+}
+
+window {
+    height: 600;
+    width: 600;
+
+    border-radius: 10;
+}
+
+mainbox {
+    spacing: 0;
+    children: [inputbar, message, listview];
+}
+
+inputbar {
+    color: @normal-foreground;
+    padding: 14;
+    background-color: @background;
+}
+
+message {
+    padding: 10;
+    background-color: @background;
+}
+
+listview {
+    padding: 8;
+    border-radius: 0 0 10 10;
+    border: 2 2 2 2;
+    border-color: @background;
+    background-color: @background;
+    dynamic: false;
+}
+
+textbox {
+    text-color: @normal-foreground;
+}
+
+error-message {
+    border: 20 20 20 20;
+}
+
+entry, prompt, case-indicator {
+    text-color: inherit;
+}
+
+prompt {
+    margin: 0 10 0 0;
+}
+
+element {
+    padding: 5;
+    vertical-align: 0.5;
+    border-radius: 10;
+    text-color: @normal-foreground;
+    background-color: @normal-background;
+}
+
+element.selected.normal {
+    background-color: @selected-normal-background;
+}
+
+element.alternate.normal {
+    background-color: inherit;
+}
+
+element.normal.active, element.alternate.active {
+    background-color: @background;
+}
+
+element.selected.active {
+    background-color: @selected-normal-background;
+}
+
+element.normal.urgent, element.alternate.urgent {
+    background-color: @urgent-background;
+}
+
+element.selected.urgent {
+    background-color: @urgent-background;
+}
+
+element-text, element-icon {
+    size: 40;
+    margin: 0 10 0 0;
+    vertical-align: 0.5;
+    background-color: inherit;
+    text-color: @normal-foreground;
+}
+
+
--- a/modules/wallpaper-engine/effects/_empty/effect.json
+++ b/modules/wallpaper-engine/effects/_empty/effect.json
@@ -0,0 +1,17 @@
+{
+	"version" : 1,
+	"replacementkey" : "empty",
+	"group" : "colorize",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/empty.json"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/empty.json",
+		"shaders/effects/empty.frag",
+		"shaders/effects/empty.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/_empty/materials/effects/empty.json
+++ b/modules/wallpaper-engine/effects/_empty/materials/effects/empty.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/empty",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/_empty/shaders/effects/empty.frag
+++ b/modules/wallpaper-engine/effects/_empty/shaders/effects/empty.frag
@@ -0,0 +1,9 @@
+
+uniform sampler2D g_Texture0; // {"material":"framebuffer","label":"ui_editor_properties_framebuffer","hidden":true}
+
+varying vec2 v_TexCoord;
+
+void main() {
+	vec4 albedo = texSample2D(g_Texture0, v_TexCoord.xy);
+	gl_FragColor = albedo;
+}
--- a/modules/wallpaper-engine/effects/_empty/shaders/effects/empty.vert
+++ b/modules/wallpaper-engine/effects/_empty/shaders/effects/empty.vert
@@ -0,0 +1,12 @@
+
+uniform mat4 g_ModelViewProjectionMatrix;
+
+attribute vec3 a_Position;
+attribute vec2 a_TexCoord;
+
+varying vec2 v_TexCoord;
+
+void main() {
+	gl_Position = mul(vec4(a_Position, 1.0), g_ModelViewProjectionMatrix);
+	v_TexCoord.xy = a_TexCoord;
+}
--- a/modules/wallpaper-engine/effects/blend/effect.json
+++ b/modules/wallpaper-engine/effects/blend/effect.json
@@ -0,0 +1,20 @@
+{
+	"version" : 1,
+	"replacementkey" : "blend",
+	"name" : "ui_editor_effect_blend_title",
+	"description" : "ui_editor_effect_blend_description",
+	"group" : "colorize",
+	"preview" : "preview/project.json",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/blend.json"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/blend.json",
+		"shaders/effects/blend.frag",
+		"shaders/effects/blend.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/blend/materials/effects/blend.json
+++ b/modules/wallpaper-engine/effects/blend/materials/effects/blend.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/blend",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/effects/blend/effect.json
+++ b/modules/wallpaper-engine/effects/blend/preview/effects/blend/effect.json
@@ -0,0 +1,18 @@
+{
+	"name" : "Blend",
+	"description" : "Blend two images with various modes.",
+	"group" : "image",
+	//"preview" : "preview/project.json",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/blend.json"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/blend.json",
+		"shaders/effects/blend.frag",
+		"shaders/effects/blend.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/effects/opacity/effect.json
+++ b/modules/wallpaper-engine/effects/blend/preview/effects/opacity/effect.json
@@ -0,0 +1,18 @@
+{
+	"name" : "Opacity",
+	"description" : "Adds an opacity mask to the image.",
+	"group" : "image",
+	"preview" : "preview/project.json",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/opacity.json"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/opacity.json",
+		"shaders/effects/opacity.frag",
+		"shaders/effects/opacity.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/effects/scroll/effect.json
+++ b/modules/wallpaper-engine/effects/blend/preview/effects/scroll/effect.json
@@ -0,0 +1,18 @@
+{
+	"name" : "Scroll",
+	"description" : "Scrolls the image horizontally or vertically.",
+	"group" : "image",
+	"preview" : "preview/project.json",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/scroll.json"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/scroll.json",
+		"shaders/effects/scroll.frag",
+		"shaders/effects/scroll.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/effects/spin/effect.json
+++ b/modules/wallpaper-engine/effects/blend/preview/effects/spin/effect.json
@@ -0,0 +1,18 @@
+{
+	"name" : "Spin",
+	"description" : "Spin the image.",
+	"group" : "image",
+	"preview" : "preview/project.json",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/spin.json"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/spin.json",
+		"shaders/effects/spin.frag",
+		"shaders/effects/spin.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/effects/transform/effect.json
+++ b/modules/wallpaper-engine/effects/blend/preview/effects/transform/effect.json
@@ -0,0 +1,18 @@
+{
+	"name" : "Transform",
+	"description" : "Apply scaling, rotation and offsets to the image.",
+	"group" : "image",
+	"preview" : "preview/project.json",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/transform.json"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/transform.json",
+		"shaders/effects/transform.frag",
+		"shaders/effects/transform.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/materials/effectpreview.json
+++ b/modules/wallpaper-engine/effects/blend/preview/materials/effectpreview.json
@@ -0,0 +1,13 @@
+{
+	"passes" : 
+	[
+		{
+			"blending" : "translucent",
+			"cullmode" : "nocull",
+			"depthtest" : "disabled",
+			"depthwrite" : "disabled",
+			"shader" : "genericimage2",
+			"textures" : [ "effectpreview" ]
+		}
+	]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/materials/effectpreview.tex
+++ b/modules/wallpaper-engine/effects/blend/preview/materials/effectpreview.tex
--- a/modules/wallpaper-engine/effects/blend/preview/materials/effects/blend.json
+++ b/modules/wallpaper-engine/effects/blend/preview/materials/effects/blend.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/blend",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/materials/effects/opacity.json
+++ b/modules/wallpaper-engine/effects/blend/preview/materials/effects/opacity.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/opacity",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/materials/effects/scroll.json
+++ b/modules/wallpaper-engine/effects/blend/preview/materials/effects/scroll.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/scroll",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/materials/effects/spin.json
+++ b/modules/wallpaper-engine/effects/blend/preview/materials/effects/spin.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/spin",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/materials/effects/transform.json
+++ b/modules/wallpaper-engine/effects/blend/preview/materials/effects/transform.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/transform",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/materials/masks/opacity_mask_ee0d9bbc6d0516b8583c8fb3e841485c0b7ec4e8.tex
+++ b/modules/wallpaper-engine/effects/blend/preview/materials/masks/opacity_mask_ee0d9bbc6d0516b8583c8fb3e841485c0b7ec4e8.tex
--- a/modules/wallpaper-engine/effects/blend/preview/materials/masks/opacity_mask_ee0d9bbc6d0516b8583c8fb3e841485c0b7ec4e8.tex-json
+++ b/modules/wallpaper-engine/effects/blend/preview/materials/masks/opacity_mask_ee0d9bbc6d0516b8583c8fb3e841485c0b7ec4e8.tex-json
@@ -0,0 +1,5 @@
+{
+	"format" : "rgba8888",
+	"nomip" : true,
+	"nonpoweroftwo" : true
+}
--- a/modules/wallpaper-engine/effects/blend/preview/models/effectpreview.json
+++ b/modules/wallpaper-engine/effects/blend/preview/models/effectpreview.json
@@ -0,0 +1,4 @@
+{
+	"autosize" : true,
+	"material" : "materials/effectpreview.json"
+}
--- a/modules/wallpaper-engine/effects/blend/preview/project.json
+++ b/modules/wallpaper-engine/effects/blend/preview/project.json
@@ -0,0 +1,18 @@
+{
+	"file" : "scene.json",
+	"general" : 
+	{
+		"properties" : 
+		{
+			"schemecolor" : 
+			{
+				"order" : 0,
+				"text" : "ui_browse_properties_scheme_color",
+				"type" : "color",
+				"value" : "0 0 0"
+			}
+		}
+	},
+	"title" : "previewblend",
+	"type" : "scene"
+}
--- a/modules/wallpaper-engine/effects/blend/preview/scene.json
+++ b/modules/wallpaper-engine/effects/blend/preview/scene.json
@@ -0,0 +1,115 @@
+{
+	"camera" : 
+	{
+		"center" : "-121.595 -15.576 -1.000",
+		"eye" : "-121.595 -15.576 0.000",
+		"up" : "0.000 1.000 0.000"
+	},
+	"general" : 
+	{
+		"ambientcolor" : "0.3 0.3 0.3",
+		"bloom" : false,
+		"bloomstrength" : 2,
+		"bloomthreshold" : 0.64999997615814209,
+		"cameraparallax" : false,
+		"cameraparallaxamount" : 0.5,
+		"cameraparallaxdelay" : 0.10000000149011612,
+		"cameraparallaxmouseinfluence" : 0,
+		"camerapreview" : true,
+		"camerashake" : false,
+		"camerashakeamplitude" : 0.5,
+		"camerashakeroughness" : 1,
+		"camerashakespeed" : 3,
+		"clearcolor" : "0.7 0.7 0.7",
+		"orthogonalprojection" : 
+		{
+			"height" : 256,
+			"width" : 256
+		},
+		"skylightcolor" : "0.3 0.3 0.3"
+	},
+	"objects" : 
+	[
+		{
+			"angles" : "0.000 0.000 0.000",
+			"dependencies" : [ 15 ],
+			"depth" : 1,
+			"effects" : 
+			[
+				{
+					"file" : "effects/blend/effect.json",
+					"passes" : 
+					[
+						{
+							"combos" : 
+							{
+								"BLENDMODE" : 23
+							},
+							"constantshadervalues" : null,
+							"textures" : [ null, "_rt_imageLayerComposite_15_a" ]
+						}
+					]
+				}
+			],
+			"id" : 38,
+			"image" : "models/effectpreview.json",
+			"name" : "",
+			"origin" : "128.000 128.000 0.000",
+			"scale" : "1.000 1.000 1.000"
+		},
+		{
+			"angles" : "0.000 0.000 0.000",
+			"depth" : 1,
+			"effects" : 
+			[
+				{
+					"file" : "effects/transform/effect.json",
+					"passes" : 
+					[
+						{
+							"combos" : 
+							{
+								"CLAMP" : 1,
+								"MODE" : 0
+							},
+							"constantshadervalues" : 
+							{
+								"Angle" : 0,
+								"Scale" : "3 3"
+							}
+						}
+					]
+				},
+				{
+					"file" : "effects/spin/effect.json",
+					"passes" : 
+					[
+						{
+							"combos" : 
+							{
+								"MODE" : 0
+							},
+							"constantshadervalues" : null
+						}
+					]
+				},
+				{
+					"file" : "effects/opacity/effect.json",
+					"passes" : 
+					[
+						{
+							"combos" : null,
+							"constantshadervalues" : null,
+							"textures" : [ null, "masks/opacity_mask_ee0d9bbc6d0516b8583c8fb3e841485c0b7ec4e8" ]
+						}
+					]
+				}
+			],
+			"id" : 15,
+			"image" : "models/effectpreview.json",
+			"name" : "effectpreview",
+			"origin" : "-204.142 136.225 0.000",
+			"scale" : "1.000 1.000 1.000"
+		}
+	]
+}
--- a/modules/wallpaper-engine/effects/blend/preview/shaders/effects/blend.frag
+++ b/modules/wallpaper-engine/effects/blend/preview/shaders/effects/blend.frag
@@ -0,0 +1,18 @@
+
+// [COMBO] {"material":"Blend mode","combo":"BLENDMODE","type":"imageblending","default":2}
+
+#include "common_blending.h"
+
+varying vec4 v_TexCoord;
+
+uniform sampler2D g_Texture0; // {"material":"Framebuffer","hidden":true}
+uniform sampler2D g_Texture1; // {"material":"Color mask","mode":"rgbmask","default":"util/white"}
+
+void main() {
+	vec4 albedo = texSample2D(g_Texture0, v_TexCoord.xy);
+	vec4 mask = texSample2D(g_Texture1, v_TexCoord.zw);
+	
+	albedo.rgb = ApplyBlending(BLENDMODE, albedo.rgb, mask.rgb, mask.a);
+	
+	gl_FragColor = albedo;
+}
--- a/modules/wallpaper-engine/effects/blend/preview/shaders/effects/blend.vert
+++ b/modules/wallpaper-engine/effects/blend/preview/shaders/effects/blend.vert
@@ -0,0 +1,15 @@
+
+uniform mat4 g_ModelViewProjectionMatrix;
+uniform vec4 g_Texture1Resolution;
+
+attribute vec3 a_Position;
+attribute vec2 a_TexCoord;
+
+varying vec4 v_TexCoord;
+
+void main() {
+	gl_Position = mul(vec4(a_Position, 1.0), g_ModelViewProjectionMatrix);
+	v_TexCoord.xy = a_TexCoord;
+	v_TexCoord.zw = vec2(v_TexCoord.x * g_Texture1Resolution.z / g_Texture1Resolution.x,
+						v_TexCoord.y * g_Texture1Resolution.w / g_Texture1Resolution.y);
+}
--- a/modules/wallpaper-engine/effects/blend/preview/shaders/effects/opacity.frag
+++ b/modules/wallpaper-engine/effects/blend/preview/shaders/effects/opacity.frag
@@ -0,0 +1,13 @@
+
+varying vec4 v_TexCoord;
+
+uniform sampler2D g_Texture0; // {"material":"Framebuffer","hidden":true}
+uniform sampler2D g_Texture1; // {"material":"Mask","mode":"opacitymask","default":"util/white"}
+
+void main() {
+	vec4 albedo = texSample2D(g_Texture0, v_TexCoord.xy);
+	float mask = texSample2D(g_Texture1, v_TexCoord.zw).r;
+	albedo.a *= mask;
+	
+	gl_FragColor = albedo;
+}
--- a/modules/wallpaper-engine/effects/blend/preview/shaders/effects/opacity.vert
+++ b/modules/wallpaper-engine/effects/blend/preview/shaders/effects/opacity.vert
@@ -0,0 +1,15 @@
+
+uniform mat4 g_ModelViewProjectionMatrix;
+uniform vec4 g_Texture1Resolution;
+
+attribute vec3 a_Position;
+attribute vec2 a_TexCoord;
+
+varying vec4 v_TexCoord;
+
+void main() {
+	gl_Position = mul(vec4(a_Position, 1.0), g_ModelViewProjectionMatrix);
+	v_TexCoord.xy = a_TexCoord;
+	v_TexCoord.zw = vec2(v_TexCoord.x * g_Texture1Resolution.z / g_Texture1Resolution.x,
+						v_TexCoord.y * g_Texture1Resolution.w / g_Texture1Resolution.y);
+}
--- a/modules/wallpaper-engine/effects/blend/preview/shaders/effects/scroll.frag
+++ b/modules/wallpaper-engine/effects/blend/preview/shaders/effects/scroll.frag
@@ -0,0 +1,10 @@
+
+varying vec2 v_TexCoord;
+varying vec2 v_Scroll;
+
+uniform sampler2D g_Texture0; // {"material":"Framebuffer","hidden":true}
+
+void main() {
+	vec2 texCoord = frac(v_TexCoord + v_Scroll);
+	gl_FragColor = texSample2D(g_Texture0, texCoord);
+}
--- a/modules/wallpaper-engine/effects/blend/preview/shaders/effects/scroll.vert
+++ b/modules/wallpaper-engine/effects/blend/preview/shaders/effects/scroll.vert
@@ -0,0 +1,21 @@
+
+uniform mat4 g_ModelViewProjectionMatrix;
+uniform float g_Time;
+
+uniform float g_ScrollX; // {"material":"Speed X","default":0.2,"range":[-2,2]}
+uniform float g_ScrollY; // {"material":"Speed Y","default":0.2,"range":[-2,2]}
+
+attribute vec3 a_Position;
+attribute vec2 a_TexCoord;
+
+varying vec2 v_TexCoord;
+varying vec2 v_Scroll;
+
+void main() {
+	gl_Position = mul(vec4(a_Position, 1.0), g_ModelViewProjectionMatrix);
+	v_TexCoord = a_TexCoord;
+	
+	vec2 scroll = vec2(g_ScrollX, g_ScrollY);
+	scroll = sign(scroll) * pow(vec2(g_ScrollX, g_ScrollY), CAST2(2.0));
+	v_Scroll = scroll * g_Time;
+}
--- a/modules/wallpaper-engine/effects/blend/preview/shaders/effects/spin.frag
+++ b/modules/wallpaper-engine/effects/blend/preview/shaders/effects/spin.frag
@@ -0,0 +1,14 @@
+
+// [COMBO] {"material":"Repeat","combo":"CLAMP","type":"options","default":1}
+
+varying vec2 v_TexCoord;
+
+uniform sampler2D g_Texture0; // {"material":"Framebuffer","hidden":true}
+
+void main() {
+	vec2 texCoord = v_TexCoord;
+#if CLAMP
+	texCoord = frac(texCoord);
+#endif
+	gl_FragColor = texSample2D(g_Texture0, texCoord);
+}
--- a/modules/wallpaper-engine/effects/blend/preview/shaders/effects/spin.vert
+++ b/modules/wallpaper-engine/effects/blend/preview/shaders/effects/spin.vert
@@ -0,0 +1,29 @@
+
+// [COMBO] {"material":"Mode","combo":"MODE","type":"options","default":0,"options":{"Vertex":1,"UV":0}}
+
+#include "common.h"
+
+uniform mat4 g_ModelViewProjectionMatrix;
+uniform float g_Time;
+
+uniform float g_Speed; // {"material":"Speed","default":1.0,"range":[-5,5]}
+
+attribute vec3 a_Position;
+attribute vec2 a_TexCoord;
+
+varying vec2 v_TexCoord;
+
+void main() {
+
+	vec3 position = a_Position;
+#if MODE == 1
+	position.xy = rotateVec2(position.xy - CAST2(0.5), g_Speed * g_Time) + CAST2(0.5);
+#endif
+	gl_Position = mul(vec4(position, 1.0), g_ModelViewProjectionMatrix);
+	
+	v_TexCoord = a_TexCoord;
+	
+#if MODE == 0
+	v_TexCoord = rotateVec2(v_TexCoord - CAST2(0.5), g_Speed * g_Time) + CAST2(0.5);
+#endif
+}
--- a/modules/wallpaper-engine/effects/blend/preview/shaders/effects/transform.frag
+++ b/modules/wallpaper-engine/effects/blend/preview/shaders/effects/transform.frag
@@ -0,0 +1,14 @@
+
+// [COMBO] {"material":"Repeat","combo":"CLAMP","type":"options","default":0}
+
+varying vec2 v_TexCoord;
+
+uniform sampler2D g_Texture0; // {"material":"Framebuffer","hidden":true}
+
+void main() {
+	vec2 texCoord = v_TexCoord;
+#if CLAMP
+	texCoord = frac(texCoord);
+#endif
+	gl_FragColor = texSample2D(g_Texture0, texCoord);
+}
--- a/modules/wallpaper-engine/effects/blend/preview/shaders/effects/transform.vert
+++ b/modules/wallpaper-engine/effects/blend/preview/shaders/effects/transform.vert
@@ -0,0 +1,35 @@
+
+// [COMBO] {"material":"Mode","combo":"MODE","type":"options","default":0,"options":{"Vertex":1,"UV":0}}
+
+#include "common.h"
+
+uniform mat4 g_ModelViewProjectionMatrix;
+
+uniform vec2 g_Offset; // {"material":"Offset","default":"0 0"}
+uniform vec2 g_Scale; // {"material":"Scale","default":"1 1"}
+uniform float g_Direction; // {"material":"Angle","default":0,"range":[0,6.28]}
+
+attribute vec3 a_Position;
+attribute vec2 a_TexCoord;
+
+varying vec2 v_TexCoord;
+
+vec2 applyFx(vec2 v) {
+	v = rotateVec2(v - CAST2(0.5), g_Direction);
+	return (v + g_Offset) * g_Scale + CAST2(0.5);
+}
+
+void main() {
+
+	vec3 position = a_Position;
+#if MODE == 1
+	position.xy = applyFx(position.xy);
+#endif
+	gl_Position = mul(vec4(position, 1.0), g_ModelViewProjectionMatrix);
+	
+	v_TexCoord = a_TexCoord;
+	
+#if MODE == 0
+	v_TexCoord = applyFx(v_TexCoord);
+#endif
+}
--- a/modules/wallpaper-engine/effects/blend/preview/template.json
+++ b/modules/wallpaper-engine/effects/blend/preview/template.json
@@ -0,0 +1,4 @@
+{
+	"name": "FX Preview",
+	"type": "scene2d"
+}
--- a/modules/wallpaper-engine/effects/blend/shaders/effects/blend.frag
+++ b/modules/wallpaper-engine/effects/blend/shaders/effects/blend.frag
@@ -0,0 +1,127 @@
+
+// [COMBO] {"material":"ui_editor_properties_blend_mode","combo":"BLENDMODE","type":"imageblending","default":2}
+// [COMBO] {"material":"ui_editor_properties_transform","combo":"TRANSFORMUV","type":"options","default":0}
+// [COMBO] {"material":"ui_editor_properties_transform_repeat","combo":"TRANSFORMREPEAT","type":"options","default":0,"options":{"ui_editor_properties_clip":0,"ui_editor_properties_repeat":1,"ui_editor_properties_clamp_uvs":2},"require":{"TRANSFORMUV":1}}
+// [COMBO] {"material":"ui_editor_properties_write_alpha","combo":"WRITEALPHA","type":"options","default":0}
+// [COMBO] {"material":"ui_editor_properties_number_of_textures","combo":"NUMBLENDTEXTURES","type":"options","default":1,"options":{"1":1,"2":2,"3":3,"4":4,"5":5,"6":6}}
+
+#include "common_blending.h"
+
+varying vec4 v_TexCoord;
+
+#if NUMBLENDTEXTURES >= 2
+varying vec4 v_TexCoord23;
+#endif
+
+#if NUMBLENDTEXTURES >= 4
+varying vec4 v_TexCoord45;
+#endif
+
+#if NUMBLENDTEXTURES >= 6
+varying vec2 v_TexCoord6;
+#endif
+
+uniform float g_Multiply; // {"material":"multiply","label":"ui_editor_properties_blend_amount","default":1,"range":[0.0, 2.0]}
+uniform float g_Multiply2; // {"material":"multiply2","label":"ui_editor_properties_blend_amount_2","default":1,"range":[0.0, 2.0]}
+uniform float g_Multiply3; // {"material":"multiply3","label":"ui_editor_properties_blend_amount_3","default":1,"range":[0.0, 2.0]}
+uniform float g_Multiply4; // {"material":"multiply4","label":"ui_editor_properties_blend_amount_4","default":1,"range":[0.0, 2.0]}
+uniform float g_Multiply5; // {"material":"multiply5","label":"ui_editor_properties_blend_amount_5","default":1,"range":[0.0, 2.0]}
+uniform float g_Multiply6; // {"material":"multiply6","label":"ui_editor_properties_blend_amount_6","default":1,"range":[0.0, 2.0]}
+uniform float g_AlphaMultiply; // {"material":"alpha","label":"ui_editor_properties_alpha","default":1,"range":[0.0, 1.0]}
+
+#if OPACITYMASK == 1
+varying vec2 v_TexCoordOpacity;
+#endif
+
+uniform sampler2D g_Texture0; // {"hidden":true}
+uniform sampler2D g_Texture7; // {"label":"ui_editor_properties_opacity_mask","mode":"opacitymask","default":"util/white","combo":"OPACITYMASK","paintdefaultcolor":"0 0 0 1"}
+uniform sampler2D g_Texture1; // {"label":"ui_editor_properties_blend_texture","mode":"rgbmask","default":"util/white"}
+
+#if NUMBLENDTEXTURES >= 2
+uniform sampler2D g_Texture2; // {"label":"ui_editor_properties_blend_texture","mode":"rgbmask","default":"util/white"}
+#endif
+
+#if NUMBLENDTEXTURES >= 3
+uniform sampler2D g_Texture3; // {"label":"ui_editor_properties_blend_texture","mode":"rgbmask","default":"util/white"}
+#endif
+
+#if NUMBLENDTEXTURES >= 4
+uniform sampler2D g_Texture4; // {"label":"ui_editor_properties_blend_texture","mode":"rgbmask","default":"util/white"}
+#endif
+
+#if NUMBLENDTEXTURES >= 5
+uniform sampler2D g_Texture5; // {"label":"ui_editor_properties_blend_texture","mode":"rgbmask","default":"util/white"}
+#endif
+
+#if NUMBLENDTEXTURES >= 6
+uniform sampler2D g_Texture6; // {"label":"ui_editor_properties_blend_texture","mode":"rgbmask","default":"util/white"}
+#endif
+
+float GetUVBlend(vec2 uv)
+{
+#if TRANSFORMUV == 1 && TRANSFORMREPEAT == 0
+	return step(0.99, dot(step(CAST2(0.0), uv) * step(uv, CAST2(1.0)), CAST2(0.5)));
+#endif
+	return 1.0;
+}
+
+void main() {
+	vec4 albedo = texSample2D(g_Texture0, v_TexCoord.xy);
+	
+	vec2 blendUV = v_TexCoord.zw;
+#if TRANSFORMUV == 1 && TRANSFORMREPEAT == 1
+	blendUV = frac(blendUV);
+#endif
+
+	vec4 blendColors = texSample2D(g_Texture1, blendUV);
+	float blend = 1.0;
+
+#if OPACITYMASK == 1
+	blend *= texSample2D(g_Texture7, v_TexCoordOpacity).r;
+#endif
+
+	float blendAlpha = GetUVBlend(blendUV) * blend * g_Multiply * blendColors.a;
+	albedo.rgb = ApplyBlending(BLENDMODE, albedo.rgb, blendColors.rgb, blendAlpha);
+	
+#if NUMBLENDTEXTURES >= 2
+	blendUV =  frac(v_TexCoord23.xy);
+	blendColors = texSample2D(g_Texture2, blendUV);
+	blendAlpha *= blendColors.a * g_Multiply2;
+	albedo.rgb = ApplyBlending(BLENDMODE, albedo.rgb, blendColors.rgb, GetUVBlend(blendUV) * blend * g_Multiply2 * blendColors.a);
+#endif
+	
+#if NUMBLENDTEXTURES >= 3
+	blendUV =  frac(v_TexCoord23.zw);
+	blendColors = texSample2D(g_Texture3, blendUV);
+	blendAlpha *= blendColors.a * g_Multiply3;
+	albedo.rgb = ApplyBlending(BLENDMODE, albedo.rgb, blendColors.rgb, GetUVBlend(blendUV) * blend * g_Multiply3 * blendColors.a);
+#endif
+	
+#if NUMBLENDTEXTURES >= 4
+	blendUV =  frac(v_TexCoord45.xy);
+	blendColors = texSample2D(g_Texture4, blendUV);
+	blendAlpha *= blendColors.a * g_Multiply4;
+	albedo.rgb = ApplyBlending(BLENDMODE, albedo.rgb, blendColors.rgb, GetUVBlend(blendUV) * blend * g_Multiply4 * blendColors.a);
+#endif
+	
+#if NUMBLENDTEXTURES >= 5
+	blendUV =  frac(v_TexCoord45.zw);
+	blendColors = texSample2D(g_Texture5, blendUV);
+	blendAlpha *= blendColors.a * g_Multiply5;
+	albedo.rgb = ApplyBlending(BLENDMODE, albedo.rgb, blendColors.rgb, GetUVBlend(blendUV) * blend * g_Multiply5 * blendColors.a);
+#endif
+	
+#if NUMBLENDTEXTURES >= 6
+	blendUV =  frac(v_TexCoord6.xy);
+	blendColors = texSample2D(g_Texture6, blendUV);
+	blendAlpha *= blendColors.a * g_Multiply6;
+	albedo.rgb = ApplyBlending(BLENDMODE, albedo.rgb, blendColors.rgb, GetUVBlend(blendUV) * blend * g_Multiply6 * blendColors.a);
+#endif
+
+
+#if WRITEALPHA
+	albedo.a = blendColors.a * g_AlphaMultiply;
+#endif
+
+	gl_FragColor = albedo;
+}
--- a/modules/wallpaper-engine/effects/blend/shaders/effects/blend.vert
+++ b/modules/wallpaper-engine/effects/blend/shaders/effects/blend.vert
@@ -0,0 +1,91 @@
+
+#include "common.h"
+
+uniform mat4 g_ModelViewProjectionMatrix;
+uniform vec4 g_Texture1Resolution;
+uniform vec4 g_Texture2Resolution;
+uniform vec4 g_Texture3Resolution;
+uniform vec4 g_Texture4Resolution;
+uniform vec4 g_Texture5Resolution;
+uniform vec4 g_Texture6Resolution;
+
+#if OPACITYMASK == 1
+uniform vec4 g_Texture7Resolution;
+
+varying vec2 v_TexCoordOpacity;
+#endif
+
+#if TRANSFORMUV == 1
+uniform vec4 g_Texture0Resolution;
+#endif
+
+uniform vec2 g_BlendOffset; // {"material":"blendoffset","label":"ui_editor_properties_offset","default":"0 0"}
+uniform float g_BlendAngle; // {"material":"blendangle","label":"ui_editor_properties_angle","default":0,"range":[0,6.28]}
+uniform float g_BlendScale; // {"material":"blendscale","label":"ui_editor_properties_scale","default":1,"range":[0.01,2]}
+
+attribute vec3 a_Position;
+attribute vec2 a_TexCoord;
+
+varying vec4 v_TexCoord;
+
+#if NUMBLENDTEXTURES >= 2
+varying vec4 v_TexCoord23;
+#endif
+#if NUMBLENDTEXTURES >= 4
+varying vec4 v_TexCoord45;
+#endif
+#if NUMBLENDTEXTURES >= 6
+varying vec2 v_TexCoord6;
+#endif
+
+void main() {
+	gl_Position = mul(vec4(a_Position, 1.0), g_ModelViewProjectionMatrix);
+	v_TexCoord.xy = a_TexCoord;
+	v_TexCoord.zw = vec2(v_TexCoord.x * g_Texture1Resolution.z / g_Texture1Resolution.x,
+						v_TexCoord.y * g_Texture1Resolution.w / g_Texture1Resolution.y);
+#if NUMBLENDTEXTURES >= 2
+	v_TexCoord23.xy = vec2(v_TexCoord.x * g_Texture2Resolution.z / g_Texture2Resolution.x,
+						v_TexCoord.y * g_Texture2Resolution.w / g_Texture2Resolution.y);
+	v_TexCoord23.zw = CAST2(0.0);
+#endif
+#if NUMBLENDTEXTURES >= 3
+	v_TexCoord23.zw = vec2(v_TexCoord.x * g_Texture3Resolution.z / g_Texture3Resolution.x,
+						v_TexCoord.y * g_Texture3Resolution.w / g_Texture3Resolution.y);
+#endif
+#if NUMBLENDTEXTURES >= 4
+	v_TexCoord45.xy = vec2(v_TexCoord.x * g_Texture4Resolution.z / g_Texture4Resolution.x,
+						v_TexCoord.y * g_Texture4Resolution.w / g_Texture4Resolution.y);
+	v_TexCoord45.zw = CAST2(0.0);
+#endif
+#if NUMBLENDTEXTURES >= 5
+	v_TexCoord45.zw = vec2(v_TexCoord.x * g_Texture5Resolution.z / g_Texture5Resolution.x,
+						v_TexCoord.y * g_Texture5Resolution.w / g_Texture5Resolution.y);
+#endif
+#if NUMBLENDTEXTURES >= 6
+	v_TexCoord6.xy = vec2(v_TexCoord.x * g_Texture6Resolution.z / g_Texture6Resolution.x,
+						v_TexCoord.y * g_Texture6Resolution.w / g_Texture6Resolution.y);
+#endif
+
+#if TRANSFORMUV == 1
+	vec2 scaleA = g_Texture0Resolution.zw / g_Texture1Resolution.zw;
+	//vec2 scaleB = g_Texture0Resolution.wz / g_Texture1Resolution.wz;
+	//vec2 dir = abs(rotateVec2(vec2(1, 0), g_BlendAngle));
+	
+	v_TexCoord.zw -= (g_BlendOffset - (g_Texture0Resolution.zw - g_Texture1Resolution.zw) * 0.5) / g_Texture0Resolution.zw;
+	
+	v_TexCoord.zw -= CAST2(0.5);
+	v_TexCoord.zw = rotateVec2(v_TexCoord.zw, g_BlendAngle);
+	// Too tired now to get this right, maybe look later at this again
+	//v_TexCoord.zw *= scaleA * dot(dir, vec2(1, 0)) + scaleB * dot(dir, vec2(0, 1));
+	//v_TexCoord.zw *= mix(scaleA, scaleB, abs(sin(g_BlendAngle))) / g_BlendScale;
+	v_TexCoord.zw *= scaleA / g_BlendScale;
+	//v_TexCoord.zw *= scaleA * abs(cos(g_BlendAngle)) + scaleB * abs(sin(g_BlendAngle));
+	
+	v_TexCoord.zw += CAST2(0.5);
+#endif
+
+#if OPACITYMASK == 1
+	v_TexCoordOpacity = vec2(v_TexCoord.x * g_Texture7Resolution.z / g_Texture7Resolution.x,
+						v_TexCoord.y * g_Texture7Resolution.w / g_Texture7Resolution.y);
+#endif
+}
--- a/modules/wallpaper-engine/effects/blendgradient/effect.json
+++ b/modules/wallpaper-engine/effects/blendgradient/effect.json
@@ -0,0 +1,20 @@
+{
+	"version" : 1,
+	"replacementkey" : "blendgradient",
+	"name" : "ui_editor_effect_blend_gradient_title",
+	"description" : "ui_editor_effect_blend_gradient_description",
+	"group" : "colorize",
+	"preview" : "preview/project.json",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/blendgradient.json"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/blendgradient.json",
+		"shaders/effects/blendgradient.frag",
+		"shaders/effects/blendgradient.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/blendgradient/materials/effects/blendgradient.json
+++ b/modules/wallpaper-engine/effects/blendgradient/materials/effects/blendgradient.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/blendgradient",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/effects/blendgradient/effect.json
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/effects/blendgradient/effect.json
@@ -0,0 +1,20 @@
+{
+	"version" : 1,
+	"replacementkey" : "blendgradient",
+	"name" : "ui_editor_effect_blend_gradient_title",
+	"description" : "ui_editor_effect_blend_gradient_description",
+	"group" : "colorize",
+	"preview" : "preview/project.json",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/blendgradient.json"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/blendgradient.json",
+		"shaders/effects/blendgradient.frag",
+		"shaders/effects/blendgradient.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/effects/tint/effect.json
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/effects/tint/effect.json
@@ -0,0 +1,20 @@
+{
+	"version" : 1,
+	"replacementkey" : "tint",
+	"name" : "ui_editor_effect_tint_title",
+	"description" : "ui_editor_effect_tint_description",
+	"group" : "colorize",
+	"preview" : "preview/project.json",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/tint.json"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/tint.json",
+		"shaders/effects/tint.frag",
+		"shaders/effects/tint.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/effects/vhs/effect.json
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/effects/vhs/effect.json
@@ -0,0 +1,20 @@
+{
+	"version" : 1,
+	"replacementkey" : "vhs",
+	"name" : "ui_editor_effect_vhs_title",
+	"description" : "ui_editor_effect_vhs_description",
+	"group" : "colorize",
+	"preview" : "previewvhs/project.json",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/vhs.json"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/vhs.json",
+		"shaders/effects/vhs.frag",
+		"shaders/effects/vhs.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/materials/effectpreview.json
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/materials/effectpreview.json
@@ -0,0 +1,13 @@
+{
+	"passes" : 
+	[
+		{
+			"blending" : "translucent",
+			"cullmode" : "nocull",
+			"depthtest" : "disabled",
+			"depthwrite" : "disabled",
+			"shader" : "genericimage2",
+			"textures" : [ "effectpreview" ]
+		}
+	]
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/materials/effectpreview.tex
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/materials/effectpreview.tex
--- a/modules/wallpaper-engine/effects/blendgradient/preview/materials/effectpreview.tex-json
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/materials/effectpreview.tex-json
@@ -0,0 +1,6 @@
+{
+	"clampuvs" : true,
+	"format" : "rgba8888",
+	"nomip" : true,
+	"nonpoweroftwo" : true
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/materials/effects/blendgradient.json
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/materials/effects/blendgradient.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/blendgradient",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/materials/effects/tint.json
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/materials/effects/tint.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/tint",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/materials/effects/vhs.json
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/materials/effects/vhs.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/vhs",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/models/effectpreview.json
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/models/effectpreview.json
@@ -0,0 +1,4 @@
+{
+	"autosize" : true,
+	"material" : "materials/effectpreview.json"
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/project.json
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/project.json
@@ -0,0 +1,19 @@
+{
+	"file" : "scene.json",
+	"general" : 
+	{
+		"properties" : 
+		{
+			"schemecolor" : 
+			{
+				"order" : 0,
+				"text" : "ui_browse_properties_scheme_color",
+				"type" : "color",
+				"value" : "0 0 0"
+			}
+		}
+	},
+	"title" : "preview",
+	"type" : "scene",
+	"version" : 0
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/scene.json
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/scene.json
@@ -0,0 +1,213 @@
+{
+	"camera" : 
+	{
+		"center" : "0.00000 0.00000 -1.00000",
+		"eye" : "0.00000 0.00000 0.00000",
+		"up" : "0.00000 1.00000 0.00000"
+	},
+	"general" : 
+	{
+		"ambientcolor" : "0.30000 0.30000 0.30000",
+		"bloom" : false,
+		"bloomhdrfeather" : 0.1,
+		"bloomhdriterations" : 8,
+		"bloomhdrscatter" : 1.619,
+		"bloomhdrstrength" : 2.0,
+		"bloomhdrthreshold" : 1.0,
+		"bloomstrength" : 2.0,
+		"bloomthreshold" : 0.64999998,
+		"camerafade" : true,
+		"cameraparallax" : false,
+		"cameraparallaxamount" : 0.5,
+		"cameraparallaxdelay" : 0.1,
+		"cameraparallaxmouseinfluence" : 0.0,
+		"camerapreview" : true,
+		"camerashake" : false,
+		"camerashakeamplitude" : 0.5,
+		"camerashakeroughness" : 1.0,
+		"camerashakespeed" : 3.0,
+		"clearcolor" : "0.70000 0.70000 0.70000",
+		"clearenabled" : true,
+		"farz" : 10000.0,
+		"fov" : 50.0,
+		"hdr" : false,
+		"nearz" : 0.0099999998,
+		"orthogonalprojection" : 
+		{
+			"height" : 256,
+			"width" : 256
+		},
+		"skylightcolor" : "0.30000 0.30000 0.30000",
+		"zoom" : 1.0
+	},
+	"objects" : 
+	[
+		{
+			"alignment" : "center",
+			"alpha" : 1.0,
+			"angles" : "0.00000 0.00000 0.00000",
+			"brightness" : 1.0,
+			"color" : "1.00000 1.00000 1.00000",
+			"colorBlendMode" : 0,
+			"copybackground" : true,
+			"effects" : 
+			[
+				{
+					"file" : "effects/tint/effect.json",
+					"id" : 28,
+					"name" : "",
+					"passes" : 
+					[
+						{
+							"constantshadervalues" : 
+							{
+								"alpha" : 1.0,
+								"color" : "1 0 0"
+							},
+							"id" : 29
+						}
+					],
+					"visible" : true
+				},
+				{
+					"file" : "effects/vhs/effect.json",
+					"id" : 35,
+					"name" : "",
+					"passes" : 
+					[
+						{
+							"constantshadervalues" : 
+							{
+								"artifacts" : 3,
+								"chromatic" : 0,
+								"distortionspeed" : 2,
+								"distortionstrength" : 10,
+								"distortionwidth" : 2,
+								"scale" : 0.03,
+								"strength" : 2
+							},
+							"id" : 36,
+							"textures" : [ null, "util/noise" ]
+						}
+					],
+					"visible" : true
+				}
+			],
+			"id" : 26,
+			"image" : "models/effectpreview.json",
+			"ledsource" : false,
+			"locktransforms" : false,
+			"name" : "effectpreview",
+			"origin" : "128.00000 128.00000 0.00000",
+			"parallaxDepth" : "1.00000 1.00000",
+			"perspective" : false,
+			"scale" : "1.00000 1.00000 1.00000",
+			"size" : "256.00000 256.00000",
+			"solid" : true,
+			"visible" : false
+		},
+		{
+			"alignment" : "center",
+			"alpha" : 1.0,
+			"angles" : "0.00000 0.00000 0.00000",
+			"brightness" : 1.0,
+			"color" : "1.00000 1.00000 1.00000",
+			"colorBlendMode" : 0,
+			"copybackground" : true,
+			"dependencies" : [ 26 ],
+			"depth" : 1,
+			"effects" : 
+			[
+				{
+					"file" : "effects/blendgradient/effect.json",
+					"id" : 18,
+					"name" : "",
+					"passes" : 
+					[
+						{
+							"combos" : 
+							{
+								"EDGEGLOW" : 1
+							},
+							"constantshadervalues" : 
+							{
+								"edgebrightness" : 1.0,
+								"edgecolor" : "0 0 0",
+								"gradientscale" : 0.05,
+								"multiply" : 
+								{
+									"animation" : 
+									{
+										"c0" : 
+										[
+											{
+												"back" : 
+												{
+													"enabled" : true,
+													"x" : -1,
+													"y" : 0
+												},
+												"frame" : 0,
+												"front" : 
+												{
+													"enabled" : true,
+													"x" : 1,
+													"y" : 0
+												},
+												"lockangle" : true,
+												"locklength" : true,
+												"value" : 1
+											},
+											{
+												"back" : 
+												{
+													"enabled" : true,
+													"x" : -1,
+													"y" : 0
+												},
+												"frame" : 30,
+												"front" : 
+												{
+													"enabled" : true,
+													"x" : 1,
+													"y" : 0
+												},
+												"lockangle" : true,
+												"locklength" : true,
+												"value" : 0
+											}
+										],
+										"options" : 
+										{
+											"fps" : 15,
+											"length" : 30,
+											"mode" : "mirror",
+											"wraploop" : null
+										}
+									},
+									"value" : 1
+								}
+							},
+							"id" : 19,
+							"textures" : [ null, "_rt_imageLayerComposite_26_a", "util/clouds_256" ]
+						}
+					],
+					"visible" : true
+				}
+			],
+			"id" : 38,
+			"image" : "models/effectpreview.json",
+			"ledsource" : false,
+			"locktransforms" : false,
+			"name" : "",
+			"origin" : "128.00000 128.00000 0.00000",
+			"parallaxDepth" : "1.00000 1.00000",
+			"perspective" : false,
+			"scale" : "1.00000 1.00000 1.00000",
+			"size" : "256.00000 256.00000",
+			"solid" : true,
+			"visible" : true
+		}
+	],
+	"version" : 0
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/shaders/effects/blendgradient.frag
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/shaders/effects/blendgradient.frag
@@ -0,0 +1,75 @@
+
+// [COMBO] {"material":"ui_editor_properties_blend_mode","combo":"BLENDMODE","type":"imageblending","default":0}
+// [COMBO] {"material":"ui_editor_properties_transform","combo":"TRANSFORMUV","type":"options","default":0}
+// [COMBO] {"material":"ui_editor_properties_transform_repeat","combo":"TRANSFORMREPEAT","type":"options","default":0,"options":{"ui_editor_properties_clip":0,"ui_editor_properties_repeat":1,"ui_editor_properties_clamp_uvs":2}}
+// [COMBO] {"material":"ui_editor_properties_write_alpha","combo":"WRITEALPHA","type":"options","default":0}
+// [COMBO] {"material":"ui_editor_properties_edge_glow","combo":"EDGEGLOW","type":"options","default":0}
+
+#include "common_blending.h"
+
+varying vec4 v_TexCoord;
+
+uniform float g_Multiply; // {"material":"multiply","label":"ui_editor_properties_blend_amount","default":1,"range":[0.0, 1.0]}
+uniform float g_GradientScale; // {"material":"gradientscale","label":"ui_editor_properties_gradient_scale","default":0.05,"range":[0.01, 0.25]}
+uniform float g_AlphaMultiply; // {"material":"alpha","label":"ui_editor_properties_alpha","default":1,"range":[0.0, 1.0]}
+
+uniform float g_EdgeBrightness; // {"material":"edgebrightness","label":"ui_editor_properties_edge_brightness","default":1,"range":[0.0, 5.0]}
+uniform vec3 g_EdgeColor; // {"material":"edgecolor","label":"ui_editor_properties_edge_color","default":"1 0.75 0","type":"color"}
+
+#if OPACITYMASK == 1
+varying vec2 v_TexCoordOpacity;
+#endif
+
+uniform sampler2D g_Texture0; // {"hidden":true}
+uniform sampler2D g_Texture1; // {"label":"ui_editor_properties_blend_texture","mode":"rgbmask","default":"util/white"}
+uniform sampler2D g_Texture2; // {"label":"ui_editor_properties_gradient_mask","mode":"opacitymask","default":"util/clouds_256","paintdefaultcolor":"0 0 0 1"}
+uniform sampler2D g_Texture3; // {"label":"ui_editor_properties_opacity_mask","mode":"opacitymask","default":"util/white","combo":"OPACITYMASK","paintdefaultcolor":"0 0 0 1"}
+
+float GetUVBlend(vec2 uv)
+{
+#if TRANSFORMUV == 1 && TRANSFORMREPEAT == 0
+	return step(0.99, dot(step(CAST2(0.0), uv) * step(uv, CAST2(1.0)), CAST2(0.5)));
+#endif
+	return 1.0;
+}
+
+void main() {
+	vec4 albedo = texSample2D(g_Texture0, v_TexCoord.xy);
+	
+	vec2 blendUV = v_TexCoord.zw;
+#if TRANSFORMUV == 1 && TRANSFORMREPEAT == 1
+	blendUV = frac(blendUV);
+#endif
+
+	vec4 blendColors = texSample2D(g_Texture1, blendUV);
+	float blend = 1.0;
+	
+	float gradient = texSample2D(g_Texture2, blendUV).r;
+	blend = smoothstep(saturate(gradient - g_GradientScale), saturate(gradient + g_GradientScale), g_Multiply);
+
+#if OPACITYMASK == 1
+	float mask = texSample2D(g_Texture3, v_TexCoordOpacity).r;
+	blend *= mask;
+#endif
+
+	float blendAlpha = GetUVBlend(blendUV) * blend * blendColors.a;
+	albedo.rgb = ApplyBlending(BLENDMODE, albedo.rgb, blendColors.rgb, blendAlpha);
+
+#if EDGEGLOW
+	float burnWidth = g_GradientScale * 0.5;
+	float burnAmount = step(gradient - burnWidth, g_Multiply) *
+		step(g_Multiply, gradient + burnWidth) *
+		step(0.01, g_Multiply) *
+		step(g_Multiply, 0.999);
+#if OPACITYMASK == 1
+	burnAmount *= mask;
+#endif
+	albedo.rgb = max(CAST3(0.0), mix(albedo.rgb, g_EdgeColor, burnAmount * g_EdgeBrightness));
+#endif
+
+#if WRITEALPHA
+	albedo.a = blendColors.a * g_AlphaMultiply;
+#endif
+
+	gl_FragColor = albedo;
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/shaders/effects/blendgradient.vert
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/shaders/effects/blendgradient.vert
@@ -0,0 +1,52 @@
+
+#include "common.h"
+
+uniform mat4 g_ModelViewProjectionMatrix;
+uniform vec4 g_Texture1Resolution;
+uniform vec4 g_Texture2Resolution;
+uniform vec4 g_Texture3Resolution;
+uniform vec4 g_Texture4Resolution;
+uniform vec4 g_Texture5Resolution;
+uniform vec4 g_Texture6Resolution;
+
+#if OPACITYMASK == 1
+uniform vec4 g_Texture7Resolution;
+
+varying vec2 v_TexCoordOpacity;
+#endif
+
+#if TRANSFORMUV == 1
+uniform vec4 g_Texture0Resolution;
+#endif
+
+uniform vec2 g_BlendOffset; // {"material":"blendoffset","label":"ui_editor_properties_offset","default":"0 0"}
+uniform float g_BlendAngle; // {"material":"blendangle","label":"ui_editor_properties_angle","default":0,"range":[0,6.28]}
+uniform float g_BlendScale; // {"material":"blendscale","label":"ui_editor_properties_scale","default":1,"range":[0.01,2]}
+
+attribute vec3 a_Position;
+attribute vec2 a_TexCoord;
+
+varying vec4 v_TexCoord;
+
+void main() {
+	gl_Position = mul(vec4(a_Position, 1.0), g_ModelViewProjectionMatrix);
+	v_TexCoord.xy = a_TexCoord;
+	v_TexCoord.zw = vec2(v_TexCoord.x * g_Texture1Resolution.z / g_Texture1Resolution.x,
+						v_TexCoord.y * g_Texture1Resolution.w / g_Texture1Resolution.y);
+
+#if TRANSFORMUV == 1
+	vec2 scaleA = g_Texture0Resolution.zw / g_Texture1Resolution.zw;
+	
+	v_TexCoord.zw -= (g_BlendOffset - (g_Texture0Resolution.zw - g_Texture1Resolution.zw) * 0.5) / g_Texture0Resolution.zw;
+	
+	v_TexCoord.zw -= CAST2(0.5);
+	v_TexCoord.zw = rotateVec2(v_TexCoord.zw, g_BlendAngle);
+	v_TexCoord.zw *= scaleA / g_BlendScale;
+	v_TexCoord.zw += CAST2(0.5);
+#endif
+
+#if OPACITYMASK == 1
+	v_TexCoordOpacity = vec2(v_TexCoord.x * g_Texture7Resolution.z / g_Texture7Resolution.x,
+						v_TexCoord.y * g_Texture7Resolution.w / g_Texture7Resolution.y);
+#endif
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/shaders/effects/tint.frag
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/shaders/effects/tint.frag
@@ -0,0 +1,29 @@
+
+// [COMBO] {"material":"ui_editor_properties_blend_mode","combo":"BLENDMODE","type":"imageblending","default":30}
+
+#include "common_blending.h"
+
+varying vec4 v_TexCoord;
+
+uniform sampler2D g_Texture0; // {"hidden":true}
+uniform sampler2D g_Texture1; // {"label":"ui_editor_properties_opacity_mask","mode":"opacitymask","combo":"MASK","paintdefaultcolor":"0 0 0 1"}
+
+uniform float g_BlendAlpha; // {"material":"alpha", "label":"ui_editor_properties_alpha","default":1,"range":[0,1]}
+uniform vec3 g_TintColor; // {"material":"color", "label":"ui_editor_properties_color", "type": "color", "default":"1 0 0"}
+
+void main() {
+	vec4 albedo = texSample2D(g_Texture0, v_TexCoord.xy);
+	float mask = g_BlendAlpha;
+	
+#if MASK
+	mask *= texSample2D(g_Texture1, v_TexCoord.zw).r;
+#endif
+	
+	albedo.rgb = ApplyBlending(BLENDMODE, albedo.rgb, g_TintColor, mask);
+	
+#if BLENDMODE == 0
+	albedo.a = 1.0;
+#endif
+	
+	gl_FragColor = albedo;
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/shaders/effects/tint.vert
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/shaders/effects/tint.vert
@@ -0,0 +1,21 @@
+
+uniform mat4 g_ModelViewProjectionMatrix;
+
+#if MASK
+uniform vec4 g_Texture1Resolution;
+#endif
+
+attribute vec3 a_Position;
+attribute vec2 a_TexCoord;
+
+varying vec4 v_TexCoord;
+
+void main() {
+	gl_Position = mul(vec4(a_Position, 1.0), g_ModelViewProjectionMatrix);
+	v_TexCoord = a_TexCoord.xyxy;
+	
+#if MASK
+	v_TexCoord.zw = vec2(v_TexCoord.x * g_Texture1Resolution.z / g_Texture1Resolution.x,
+						v_TexCoord.y * g_Texture1Resolution.w / g_Texture1Resolution.y);
+#endif
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/shaders/effects/vhs.frag
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/shaders/effects/vhs.frag
@@ -0,0 +1,78 @@
+
+// [COMBO] {"material":"ui_editor_properties_blend_mode","combo":"BLENDMODE","type":"imageblending","default":12}
+// [COMBO] {"material":"ui_editor_properties_greyscale","combo":"GREYSCALE","type":"options","default":0}
+// [COMBO] {"material":"ui_editor_properties_artifacts_negated","combo":"INVERTARTIFACTS","type":"options","default":1}
+
+#include "common.h"
+#include "common_blending.h"
+
+varying vec4 v_TexCoord;
+varying vec2 v_TexCoordGlitchBase;
+varying vec4 v_TexCoordGlitch;
+varying vec4 v_TexCoordNoise;
+varying vec4 v_TexCoordVHSNoise;
+
+uniform sampler2D g_Texture0; // {"hidden":true}
+uniform sampler2D g_Texture1; // {"label":"ui_editor_properties_noise","default":"util/noise"}
+uniform sampler2D g_Texture2; // {"label":"ui_editor_properties_opacity_mask","mode":"opacitymask","paintdefaultcolor":"0 0 0 1","combo":"MASK"}
+
+uniform float g_Time;
+
+uniform float g_NoiseScale; // {"material":"scale","label":"ui_editor_properties_scale","default":0.3,"range":[0.01, 1.0]}
+uniform float g_NoiseAlpha; // {"material":"strength","label":"ui_editor_properties_alpha","default":1.0,"range":[0.0, 2.0]}
+uniform float g_DistortionStrength; // {"material":"distortionstrength","label":"ui_editor_properties_distortion_strength","default":1.0,"range":[0.0, 2.0]}
+uniform float g_DistortionSpeed; // {"material":"distortionspeed","label":"ui_editor_properties_distortion_speed","default":1,"range":[0.0, 2.0]}
+uniform float g_DistortionWidth; // {"material":"distortionwidth","label":"ui_editor_properties_distortion_width","default":1.0,"range":[0.0, 2.0]}
+uniform float g_ArtifactsScale; // {"material":"artifacts","label":"ui_editor_properties_artifacts","default":1.5,"range":[0.0, 3.0]}
+
+void main() {
+	float dblend = sin(g_Time);
+	dblend = sign(dblend) * pow(abs(max(0.00001, dblend)), 4.0);
+	vec2 distortion = vec2(dblend *
+							g_DistortionStrength * 0.02 *
+								smoothstep(0.01 * g_DistortionWidth, 0.0, abs(frac(g_Time * g_DistortionSpeed) - v_TexCoord.y)),
+							0.0);
+	distortion *= g_NoiseAlpha;
+
+	vec4 albedo;
+	float vhsBlend = 1.0;
+	
+#if MASK == 1
+	vhsBlend *= texSample2D(g_Texture2, v_TexCoord.zw).r;
+	vec4 orig = texSample2D(g_Texture0, v_TexCoord.xy + distortion * vhsBlend);
+	albedo.ga = texSample2D(g_Texture0, v_TexCoordGlitchBase + distortion * vhsBlend).ga;
+#else
+	vec4 orig = texSample2D(g_Texture0, v_TexCoord.xy + distortion);
+	albedo.ga = orig.ga;
+#endif
+
+	albedo.r = texSample2D(g_Texture0, v_TexCoordGlitch.xy + distortion).r;
+	albedo.b = texSample2D(g_Texture0, v_TexCoordGlitch.zw + distortion).b;
+	
+	vec3 noise = texSample2D(g_Texture1, v_TexCoordNoise.xy).rgb;
+	vec3 noise2 = texSample2D(g_Texture1, v_TexCoordNoise.zw).gbr;
+	
+#if GREYSCALE == 1
+	noise = CAST3(greyscale(noise));
+	noise2 = CAST3(greyscale(noise2));
+#endif
+	
+	noise = saturate(noise * noise2);
+	
+	float blend = 0.1;
+	albedo.rgb = ApplyBlending(BLENDMODE, albedo.rgb, noise, blend);
+	albedo.rgb = BlendOpacity(albedo.rgb, smoothstep(0.7, 1.0, noise), BlendLinearDodge, blend);
+	
+	vec2 vhsNoise = texSample2D(g_Texture1, v_TexCoordVHSNoise.xy).rg;
+	vec2 vhsNoise2 = texSample2D(g_Texture1, v_TexCoordVHSNoise.zw).rg;
+
+	float artifactLimiter = pow(max(g_ArtifactsScale, 0.0001), 0.2);
+	float artifactsAlpha = step(0.001, g_NoiseScale) * step(0.9, vhsNoise.x * artifactLimiter) * step(0.9, vhsNoise2.x * artifactLimiter) * vhsNoise.y * vhsNoise2.y;
+#if INVERTARTIFACTS
+	albedo.rgb = mix(albedo.rgb, CAST3(1.0 - albedo.rgb), artifactsAlpha);
+#else
+	albedo.rgb += CAST3(artifactsAlpha);
+#endif
+	
+	gl_FragColor = mix(orig, albedo, g_NoiseAlpha * vhsBlend);
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/shaders/effects/vhs.vert
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/shaders/effects/vhs.vert
@@ -0,0 +1,56 @@
+
+
+uniform mat4 g_ModelViewProjectionMatrix;
+
+uniform vec4 g_Texture0Resolution;
+
+#if MASK == 1
+uniform vec4 g_Texture2Resolution;
+#endif
+
+uniform float g_Time;
+
+attribute vec3 a_Position;
+attribute vec2 a_TexCoord;
+
+varying vec4 v_TexCoord;
+varying vec2 v_TexCoordGlitchBase;
+varying vec4 v_TexCoordGlitch;
+varying vec4 v_TexCoordNoise;
+varying vec4 v_TexCoordVHSNoise;
+
+uniform float g_NoiseScale; // {"material":"scale","label":"ui_editor_properties_scale","default":0.3,"range":[0.01, 1.0]}
+uniform float g_Chromatic; // {"material":"chromatic","label":"ui_editor_properties_chromatic_aberration","default":0.1,"range":[0.0, 1.0]}
+uniform float g_ArtifactsScale; // {"material":"artifacts","label":"ui_editor_properties_artifacts","default":1.5,"range":[0.0, 3.0]}
+uniform float g_NoiseAlpha; // {"material":"strength","label":"ui_editor_properties_alpha","default":1.0,"range":[0.0, 2.0]}
+
+void main() {
+	gl_Position = mul(vec4(a_Position, 1.0), g_ModelViewProjectionMatrix);
+	
+	float aspect = g_Texture0Resolution.z / g_Texture0Resolution.w;
+	
+	float t = frac(g_Time);
+	v_TexCoord = a_TexCoord.xyxy;
+	v_TexCoordNoise.xy = (a_TexCoord.xy + t) * g_NoiseScale;
+	v_TexCoordNoise.zw = (a_TexCoord.xy - t * 2.5) * g_NoiseScale * 0.52;
+	v_TexCoordNoise *= vec4(aspect, 1.0, aspect, 1.0);
+	
+#if MASK == 1
+	v_TexCoord.zw = vec2(a_TexCoord.x * g_Texture2Resolution.z / g_Texture2Resolution.x,
+						a_TexCoord.y * g_Texture2Resolution.w / g_Texture2Resolution.y);
+#endif
+
+	v_TexCoordVHSNoise.xy = v_TexCoordNoise.xy * vec2(0.1, 10) * g_ArtifactsScale;
+	v_TexCoordVHSNoise.zw = v_TexCoordNoise.zw * vec2(0.01, 2) * g_ArtifactsScale;
+	
+	
+	v_TexCoordGlitch = v_TexCoord.xyxy;
+	
+	vec3 glitchOffset = g_Chromatic * smoothstep(0, 2, 1 + 0.5 * sin(g_Time * vec3(11, 7, 13) * 2)) * vec3(0.0019, 0.0021, 0.0017);
+	v_TexCoordGlitch.y += 0.004 * g_Chromatic + glitchOffset.x;
+	v_TexCoordGlitch.xz += glitchOffset.xy + vec2(0.005, -0.0005) * g_Chromatic;
+	v_TexCoordGlitch.z -= glitchOffset.z + 0.006 * g_Chromatic;
+	v_TexCoordGlitch.w -= 0.0045 * g_Chromatic;
+	v_TexCoordGlitchBase.x = v_TexCoord.x + glitchOffset.z * min(1.0, g_NoiseAlpha);
+	v_TexCoordGlitchBase.y = v_TexCoord.y - glitchOffset.z * min(1.0, g_NoiseAlpha);
+}
--- a/modules/wallpaper-engine/effects/blendgradient/preview/template.json
+++ b/modules/wallpaper-engine/effects/blendgradient/preview/template.json
@@ -0,0 +1,4 @@
+{
+	"name": "FX Preview",
+	"type": "scene2d"
+}
--- a/modules/wallpaper-engine/effects/blendgradient/shaders/effects/blendgradient.frag
+++ b/modules/wallpaper-engine/effects/blendgradient/shaders/effects/blendgradient.frag
@@ -0,0 +1,75 @@
+
+// [COMBO] {"material":"ui_editor_properties_blend_mode","combo":"BLENDMODE","type":"imageblending","default":0}
+// [COMBO] {"material":"ui_editor_properties_transform","combo":"TRANSFORMUV","type":"options","default":0}
+// [COMBO] {"material":"ui_editor_properties_transform_repeat","combo":"TRANSFORMREPEAT","type":"options","default":0,"options":{"ui_editor_properties_clip":0,"ui_editor_properties_repeat":1,"ui_editor_properties_clamp_uvs":2},"require":{"TRANSFORMUV":1}}
+// [COMBO] {"material":"ui_editor_properties_write_alpha","combo":"WRITEALPHA","type":"options","default":0}
+// [COMBO] {"material":"ui_editor_properties_edge_glow","combo":"EDGEGLOW","type":"options","default":0}
+
+#include "common_blending.h"
+
+varying vec4 v_TexCoord;
+
+uniform float g_Multiply; // {"material":"multiply","label":"ui_editor_properties_blend_amount","default":1,"range":[0.0, 1.0]}
+uniform float g_GradientScale; // {"material":"gradientscale","label":"ui_editor_properties_gradient_scale","default":0.05,"range":[0.01, 0.25]}
+uniform float g_AlphaMultiply; // {"material":"alpha","label":"ui_editor_properties_alpha","default":1,"range":[0.0, 1.0]}
+
+uniform float g_EdgeBrightness; // {"material":"edgebrightness","label":"ui_editor_properties_edge_brightness","default":1,"range":[0.0, 5.0]}
+uniform vec3 g_EdgeColor; // {"material":"edgecolor","label":"ui_editor_properties_edge_color","default":"1 0.75 0","type":"color"}
+
+#if OPACITYMASK == 1
+varying vec2 v_TexCoordOpacity;
+#endif
+
+uniform sampler2D g_Texture0; // {"hidden":true}
+uniform sampler2D g_Texture1; // {"label":"ui_editor_properties_blend_texture","mode":"rgbmask","default":"util/white"}
+uniform sampler2D g_Texture2; // {"label":"ui_editor_properties_gradient_mask","mode":"opacitymask","default":"util/clouds_256","paintdefaultcolor":"0 0 0 1"}
+uniform sampler2D g_Texture3; // {"label":"ui_editor_properties_opacity_mask","mode":"opacitymask","default":"util/white","combo":"OPACITYMASK","paintdefaultcolor":"0 0 0 1"}
+
+float GetUVBlend(vec2 uv)
+{
+#if TRANSFORMUV == 1 && TRANSFORMREPEAT == 0
+	return step(0.99, dot(step(CAST2(0.0), uv) * step(uv, CAST2(1.0)), CAST2(0.5)));
+#endif
+	return 1.0;
+}
+
+void main() {
+	vec4 albedo = texSample2D(g_Texture0, v_TexCoord.xy);
+	
+	vec2 blendUV = v_TexCoord.zw;
+#if TRANSFORMUV == 1 && TRANSFORMREPEAT == 1
+	blendUV = frac(blendUV);
+#endif
+
+	vec4 blendColors = texSample2D(g_Texture1, blendUV);
+	float blend = 1.0;
+	
+	float gradient = texSample2D(g_Texture2, blendUV).r;
+	blend = smoothstep(saturate(gradient - g_GradientScale), saturate(gradient + g_GradientScale), g_Multiply);
+
+#if OPACITYMASK == 1
+	float mask = texSample2D(g_Texture3, v_TexCoordOpacity).r;
+	blend *= mask;
+#endif
+
+	float blendAlpha = GetUVBlend(blendUV) * blend * blendColors.a;
+	albedo.rgb = ApplyBlending(BLENDMODE, albedo.rgb, blendColors.rgb, blendAlpha);
+
+#if EDGEGLOW
+	float burnWidth = g_GradientScale * 0.5;
+	float burnAmount = step(gradient - burnWidth, g_Multiply) *
+		step(g_Multiply, gradient + burnWidth) *
+		step(0.01, g_Multiply) *
+		step(g_Multiply, 0.999);
+#if OPACITYMASK == 1
+	burnAmount *= mask;
+#endif
+	albedo.rgb = max(CAST3(0.0), mix(albedo.rgb, g_EdgeColor, burnAmount * g_EdgeBrightness));
+#endif
+
+#if WRITEALPHA
+	albedo.a = blendColors.a * g_AlphaMultiply;
+#endif
+
+	gl_FragColor = albedo;
+}
--- a/modules/wallpaper-engine/effects/blendgradient/shaders/effects/blendgradient.vert
+++ b/modules/wallpaper-engine/effects/blendgradient/shaders/effects/blendgradient.vert
@@ -0,0 +1,52 @@
+
+#include "common.h"
+
+uniform mat4 g_ModelViewProjectionMatrix;
+uniform vec4 g_Texture1Resolution;
+uniform vec4 g_Texture2Resolution;
+uniform vec4 g_Texture3Resolution;
+uniform vec4 g_Texture4Resolution;
+uniform vec4 g_Texture5Resolution;
+uniform vec4 g_Texture6Resolution;
+
+#if OPACITYMASK == 1
+uniform vec4 g_Texture7Resolution;
+
+varying vec2 v_TexCoordOpacity;
+#endif
+
+#if TRANSFORMUV == 1
+uniform vec4 g_Texture0Resolution;
+#endif
+
+uniform vec2 g_BlendOffset; // {"material":"blendoffset","label":"ui_editor_properties_offset","default":"0 0"}
+uniform float g_BlendAngle; // {"material":"blendangle","label":"ui_editor_properties_angle","default":0,"range":[0,6.28]}
+uniform float g_BlendScale; // {"material":"blendscale","label":"ui_editor_properties_scale","default":1,"range":[0.01,2]}
+
+attribute vec3 a_Position;
+attribute vec2 a_TexCoord;
+
+varying vec4 v_TexCoord;
+
+void main() {
+	gl_Position = mul(vec4(a_Position, 1.0), g_ModelViewProjectionMatrix);
+	v_TexCoord.xy = a_TexCoord;
+	v_TexCoord.zw = vec2(v_TexCoord.x * g_Texture1Resolution.z / g_Texture1Resolution.x,
+						v_TexCoord.y * g_Texture1Resolution.w / g_Texture1Resolution.y);
+
+#if TRANSFORMUV == 1
+	vec2 scaleA = g_Texture0Resolution.zw / g_Texture1Resolution.zw;
+	
+	v_TexCoord.zw -= (g_BlendOffset - (g_Texture0Resolution.zw - g_Texture1Resolution.zw) * 0.5) / g_Texture0Resolution.zw;
+	
+	v_TexCoord.zw -= CAST2(0.5);
+	v_TexCoord.zw = rotateVec2(v_TexCoord.zw, g_BlendAngle);
+	v_TexCoord.zw *= scaleA / g_BlendScale;
+	v_TexCoord.zw += CAST2(0.5);
+#endif
+
+#if OPACITYMASK == 1
+	v_TexCoordOpacity = vec2(v_TexCoord.x * g_Texture7Resolution.z / g_Texture7Resolution.x,
+						v_TexCoord.y * g_Texture7Resolution.w / g_Texture7Resolution.y);
+#endif
+}
--- a/modules/wallpaper-engine/effects/blur/effect.json
+++ b/modules/wallpaper-engine/effects/blur/effect.json
@@ -0,0 +1,85 @@
+{
+	"version" : 1,
+	"replacementkey" : "blur",
+	"name" : "ui_editor_effect_blur_title",
+	"description" : "ui_editor_effect_blur_description",
+	"group" : "blur",
+	"performance" : "expensive",
+	"preview" : "preview/project.json",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/blur_downsample4.json",
+			"target" : "_rt_QuarterCompoBuffer1",
+			"bind" :
+			[
+				{
+					"name" : "previous",
+					"index" : 0
+				}
+			]
+		},
+		{
+			"material" : "materials/effects/blur_gaussian_x.json",
+			"target" : "_rt_QuarterCompoBuffer2",
+			"bind" :
+			[
+				{
+					"name" : "_rt_QuarterCompoBuffer1",
+					"index" : 0
+				}
+			]
+		},
+		{
+			"material" : "materials/effects/blur_gaussian_y.json",
+			"target" : "_rt_QuarterCompoBuffer1",
+			"bind" :
+			[
+				{
+					"name" : "_rt_QuarterCompoBuffer2",
+					"index" : 0
+				}
+			]
+		},
+		{
+			"material" : "materials/effects/blur_combine.json",
+			"bind" :
+			[
+				{
+					"name" : "_rt_QuarterCompoBuffer1",
+					"index" : 0
+				},
+				{
+					"name" : "previous",
+					"index" : 2
+				}
+			]
+		}
+	],
+	"fbos" :
+	[
+		{
+			"name" : "_rt_QuarterCompoBuffer1",
+			"scale" : 4,
+			"format" : "rgba_backbuffer"
+		},
+		{
+			"name" : "_rt_QuarterCompoBuffer2",
+			"scale" : 4,
+			"format" : "rgba_backbuffer"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/blur_downsample4.json",
+		"materials/effects/blur_gaussian_x.json",
+		"materials/effects/blur_gaussian_y.json",
+		"materials/effects/blur_combine.json",
+		"shaders/effects/blur_downsample4.frag",
+		"shaders/effects/blur_downsample4.vert",
+		"shaders/effects/blur_gaussian.frag",
+		"shaders/effects/blur_gaussian.vert",
+		"shaders/effects/blur_combine.frag",
+		"shaders/effects/blur_combine.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/blur/materials/effects/blur_combine.json
+++ b/modules/wallpaper-engine/effects/blur/materials/effects/blur_combine.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/blur_combine",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blur/materials/effects/blur_downsample4.json
+++ b/modules/wallpaper-engine/effects/blur/materials/effects/blur_downsample4.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/blur_downsample4",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blur/materials/effects/blur_gaussian_x.json
+++ b/modules/wallpaper-engine/effects/blur/materials/effects/blur_gaussian_x.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/blur_gaussian",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blur/materials/effects/blur_gaussian_y.json
+++ b/modules/wallpaper-engine/effects/blur/materials/effects/blur_gaussian_y.json
@@ -0,0 +1,12 @@
+{
+	"passes": [{
+		"shader": "effects/blur_gaussian",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull",
+		"combos": {
+			"VERTICAL" : 1
+		}
+	}]
+}
--- a/modules/wallpaper-engine/effects/blur/preview/effects/blur/effect.json
+++ b/modules/wallpaper-engine/effects/blur/preview/effects/blur/effect.json
@@ -0,0 +1,82 @@
+{
+	"name" : "Blur",
+	"description" : "Apply gaussian blur to a section of the image.",
+	"group" : "composite",
+	//"preview" : "preview/project.json",
+	"passes" :
+	[
+		{
+			"material" : "materials/effects/blur_downsample4.json",
+			"target" : "_rt_QuarterCompoBuffer1",
+			"bind" :
+			[
+				{
+					"name" : "prev",
+					"index" : 0
+				}
+			]
+		},
+		{
+			"material" : "materials/effects/blur_gaussian_x.json",
+			"target" : "_rt_QuarterCompoBuffer2",
+			"bind" :
+			[
+				{
+					"name" : "_rt_QuarterCompoBuffer1",
+					"index" : 0
+				}
+			]
+		},
+		{
+			"material" : "materials/effects/blur_gaussian_y.json",
+			"target" : "_rt_QuarterCompoBuffer1",
+			"bind" :
+			[
+				{
+					"name" : "_rt_QuarterCompoBuffer2",
+					"index" : 0
+				}
+			]
+		},
+		{
+			"material" : "materials/effects/blur_combine.json",
+			"bind" :
+			[
+				{
+					"name" : "_rt_QuarterCompoBuffer1",
+					"index" : 0
+				},
+				{
+					"name" : "prev",
+					"index" : 2
+				}
+			]
+		}
+	],
+	"fbos" :
+	[
+		{
+			"name" : "_rt_QuarterCompoBuffer1",
+			"scale" : 4,
+			"format" : "rgba8888"
+		},
+		{
+			"name" : "_rt_QuarterCompoBuffer2",
+			"scale" : 4,
+			"format" : "rgba8888"
+		}
+	],
+	"dependencies" :
+	[
+		"materials/effects/blur_downsample4.json",
+		"materials/effects/blur_gaussian_x.json",
+		"materials/effects/blur_gaussian_y.json",
+		"materials/effects/blur_combine.json",
+		"shaders/effects/blur_downsample4.frag",
+		"shaders/effects/blur_downsample4.vert",
+		"shaders/effects/blur_gaussian.frag",
+		"shaders/effects/blur_gaussian.vert",
+		"shaders/effects/blur_combine.frag",
+		"shaders/effects/blur_combine.vert"
+	]
+}
--- a/modules/wallpaper-engine/effects/blur/preview/materials/effectpreview.json
+++ b/modules/wallpaper-engine/effects/blur/preview/materials/effectpreview.json
@@ -0,0 +1,13 @@
+{
+	"passes" : 
+	[
+		{
+			"blending" : "translucent",
+			"cullmode" : "nocull",
+			"depthtest" : "disabled",
+			"depthwrite" : "disabled",
+			"shader" : "genericimage2",
+			"textures" : [ "effectpreview" ]
+		}
+	]
+}
--- a/modules/wallpaper-engine/effects/blur/preview/materials/effectpreview.tex
+++ b/modules/wallpaper-engine/effects/blur/preview/materials/effectpreview.tex
--- a/modules/wallpaper-engine/effects/blur/preview/materials/effectpreview.tex-json
+++ b/modules/wallpaper-engine/effects/blur/preview/materials/effectpreview.tex-json
@@ -0,0 +1,6 @@
+{
+	"clampuvs" : true,
+	"format" : "rgba8888",
+	"nomip" : true,
+	"nonpoweroftwo" : true
+}
--- a/modules/wallpaper-engine/effects/blur/preview/materials/effects/blur_combine.json
+++ b/modules/wallpaper-engine/effects/blur/preview/materials/effects/blur_combine.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/blur_combine",
+		"blending": "translucent",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blur/preview/materials/effects/blur_downsample4.json
+++ b/modules/wallpaper-engine/effects/blur/preview/materials/effects/blur_downsample4.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/blur_downsample4",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blur/preview/materials/effects/blur_gaussian_x.json
+++ b/modules/wallpaper-engine/effects/blur/preview/materials/effects/blur_gaussian_x.json
@@ -0,0 +1,9 @@
+{
+	"passes": [{
+		"shader": "effects/blur_gaussian",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull"
+	}]
+}
--- a/modules/wallpaper-engine/effects/blur/preview/materials/effects/blur_gaussian_y.json
+++ b/modules/wallpaper-engine/effects/blur/preview/materials/effects/blur_gaussian_y.json
@@ -0,0 +1,12 @@
+{
+	"passes": [{
+		"shader": "effects/blur_gaussian",
+		"blending": "normal",
+		"depthtest": "disabled",
+		"depthwrite": "disabled",
+		"cullmode": "nocull",
+		"combos": {
+			"VERTICAL" : 1
+		}
+	}]
+}
--- a/Show More
+++ b/Show More