diff --git a/flake.lock b/flake.lock index 481eed4..302d5b8 100644 --- a/flake.lock +++ b/flake.lock @@ -17,7 +17,9 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1715486357, @@ -51,11 +53,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1715218190, - "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", + "lastModified": 1715395895, + "narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", + "rev": "71bae31b7dbc335528ca7e96f479ec93462323ff", "type": "github" }, "original": { @@ -65,28 +67,12 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1715447595, - "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "hardware": "hardware", "home-manager": "home-manager", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" } } }, diff --git a/flake.nix b/flake.nix index 5da5fe9..625a875 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ hardware.url = "github:nixos/nixos-hardware"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -57,4 +57,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/users/willifan/applications.nix b/users/willifan/applications.nix index 59133fa..129e410 100644 --- a/users/willifan/applications.nix +++ b/users/willifan/applications.nix @@ -9,8 +9,6 @@ playerctl - kanshi - jq bc xorg.xrandr diff --git a/users/willifan/graphical/hyprland/default.nix b/users/willifan/graphical/hyprland/default.nix index 56ef9a5..77613af 100644 --- a/users/willifan/graphical/hyprland/default.nix +++ b/users/willifan/graphical/hyprland/default.nix @@ -1,6 +1,7 @@ { pkgs, ... }: { + programs.hyprland.enable = true; imports = [ ./hypridle.nix ./hyprland.nix @@ -8,4 +9,6 @@ ./hyprpaper.nix #./kanshi.nix ]; -} \ No newline at end of file + + +} diff --git a/users/willifan/graphical/hyprland/hyprland.nix b/users/willifan/graphical/hyprland/hyprland.nix index 116d159..451f89c 100644 --- a/users/willifan/graphical/hyprland/hyprland.nix +++ b/users/willifan/graphical/hyprland/hyprland.nix @@ -15,7 +15,7 @@ ]; # Execute your favorite apps at launch exec-once = [ - ''kanshi & hyprpaper & hypridle &"'' + ''kanshi &'' ''hyprctl dispatch exec "[workspace 1 silent] kitty"'' ''hyprctl dispatch exec "[workspace 2 silent] firefox"'' diff --git a/users/willifan/graphical/theme/font.nix b/users/willifan/graphical/theme/font.nix index d6ba413..6c7a2a7 100644 --- a/users/willifan/graphical/theme/font.nix +++ b/users/willifan/graphical/theme/font.nix @@ -11,4 +11,4 @@ }; }; }; -} \ No newline at end of file +}