diff --git a/flake.lock b/flake.lock index 300b3e0..4f3dad7 100644 --- a/flake.lock +++ b/flake.lock @@ -62,7 +62,7 @@ "nci" ], "drv-parts": "drv-parts", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": [ "helix", "nci", @@ -269,6 +269,26 @@ "type": "github" } }, + "eww": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1686423460, + "narHash": "sha256-8e6gHSg6FDp6nU5v89D44Tqb1lR5aQpS0lXOVqzoUS4=", + "owner": "elkowar", + "repo": "eww", + "rev": "25e50eda46379bccd8a7887c18ee35833e0460e8", + "type": "github" + }, + "original": { + "owner": "elkowar", + "repo": "eww", + "type": "github" + } + }, "explain-pause-mode": { "flake": false, "locked": { @@ -286,6 +306,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -301,7 +337,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -336,6 +372,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1656928814, + "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -353,7 +404,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { "systems": "systems_2" }, @@ -391,9 +442,9 @@ "helix": { "inputs": { "nci": "nci", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "parts": "parts_2", - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1687472380, @@ -432,7 +483,7 @@ }, "hypr-contrib": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1687033460, @@ -448,6 +499,48 @@ "type": "github" } }, + "hyprland": { + "inputs": { + "hyprland-protocols": "hyprland-protocols", + "nixpkgs": "nixpkgs_4", + "wlroots": "wlroots", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1687463011, + "narHash": "sha256-NeIk2l/KR/Zzo05ZRqRo9ImzZA9WNnX6cKQmmlLs2hE=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "0283c498d65284478826dcd64837ce2a4bb25bde", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1684265364, + "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "mk-naked-shell": { "flake": false, "locked": { @@ -496,7 +589,7 @@ "inputs": { "flake-parts": "flake-parts", "nix-filter": "nix-filter", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1687380522, @@ -524,11 +617,11 @@ "evil-org-mode": "evil-org-mode", "evil-quick-diff": "evil-quick-diff", "explain-pause-mode": "explain-pause-mode", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", "format-all": "format-all", "nix-straight": "nix-straight", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "nose": "nose", "ob-racket": "ob-racket", "org": "org", @@ -572,7 +665,7 @@ }, "nix-software-center": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "utils": "utils" }, "locked": { @@ -622,16 +715,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683408522, - "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", + "lastModified": 1661353537, + "narHash": "sha256-1E2IGPajOsrkR49mM5h55OtYnU0dGyre6gl60NXKITE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", + "rev": "0e304ff0d9db453a4b230e9386418fd974d5804a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -674,11 +767,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1687511814, - "narHash": "sha256-ske8sUNloSApZ64CbGaJ/Ab7AdM+eqYnn8W2adhDyWA=", + "lastModified": 1687516542, + "narHash": "sha256-uxIhGqcE2hOePomSwQlkosbqKWW8/B8rOzrAbQ9yA7k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe28240c3f31420660226e799ae215b64bc12783", + "rev": "dc8c50cbd49e35541adbf784d83d2993f15e1e44", "type": "github" }, "original": { @@ -704,6 +797,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1683408522, + "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1658161305, "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=", @@ -719,7 +828,23 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { + "locked": { + "lastModified": 1686592866, + "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1685383865, "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", @@ -735,7 +860,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1682566018, "narHash": "sha256-HPzPRFiy2o/7k7mtnwfM1E6NVZHiFbPdmYCMoIpkHO4=", @@ -750,7 +875,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1680213900, "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", @@ -766,7 +891,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1687412861, "narHash": "sha256-Z/g0wbL68C+mSGerYS2quv9FXQ1RRP082cAC0Bh4vcs=", @@ -936,14 +1061,16 @@ }, "root": { "inputs": { + "eww": "eww", "helix": "helix", "home-manager": "home-manager", "hypr-contrib": "hypr-contrib", + "hyprland": "hyprland", "nix-but-gigachad": "nix-but-gigachad", "nix-doom-emacs": "nix-doom-emacs", "nix-software-center": "nix-software-center", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "nixpkgs-master": "nixpkgs-master" } }, @@ -966,6 +1093,28 @@ "rust-overlay": { "inputs": { "flake-utils": "flake-utils", + "nixpkgs": [ + "eww", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1661655464, + "narHash": "sha256-by9Hb0mNVdiCR7TBvUHIgDb0QIv3znp8VMGh7Bl35VQ=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "0c4c1432353e12b325d1472bea99e364871d2cb3", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "flake-utils": "flake-utils_2", "nixpkgs": [ "helix", "nixpkgs" @@ -1062,6 +1211,24 @@ "type": "github" } }, + "wlroots": { + "flake": false, + "locked": { + "host": "gitlab.freedesktop.org", + "lastModified": 1686753331, + "narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=", + "owner": "wlroots", + "repo": "wlroots", + "rev": "7e7633abf09b362d0bad9e3fc650fd692369291d", + "type": "gitlab" + }, + "original": { + "host": "gitlab.freedesktop.org", + "owner": "wlroots", + "repo": "wlroots", + "type": "gitlab" + } + }, "ws-butler": { "flake": false, "locked": { @@ -1077,6 +1244,31 @@ "repo": "ws-butler", "type": "github" } + }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685385764, + "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1714823..45e4710 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,8 @@ nixpkgs-master.url = "github:NixOS/nixpkgs/master"; hypr-contrib.url = "github:hyprwm/contrib"; - # hyprland.url = "github:hyprwm/Hyprland"; - + hyprland.url = "github:hyprwm/Hyprland"; + eww.url = "github:elkowar/eww"; nix-but-gigachad.url = "github:viperML/nh"; }; diff --git a/users/ultra/home.nix b/users/ultra/home.nix index 0e823f1..8cc31cf 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -4,6 +4,7 @@ let doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default.override { doomPrivateDir = ./doom.d; }; + eww-git = inputs.eww.packages.${pkgs.system}.default; helix = inputs.helix.packages.${pkgs.system}.default; # nixpkgs-master-pkgs = inputs.nixpkgs-master.legacyPackages.${pkgs.system}; # nixpkgs-master = inputs.nixpkgs-master; @@ -16,7 +17,7 @@ let in { imports = [ inputs.nix-doom-emacs.hmModule - # inputs.hyprland.homeManagerModules.default + inputs.hyprland.homeManagerModules.default ]; # Allow unfree packages nixpkgs.config.allowUnfree = true; @@ -112,7 +113,9 @@ in { hypr-contrib.scratchpad kitty waybar - eww-wayland + (eww-git.override { + withWayland = true; + }) notify-desktop libnotify xdg-desktop-portal-hyprland @@ -122,6 +125,7 @@ in { brave nh irssi + syncthing ]; }; @@ -193,14 +197,25 @@ in { }; }; }; - /* - hyprland = { - enable = true; - extraConfig = builtins.readFile ./configs/hyprland/hyprland.conf; - }; - */ + + }; services = { dunst.enable = false; }; + systemd.user = { + services = { + dunst.Unit = { + After = lib.mkForce []; + WantedBy = [ "hyprland-session.target" ]; + PartOf = lib.mkForce [ "hyprland-session.target" ]; + }; + }; + }; + wayland.windowManager.hyprland = { + enable = true; + package = pkgs.hyprland; + extraConfig = builtins.readFile ./configs/hyprland/hyprland.conf; + systemdIntegration = true; + }; }