From 365a13de3e19c66f6bb2ffb806e8086a068ffc25 Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Sun, 9 Mar 2025 23:44:45 -0400 Subject: changed hyprland build, added mouse fx, firefox changes --- .../nix-home-manager/firefox-nightly/default.nix | 2 +- home-config/nix-home-manager/flake.lock | 48 ++++++++++++++++++++++ home-config/nix-home-manager/flake.nix | 13 +++++- home-config/nix-home-manager/home.nix | 17 ++++++-- 4 files changed, 74 insertions(+), 6 deletions(-) (limited to 'home-config/nix-home-manager') diff --git a/home-config/nix-home-manager/firefox-nightly/default.nix b/home-config/nix-home-manager/firefox-nightly/default.nix index f6adc4a..cffaa1d 100644 --- a/home-config/nix-home-manager/firefox-nightly/default.nix +++ b/home-config/nix-home-manager/firefox-nightly/default.nix @@ -11,7 +11,7 @@ in { programs.firefox = { enable = true; - package = wrapped-ff-nightly; + #package = wrapped-ff-nightly; profiles.${config.home.username} = { name = "${config.home.username}"; diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock index 9316edc..a0c7e15 100644 --- a/home-config/nix-home-manager/flake.lock +++ b/home-config/nix-home-manager/flake.lock @@ -49,6 +49,27 @@ "type": "github" } }, + "clipboard-sync": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731355357, + "narHash": "sha256-kTXsO+hskCfX36+Ez1fHu9SO54uUY2lofkrbMKE3Vrk=", + "owner": "dnut", + "repo": "clipboard-sync", + "rev": "943e49e0a9a16b54bbab3704e99b6cf6ad4ea19f", + "type": "github" + }, + "original": { + "owner": "dnut", + "repo": "clipboard-sync", + "rev": "943e49e0a9a16b54bbab3704e99b6cf6ad4ea19f", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -156,6 +177,31 @@ "type": "github" } }, + "hypr-dynamic-cursors": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738522286, + "narHash": "sha256-Fg4+6Yko8V9b19/62jfKH0IWTiiRDMso1P1TnjAcs/8=", + "owner": "VirtCode", + "repo": "hypr-dynamic-cursors", + "rev": "fd6214629937949ecd8a39f4b5ebbce2afac0dd5", + "type": "github" + }, + "original": { + "owner": "VirtCode", + "repo": "hypr-dynamic-cursors", + "rev": "fd6214629937949ecd8a39f4b5ebbce2afac0dd5", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -725,7 +771,9 @@ }, "root": { "inputs": { + "clipboard-sync": "clipboard-sync", "home-manager": "home-manager", + "hypr-dynamic-cursors": "hypr-dynamic-cursors", "hyprland": "hyprland", "hyprlock": "hyprlock", "hyprpicker-git": "hyprpicker-git", diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix index b680ab9..ba3d01a 100644 --- a/home-config/nix-home-manager/flake.nix +++ b/home-config/nix-home-manager/flake.nix @@ -33,9 +33,18 @@ url = "github:nix-community/flake-firefox-nightly/3391372604cd3def19e6df88a51f1882aabcd59f"; inputs.nixpkgs.follows = "nixpkgs"; }; + clipboard-sync = { + url = "github:dnut/clipboard-sync/943e49e0a9a16b54bbab3704e99b6cf6ad4ea19f"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hypr-dynamic-cursors = { + url = "github:VirtCode/hypr-dynamic-cursors/fd6214629937949ecd8a39f4b5ebbce2afac0dd5"; + inputs.hyprland.follows = "hyprland"; + inputs.nixpkgs.follows = "hyprland/nixpkgs"; + }; }; - outputs = { nixpkgs, home-manager, hyprland, nixgl, wpaperd, hyprpicker-git, hyprlock, mozff, ... }@inputs: + outputs = { nixpkgs, home-manager, hyprland, nixgl, wpaperd, hyprpicker-git, hyprlock, mozff, clipboard-sync, hypr-dynamic-cursors, ... }@inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -59,6 +68,8 @@ inherit hyprlock; inherit hyprpicker-git; inherit mozff; + inherit clipboard-sync; + inherit hypr-dynamic-cursors; }; } ]; diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index 4c72beb..d2e0034 100644 --- a/home-config/nix-home-manager/home.nix +++ b/home-config/nix-home-manager/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, hyprland, nixgl, wpaperd, hyprpicker-git, hyprlock, mozff, ... }: +{ config, pkgs, hyprland, nixgl, wpaperd, hyprpicker-git, hyprlock, mozff, clipboard-sync, hypr-dynamic-cursors, ... }: { imports = [ @@ -32,7 +32,15 @@ serif = [ "DejaVu Serif" ]; }; - # wayland.windowManager.hyprland.enable = true; + wayland.windowManager.hyprland = { + enable = true; + package = hyprland.packages.${pkgs.system}.hyprland; + portalPackage = hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; + extraConfig = '' + ${builtins.readFile ../hypr/hyprland.conf} + ''; + plugins = [ hypr-dynamic-cursors.packages.${pkgs.system}.hypr-dynamic-cursors ]; + }; programs.starship = { enable = true; @@ -98,11 +106,12 @@ '') # Flakes specific things defined in flake.nix - hyprland.packages.${pkgs.system}.default - hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland + #hyprland.packages.${pkgs.system}.default + #hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland nixgl.packages.${pkgs.system}.nixGLIntel wpaperd.packages.${pkgs.system}.wpaperd hyprpicker-git.packages.${pkgs.system}.hyprpicker + clipboard-sync.packages.${pkgs.system}.default # Fonts! noto-fonts -- cgit v1.2.3