diff --git a/configuration.nix b/configuration.nix
index 8932281..090f703 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -58,14 +58,10 @@
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  environment = {
-    variables = {
-      EDITOR = "nvim";
-    };
-    sessionVariables = {
+  environment.sessionVariables = {
       # Tells Electron apps to use Wayland
       NIXOS_OZONE_WL = "1";
-    };
+      NIXOS_CONFIG_PATH = "/etc/nixos";
   };
 
   # List packages installed in system profile. To search, run:
@@ -76,8 +72,6 @@
     kitty
     xdg-utils
     xdg-desktop-portal-gtk
-    xdg-desktop-portal-hyprland
-    hyprpolkitagent # Auth deamon providing modals for password auth
     kdePackages.dolphin
     kdePackages.qtwayland
     kdePackages.qtsvg
diff --git a/flake.nix b/flake.nix
index 96a6001..c973911 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,11 +33,15 @@
           ./configuration.nix
           home-manager.nixosModules.home-manager
           {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            # Passes inputs as an argument to home-manager
-            home-manager.extraSpecialArgs = { inherit inputs; };
-            home-manager.users.martin = import ./home;
+            home-manager = {
+              # Backups conflicting files in case of error
+              backupFileExtension = "bkp";
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              # Passes inputs as an argument to home-manager
+              extraSpecialArgs = { inherit inputs; };
+              users.martin = import ./home;
+            };
           }
           stylix.nixosModules.stylix
         ];
diff --git a/home/default.nix b/home/default.nix
index df119d6..080c2fe 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -12,7 +12,7 @@ in
     ./nixvim
     ./rofi
     ./wlogout
-    ../hyprland/hyprcursor
+    ./hyprland
   ];
 
   # Home Manager needs a bit of information about you and the
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
new file mode 100644
index 0000000..56bad2b
--- /dev/null
+++ b/home/hyprland/default.nix
@@ -0,0 +1,10 @@
+# Home configurations for Hyprland. For system configs, see ./hyprland
+{ ... }:
+
+{
+  imports = [
+    ./hyprcursor
+  ];
+
+  home.file.".config/hypr/hyprland.conf".source = ./hyprland.conf;
+}
diff --git a/hyprland/hyprcursor/default.nix b/home/hyprland/hyprcursor/default.nix
similarity index 89%
rename from hyprland/hyprcursor/default.nix
rename to home/hyprland/hyprcursor/default.nix
index 2721587..6978f3c 100644
--- a/hyprland/hyprcursor/default.nix
+++ b/home/hyprland/hyprcursor/default.nix
@@ -6,7 +6,7 @@
     hyprcursor
   ];
 
