diff --git a/flake.lock b/flake.lock index 7908135..d2be568 100644 --- a/flake.lock +++ b/flake.lock @@ -111,24 +111,6 @@ "type": "github" } }, - "dotfiles": { - "flake": false, - "locked": { - "lastModified": 1769126799, - "narHash": "sha256-v/VwDphmB+pdp51d65feDAXYLxU3juUIOIvVVT43oP4=", - "ref": "refs/heads/main", - "rev": "1b4c439c3e8286809747becfc59461b484345bfa", - "revCount": 5856, - "submodules": true, - "type": "git", - "url": "https://github.com/end-4/dots-hyprland" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/end-4/dots-hyprland" - } - }, "flake-compat": { "flake": false, "locked": { @@ -178,28 +160,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "illogical-flake", - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -538,6 +498,27 @@ "type": "github" } }, + "hyprspace": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "systems": "systems_3" + }, + "locked": { + "lastModified": 1775071961, + "narHash": "sha256-LXkeeH9Blr6ohS1LAsVZbkJ/EAkkMDATh5qu45hC7Zo=", + "owner": "KZDKM", + "repo": "Hyprspace", + "rev": "12ddde04f8584bf7de3151e6169918e0dda9f822", + "type": "github" + }, + "original": { + "owner": "KZDKM", + "repo": "Hyprspace", + "type": "github" + } + }, "hyprtoolkit": { "inputs": { "aquamarine": [ @@ -669,35 +650,12 @@ "type": "github" } }, - "illogical-flake": { - "inputs": { - "dotfiles": "dotfiles", - "nixpkgs": [ - "nixpkgs" - ], - "nur": "nur", - "quickshell": "quickshell" - }, - "locked": { - "lastModified": 1774402626, - "narHash": "sha256-sksKfX5fjG+lLZBrJT8q1yGl5Y7ucUg6Eo2IOAybhBA=", - "owner": "soymou", - "repo": "illogical-flake", - "rev": "1dab49284ce76f3fa9ed317282ad7c94a782f6ba", - "type": "github" - }, - "original": { - "owner": "soymou", - "repo": "illogical-flake", - "type": "github" - } - }, "nix-cachyos-kernel": { "inputs": { "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -826,25 +784,47 @@ "type": "github" } }, - "nur": { + "noctalia": { "inputs": { - "flake-parts": "flake-parts", "nixpkgs": [ - "illogical-flake", "nixpkgs" - ] + ], + "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1769182372, - "narHash": "sha256-I5WJ39YMaV+psYbli6rlUaiJOSoC2OwEXOF338d7zdE=", - "owner": "nix-community", - "repo": "NUR", - "rev": "0e6e5ff852c442598d1ae8ca5f042947f123f798", + "lastModified": 1776774185, + "narHash": "sha256-riCnQWAxvltNd6KrkzQLdG2EMxODNxjQOB2Z67DA4KU=", + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "rev": "d7b68652e79bce5813dc4fea7e51636a5da3e1b7", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "NUR", + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "type": "github" + } + }, + "noctalia-qs": { + "inputs": { + "nixpkgs": [ + "noctalia", + "nixpkgs" + ], + "systems": "systems_4", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1776585574, + "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-qs", "type": "github" } }, @@ -902,27 +882,6 @@ "type": "github" } }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "illogical-flake", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768985439, - "narHash": "sha256-qkU4r+l+UPz4dutMMRZSin64HuVZkEv9iFpu9yMWVY0=", - "ref": "refs/heads/master", - "rev": "191085a8821b35680bba16ce5411fc9dbe912237", - "revCount": 731, - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" - }, - "original": { - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" - } - }, "root": { "inputs": { "apple-fonts": "apple-fonts", @@ -931,9 +890,10 @@ "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "illogical-flake": "illogical-flake", + "hyprspace": "hyprspace", "nix-cachyos-kernel": "nix-cachyos-kernel", "nixpkgs": "nixpkgs_4", + "noctalia": "noctalia", "oceanix": "oceanix", "zen-browser": "zen-browser" } @@ -1052,6 +1012,58 @@ "type": "github" } }, + "systems_3": { + "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_4": { + "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" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "noctalia", + "noctalia-qs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1659877975, diff --git a/flake.nix b/flake.nix index 4dae680..1f52f7c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,10 @@ url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; + hyprspace = { + url = "github:KZDKM/Hyprspace"; + inputs.hyprland.follows = "hyprland"; + }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -36,6 +40,7 @@ nixpkgs, home-manager, nix-cachyos-kernel, + hyprspace, ... }: let diff --git a/home/hypr/default.nix b/home/hypr/default.nix index efaebe3..a9f72b5 100644 --- a/home/hypr/default.nix +++ b/home/hypr/default.nix @@ -7,5 +7,6 @@ ./hyprland/general.nix ./hyprland/rules.nix ./hyprland/keybinds.nix + ./hyprland/plugins.nix ]; } diff --git a/home/hypr/hyprland/general.nix b/home/hypr/hyprland/general.nix index c4f99e3..7fe4ea5 100644 --- a/home/hypr/hyprland/general.nix +++ b/home/hypr/hyprland/general.nix @@ -7,20 +7,21 @@ general = { gaps_in = 4; gaps_out = 5; - border_size = 1; - "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg"; - "col.inactive_border" = "rgba(31313600)"; + border_size = 2; + "col.active_border" = "rgba(ff6b6bff) rgba(4ecdc4ff) 90deg"; + "col.inactive_border" = "rgba(31313622)"; resize_on_border = true; allow_tearing = true; layout = "scrolling"; }; scrolling = { - column_width = 0.7; - fullscreen_on_one_column = false; + column_width = 0.45; + fullscreen_on_one_column = true; focus_fit_method = 1; follow_focus = true; direction = "right"; + notify_on_column_change = true; }; decoration = { @@ -80,22 +81,25 @@ "menu_decel, 0.1, 1, 0, 1" "menu_accel, 0.52, 0.03, 0.72, 0.08" "stall, 1, -0.1, 0.7, 0.85" + "smoothIn, 0.25, 0.46, 0.45, 0.94" + "smoothOut, 0.42, 0, 0.58, 1" + "smoothInOut, 0.42, 0, 0.58, 1" ]; animation = [ - "windowsIn, 1, 3, emphasizedDecel, popin 80%" - "windowsOut, 1, 2, emphasizedDecel, popin 90%" - "windowsMove,1, 3, emphasizedDecel, slide" - "fadeIn, 1, 3, emphasizedDecel" - "fadeOut, 1, 2, emphasizedDecel" - "border, 1, 10, emphasizedDecel" - "layersIn, 1, 2.7, emphasizedDecel, popin 93%" - "layersOut, 1, 2.4, menu_accel, popin 94%" - "fadeLayersIn, 1, 0.5, menu_decel" - "fadeLayersOut, 1, 2.7, stall" - "workspaces, 1, 7, menu_decel, slide" - "specialWorkspaceIn, 1, 2.8, emphasizedDecel, slidevert" - "specialWorkspaceOut, 1, 1.2, emphasizedAccel, slidevert" + "windowsIn, 1, 4, smoothOut, popin 75%" + "windowsOut, 1, 3, smoothIn, popin 85%" + "windowsMove, 1, 4, smoothOut, slide" + "fadeIn, 1, 3, smoothOut" + "fadeOut, 1, 2.5, smoothIn" + "border, 1, 8, smoothOut" + "layersIn, 1, 3, smoothOut, popin 90%" + "layersOut, 1, 2, smoothIn, popin 92%" + "fadeLayersIn, 1, 1, smoothOut" + "fadeLayersOut, 1, 2, smoothIn" + "workspaces, 1, 6, smoothOut, slide" + "specialWorkspaceIn, 1, 3, smoothOut, slidevert" + "specialWorkspaceOut, 1, 2, smoothIn, slidevert" ]; device = [