Compare commits

...

3 commits

Author SHA1 Message Date
GaspardCulis
3ca03b83ed fix(flake): Fixed disko input url 2024-09-20 14:16:28 +00:00
GaspardCulis
abcb3d53c2 fix(users): Fixed import paths 2024-09-20 14:02:12 +00:00
GaspardCulis
1525ee9499 refactor(flake): Pass inputs as extraSpecialArgs 2024-09-20 14:01:22 +00:00
5 changed files with 19 additions and 21 deletions

View file

@ -1,8 +1,8 @@
{ {
hy3, inputs,
pkgs, pkgs,
... ...
} : { }: {
home.file = { home.file = {
".config/hypr/hyprland.conf.d".source = ./hyprland.conf.d; ".config/hypr/hyprland.conf.d".source = ./hyprland.conf.d;
}; };
@ -10,11 +10,11 @@
home.packages = [ home.packages = [
pkgs.egl-wayland # For NVIDIA compatibility pkgs.egl-wayland # For NVIDIA compatibility
]; ];
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
extraConfig = builtins.readFile ./hyprland.conf; extraConfig = builtins.readFile ./hyprland.conf;
plugins = [ hy3.packages.${pkgs.system}.hy3 ]; plugins = [inputs.hy3.packages.${pkgs.system}.hy3];
}; };
# bar is required # bar is required

View file

@ -44,16 +44,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1690751248, "lastModified": 1726838624,
"narHash": "sha256-al5+aqPKL2VtCnuMccafyl4hQqZn+xIaG7vLuhGWfvE=", "narHash": "sha256-SU40aZ/UyK4bhuanaWvqlhIw2/kiDrGYcKxCkTn5FP8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "67c4508ce9a778f429a5af3571f49733fd3e8a05", "rev": "0fe779905ffe730eace0bf7ecf56938c625012a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "make-disk-image",
"repo": "disko", "repo": "disko",
"type": "github" "type": "github"
} }

View file

@ -9,7 +9,7 @@
}; };
disko = { disko = {
url = "github:nix-community/disko/make-disk-image"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -28,9 +28,8 @@
nixpkgs, nixpkgs,
disko, disko,
home-manager, home-manager,
hy3,
... ...
}: let } @ inputs: let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in { in {
@ -48,7 +47,7 @@
"gaspard" = home-manager.lib.homeManagerConfiguration { "gaspard" = home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
extraSpecialArgs = {inherit hy3;}; extraSpecialArgs = {inherit inputs;};
modules = [ modules = [
./users/gaspard.nix ./users/gaspard.nix
]; ];
@ -57,7 +56,7 @@
"culisg@im2ag" = home-manager.lib.homeManagerConfiguration { "culisg@im2ag" = home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
extraSpecialArgs = {inherit hy3;}; extraSpecialArgs = {inherit inputs;};
modules = [ modules = [
./users/culisg.nix ./users/culisg.nix
]; ];

View file

@ -7,9 +7,9 @@
programs.direnv.enable = true; programs.direnv.enable = true;
imports = [ imports = [
../../shell ../shell
../../term ../term
../../editor ../editor
../../de ../de
]; ];
} }

View file

@ -7,9 +7,9 @@
programs.direnv.enable = true; programs.direnv.enable = true;
imports = [ imports = [
../../shell ../shell
../../term ../term
../../editor ../editor
../../de ../de
]; ];
} }