-  # TODO remove in favour of hyprland flake
+  # TODO remove in favour of hyprland flake?
   home.file = {
     ".local/share/icons/rose-pine-hyprcursor/manifest.hl".source = ./manifest.hl;
     ".local/share/icons/rose-pine-hyprcursor/hyprcursors" = {
diff --git a/hyprland/hyprcursor/hyprcursors/X_cursor.hlc b/home/hyprland/hyprcursor/hyprcursors/X_cursor.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/X_cursor.hlc
rename to home/hyprland/hyprcursor/hyprcursors/X_cursor.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/all-scroll.hlc b/home/hyprland/hyprcursor/hyprcursors/all-scroll.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/all-scroll.hlc
rename to home/hyprland/hyprcursor/hyprcursors/all-scroll.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/bd_double_arrow.hlc b/home/hyprland/hyprcursor/hyprcursors/bd_double_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/bd_double_arrow.hlc
rename to home/hyprland/hyprcursor/hyprcursors/bd_double_arrow.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/bottom_left_corner.hlc b/home/hyprland/hyprcursor/hyprcursors/bottom_left_corner.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/bottom_left_corner.hlc
rename to home/hyprland/hyprcursor/hyprcursors/bottom_left_corner.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/bottom_right_corner.hlc b/home/hyprland/hyprcursor/hyprcursors/bottom_right_corner.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/bottom_right_corner.hlc
rename to home/hyprland/hyprcursor/hyprcursors/bottom_right_corner.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/bottom_side.hlc b/home/hyprland/hyprcursor/hyprcursors/bottom_side.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/bottom_side.hlc
rename to home/hyprland/hyprcursor/hyprcursors/bottom_side.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/center_ptr.hlc b/home/hyprland/hyprcursor/hyprcursors/center_ptr.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/center_ptr.hlc
rename to home/hyprland/hyprcursor/hyprcursors/center_ptr.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/col-resize.hlc b/home/hyprland/hyprcursor/hyprcursors/col-resize.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/col-resize.hlc
rename to home/hyprland/hyprcursor/hyprcursors/col-resize.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/color-picker.hlc b/home/hyprland/hyprcursor/hyprcursors/color-picker.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/color-picker.hlc
rename to home/hyprland/hyprcursor/hyprcursors/color-picker.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/context-menu.hlc b/home/hyprland/hyprcursor/hyprcursors/context-menu.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/context-menu.hlc
rename to home/hyprland/hyprcursor/hyprcursors/context-menu.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/copy.hlc b/home/hyprland/hyprcursor/hyprcursors/copy.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/copy.hlc
rename to home/hyprland/hyprcursor/hyprcursors/copy.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/cross.hlc b/home/hyprland/hyprcursor/hyprcursors/cross.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/cross.hlc
rename to home/hyprland/hyprcursor/hyprcursors/cross.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/crossed_circle.hlc b/home/hyprland/hyprcursor/hyprcursors/crossed_circle.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/crossed_circle.hlc
rename to home/hyprland/hyprcursor/hyprcursors/crossed_circle.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/dnd_no_drop.hlc b/home/hyprland/hyprcursor/hyprcursors/dnd_no_drop.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/dnd_no_drop.hlc
rename to home/hyprland/hyprcursor/hyprcursors/dnd_no_drop.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/dotbox.hlc b/home/hyprland/hyprcursor/hyprcursors/dotbox.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/dotbox.hlc
rename to home/hyprland/hyprcursor/hyprcursors/dotbox.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/fd_double_arrow.hlc b/home/hyprland/hyprcursor/hyprcursors/fd_double_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/fd_double_arrow.hlc
rename to home/hyprland/hyprcursor/hyprcursors/fd_double_arrow.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/hand1.hlc b/home/hyprland/hyprcursor/hyprcursors/hand1.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/hand1.hlc
rename to home/hyprland/hyprcursor/hyprcursors/hand1.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/hand2.hlc b/home/hyprland/hyprcursor/hyprcursors/hand2.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/hand2.hlc
rename to home/hyprland/hyprcursor/hyprcursors/hand2.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/left_ptr.hlc b/home/hyprland/hyprcursor/hyprcursors/left_ptr.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/left_ptr.hlc
rename to home/hyprland/hyprcursor/hyprcursors/left_ptr.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/left_side.hlc b/home/hyprland/hyprcursor/hyprcursors/left_side.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/left_side.hlc
rename to home/hyprland/hyprcursor/hyprcursors/left_side.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/link.hlc b/home/hyprland/hyprcursor/hyprcursors/link.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/link.hlc
rename to home/hyprland/hyprcursor/hyprcursors/link.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/move.hlc b/home/hyprland/hyprcursor/hyprcursors/move.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/move.hlc
rename to home/hyprland/hyprcursor/hyprcursors/move.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/pencil.hlc b/home/hyprland/hyprcursor/hyprcursors/pencil.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/pencil.hlc
rename to home/hyprland/hyprcursor/hyprcursors/pencil.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/pirate.hlc b/home/hyprland/hyprcursor/hyprcursors/pirate.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/pirate.hlc
rename to home/hyprland/hyprcursor/hyprcursors/pirate.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/plus.hlc b/home/hyprland/hyprcursor/hyprcursors/plus.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/plus.hlc
rename to home/hyprland/hyprcursor/hyprcursors/plus.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/question_arrow.hlc b/home/hyprland/hyprcursor/hyprcursors/question_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/question_arrow.hlc
rename to home/hyprland/hyprcursor/hyprcursors/question_arrow.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/right_ptr.hlc b/home/hyprland/hyprcursor/hyprcursors/right_ptr.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/right_ptr.hlc
rename to home/hyprland/hyprcursor/hyprcursors/right_ptr.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/right_side.hlc b/home/hyprland/hyprcursor/hyprcursors/right_side.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/right_side.hlc
rename to home/hyprland/hyprcursor/hyprcursors/right_side.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/row-resize.hlc b/home/hyprland/hyprcursor/hyprcursors/row-resize.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/row-resize.hlc
rename to home/hyprland/hyprcursor/hyprcursors/row-resize.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/sb_down_arrow.hlc b/home/hyprland/hyprcursor/hyprcursors/sb_down_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/sb_down_arrow.hlc
rename to home/hyprland/hyprcursor/hyprcursors/sb_down_arrow.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/sb_h_double_arrow.hlc b/home/hyprland/hyprcursor/hyprcursors/sb_h_double_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/sb_h_double_arrow.hlc
rename to home/hyprland/hyprcursor/hyprcursors/sb_h_double_arrow.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/sb_left_arrow.hlc b/home/hyprland/hyprcursor/hyprcursors/sb_left_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/sb_left_arrow.hlc
rename to home/hyprland/hyprcursor/hyprcursors/sb_left_arrow.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/sb_right_arrow.hlc b/home/hyprland/hyprcursor/hyprcursors/sb_right_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/sb_right_arrow.hlc
rename to home/hyprland/hyprcursor/hyprcursors/sb_right_arrow.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/sb_up_arrow.hlc b/home/hyprland/hyprcursor/hyprcursors/sb_up_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/sb_up_arrow.hlc
rename to home/hyprland/hyprcursor/hyprcursors/sb_up_arrow.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/sb_v_double_arrow.hlc b/home/hyprland/hyprcursor/hyprcursors/sb_v_double_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/sb_v_double_arrow.hlc
rename to home/hyprland/hyprcursor/hyprcursors/sb_v_double_arrow.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/top_left_corner.hlc b/home/hyprland/hyprcursor/hyprcursors/top_left_corner.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/top_left_corner.hlc
rename to home/hyprland/hyprcursor/hyprcursors/top_left_corner.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/top_right_corner.hlc b/home/hyprland/hyprcursor/hyprcursors/top_right_corner.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/top_right_corner.hlc
rename to home/hyprland/hyprcursor/hyprcursors/top_right_corner.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/top_side.hlc b/home/hyprland/hyprcursor/hyprcursors/top_side.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/top_side.hlc
rename to home/hyprland/hyprcursor/hyprcursors/top_side.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/vertical-text.hlc b/home/hyprland/hyprcursor/hyprcursors/vertical-text.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/vertical-text.hlc
rename to home/hyprland/hyprcursor/hyprcursors/vertical-text.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/wayland-cursor.hlc b/home/hyprland/hyprcursor/hyprcursors/wayland-cursor.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/wayland-cursor.hlc
rename to home/hyprland/hyprcursor/hyprcursors/wayland-cursor.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/xterm.hlc b/home/hyprland/hyprcursor/hyprcursors/xterm.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/xterm.hlc
rename to home/hyprland/hyprcursor/hyprcursors/xterm.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/zoom-in.hlc b/home/hyprland/hyprcursor/hyprcursors/zoom-in.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/zoom-in.hlc
rename to home/hyprland/hyprcursor/hyprcursors/zoom-in.hlc
diff --git a/hyprland/hyprcursor/hyprcursors/zoom-out.hlc b/home/hyprland/hyprcursor/hyprcursors/zoom-out.hlc
similarity index 100%
rename from hyprland/hyprcursor/hyprcursors/zoom-out.hlc
rename to home/hyprland/hyprcursor/hyprcursors/zoom-out.hlc
diff --git a/hyprland/hyprcursor/manifest.hl b/home/hyprland/hyprcursor/manifest.hl
similarity index 100%
rename from hyprland/hyprcursor/manifest.hl
rename to home/hyprland/hyprcursor/manifest.hl
diff --git a/home/hyprland/hyprland.conf b/home/hyprland/hyprland.conf
new file mode 100644
index 0000000..f74febd
--- /dev/null
+++ b/home/hyprland/hyprland.conf
@@ -0,0 +1,380 @@
+# Please note not all available settings / options are set here.
+# For a full list, see the wiki
+
+# You can split this configuration into multiple files
+# Create your files separately and then link them to this file like this:
+# source = ~/.config/hypr/myColors.conf
+
+
+################
+### MONITORS ###
+################
+
+# See https://wiki.hyprland.org/Configuring/Monitors/
+# monitor=,preferred,auto,auto
+monitor = DP-1, 1920x1080@144, 0x0, 1
+monitor = DP-3, 2560x1440@59.95, 1920x0, 1
+
+
+###################
+### MY PROGRAMS ###
+###################
+
+# See https://wiki.hyprland.org/Configuring/Keywords/
+
+# Set programs that you use
+$browser = io.github.zen_browswer.zen
+$terminal = kitty
+$fileManager = dolphin
+$menu = rofi -show drun
+
+
+#################
+### AUTOSTART ###
+#################
+
+# Autostart necessary processes (like notifications daemons, status bars, etc.)
+# Or execute your favorite apps at launch like this:
+
+exec-once = $browser
+exec-once = $terminal
+
+# Status bar
+exec-once = waybar
+
+# Wallpaper
+exec-once = waypaper --restore
+
+# Authentication daemon
+exec-once = systemctl --user start hyprpolkitagent
+
+# Notification deamon
+exec-once = swaync
+
+#############################
+### ENVIRONMENT VARIABLES ###
+#############################
+
+# See https://wiki.hyprland.org/Configuring/Environment-variables/
+
+env = XCURSOR_SIZE,24
+env = HYPRCURSOR_SIZE,24
+env = HYPRCURSOR_THEME,rose-pine-hyprcursor
+env = ELECTRON_OZONE_PLATFORM_HINT,auto
+
+
+#####################
+### LOOK AND FEEL ###
+#####################
+
+# Refer to https://wiki.hyprland.org/Configuring/Variables/
+
+$rosewater = rgb(f5e0dc)
+$rosewaterAlpha = f5e0dc
+
+$flamingo = rgb(f2cdcd)
+$flamingoAlpha = f2cdcd
+
+$pink = rgb(f5c2e7)
+$pinkAlpha = f5c2e7
+
+$mauve = rgb(cba6f7)
+$mauveAlpha = cba6f7
+
+$red = rgb(f38ba8)
+$redAlpha = f38ba8
+
+$maroon = rgb(eba0ac)
+$maroonAlpha = eba0ac
+
+$peach = rgb(fab387)
+$peachAlpha = fab387
+
+$yellow = rgb(f9e2af)
+$yellowAlpha = f9e2af
+
+$green = rgb(a6e3a1)
+$greenAlpha = a6e3a1
+
+$teal = rgb(94e2d5)
+$tealAlpha = 94e2d5
+
+$sky = rgb(89dceb)
+$skyAlpha = 89dceb
+
+$sapphire = rgb(74c7ec)
+$sapphireAlpha = 74c7ec
+
+$blue = rgb(89b4fa)
+$blueAlpha = 89b4fa
+
+$lavender = rgb(b4befe)
+$lavenderAlpha = b4befe
+
+$text = rgb(cdd6f4)
+$textAlpha = cdd6f4
+
+$subtext1 = rgb(bac2de)
+$subtext1Alpha = bac2de
+
+$subtext0 = rgb(a6adc8)
+$subtext0Alpha = a6adc8
+
+$overlay2 = rgb(9399b2)
+$overlay2Alpha = 9399b2
+
+$overlay1 = rgb(7f849c)
+$overlay1Alpha = 7f849c
+
+$overlay0 = rgb(6c7086)
+$overlay0Alpha = 6c7086
+
+$surface2 = rgb(585b70)
+$surface2Alpha = 585b70
+
+$surface1 = rgb(45475a)
+$surface1Alpha = 45475a
+
+$surface0 = rgb(313244)
+$surface0Alpha = 313244
+
+$base = rgb(1e1e2e)
+$baseAlpha = 1e1e2e
+
+$mantle = rgb(181825)
+$mantleAlpha = 181825
+
+$crust = rgb(11111b)
+$crustAlpha = 11111b
+
+# https://wiki.hyprland.org/Configuring/Variables/#general
+general {
+    gaps_in = 5
+    gaps_out = 20
+
+    border_size = 2
+
+    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
+    col.active_border = $mauve $teal 45deg
+    col.inactive_border = rgba(595959aa)
+
+    # Set to true enable resizing windows by clicking and dragging on borders and gaps
+    resize_on_border = true
+
+    # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
+    allow_tearing = false
+
+    layout = dwindle
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#decoration
+decoration {
+    rounding = 10
+
+    # Change transparency of focused and unfocused windows
+    active_opacity = 1.0
+    inactive_opacity = 1.0
+
+    shadow {
+        enabled = true
+        range = 4
+        render_power = 3
+        color = $base
+    }
+
+    # https://wiki.hyprland.org/Configuring/Variables/#blur
+    blur {
+        enabled = true
+        size = 3
+        passes = 1
+
+        vibrancy = 0.1696
+    }
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#animations
+animations {
+    enabled = yes, please :)
+
+    # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+
+    bezier = easeOutQuint,0.23,1,0.32,1
+    bezier = easeInOutCubic,0.65,0.05,0.36,1
+    bezier = linear,0,0,1,1
+    bezier = almostLinear,0.5,0.5,0.75,1.0
+    bezier = quick,0.15,0,0.1,1
+
+    animation = global, 1, 10, default
+    animation = border, 1, 5.39, easeOutQuint
+    animation = windows, 1, 4.79, easeOutQuint
+    animation = windowsIn, 1, 4.1, easeOutQuint, popin 87%
+    animation = windowsOut, 1, 1.49, linear, popin 87%
+    animation = fadeIn, 1, 1.73, almostLinear
+    animation = fadeOut, 1, 1.46, almostLinear
+    animation = fade, 1, 3.03, quick
+    animation = layers, 1, 3.81, easeOutQuint
+    animation = layersIn, 1, 4, easeOutQuint, fade
+    animation = layersOut, 1, 1.5, linear, fade
+    animation = fadeLayersIn, 1, 1.79, almostLinear
+    animation = fadeLayersOut, 1, 1.39, almostLinear
+    animation = workspaces, 1, 1.94, almostLinear, fade
+    animation = workspacesIn, 1, 1.21, almostLinear, fade
+    animation = workspacesOut, 1, 1.94, almostLinear, fade
+}
+
+# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
+# "Smart gaps" / "No gaps when only"
+# uncomment all if you wish to use that.
+# workspace = w[tv1], gapsout:0, gapsin:0
+# workspace = f[1], gapsout:0, gapsin:0
+# windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1]
+# windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1]
+# windowrulev2 = bordersize 0, floating:0, onworkspace:f[1]
+# windowrulev2 = rounding 0, floating:0, onworkspace:f[1]
+
+# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+dwindle {
+    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    preserve_split = true # You probably want this
+}
+
+# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+master {
+    new_status = master
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#misc
+misc {
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
+    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
+}
+
+
+#############
+### INPUT ###
+#############
+
+# https://wiki.hyprland.org/Configuring/Variables/#input
+input {
+    kb_layout = gb
+    kb_variant =
+    kb_model =
+    kb_options =
+    kb_rules =
+
+    follow_mouse = 1
+
+    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+
+    touchpad {
+        natural_scroll = false
+    }
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#gestures
+gestures {
+    workspace_swipe = false
+}
+
+# Example per-device config
+# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
+device {
+    name = logitech-g502-hero-gaming-mouse
+    sensitivity = -0.10
+}
+
+
+###################
+### KEYBINDINGS ###
+###################
+
+# See https://wiki.hyprland.org/Configuring/Keywords/
+$mainMod = SUPER # Sets "Windows" key as main modifier
+
+# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+bind = $mainMod, Q, exec, $terminal
+bind = $mainMod, C, killactive,
+bind = $mainMod, M, exit,
+bind = $mainMod, E, exec, $fileManager
+bind = $mainMod, V, togglefloating,
+bind = $mainMod, R, exec, $menu
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, togglesplit, # dwindle
+bind = $mainMod, B, exec, $browser
+bind = $mainMod, L, exec, swaylock & disown
+
+# 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
+
+# Laptop multimedia keys for volume and LCD brightness
+bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
+bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
+
+# Requires playerctl
+bindl = , XF86AudioNext, exec, playerctl next
+bindl = , XF86AudioPause, exec, playerctl play-pause
+bindl = , XF86AudioPlay, exec, playerctl play-pause
+bindl = , XF86AudioPrev, exec, playerctl previous
+
+
+##############################
+### WINDOWS AND WORKSPACES ###
+##############################
+
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
+
+# Example windowrule v1
+# windowrule = float, ^(kitty)$
+
+# Example windowrule v2
+# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
+
+# Ignore maximize requests from apps. You'll probably like this.
+windowrulev2 = suppressevent maximize, class:.*
+
+# Fix some dragging issues with XWayland
+windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix
index 396a270..bbfe2b9 100644
--- a/home/nixvim/default.nix
+++ b/home/nixvim/default.nix
@@ -2,6 +2,10 @@
 { ... }:
 
 {
+  home.sessionVariables = {
+    EDITOR = "nvim";
+  };
+
   programs.nixvim = {
     enable = true;
 
diff --git a/hyprland/default.nix b/hyprland/default.nix
index b4c5e27..1971c94 100644
--- a/hyprland/default.nix
+++ b/hyprland/default.nix
@@ -1,3 +1,4 @@
+# System configurations for Hyprland. For home configs, see ./home/hyprland
 { pkgs, ... }:
 
 {
@@ -8,6 +9,8 @@
 
   environment.systemPackages = with pkgs; [
     swaynotificationcenter
+    xdg-desktop-portal-hyprland
+    hyprpolkitagent # Auth deamon providing modals for password auth
   ];
 
   programs.hyprland = {