moved home-manager config from configuration.nix into flake.nix, unified all module imports into flake.nix
This commit is contained in:
parent
b33b517c48
commit
19907c1d03
4 changed files with 25 additions and 10 deletions
10
flake.nix
10
flake.nix
|
@ -28,13 +28,19 @@
|
|||
specialArgs = { inherit inputs; };
|
||||
inherit system;
|
||||
modules = [
|
||||
# Import configuration modules
|
||||
# Import nixos modules here
|
||||
./hosts/gabbielaptop/configuration.nix
|
||||
./modules/nh.nix
|
||||
./modules/waydroid.nix
|
||||
inputs.home-manager.nixosModules.default
|
||||
# inputs.anyrun.homeManagerModules.default
|
||||
];
|
||||
};
|
||||
homeConfigurations.blue = home-manager.lib.homeManagerConfiguration {
|
||||
# Import home-manager modules here
|
||||
modules = [
|
||||
./home-manager/home.nix
|
||||
inputs.anyrun.homeManagerModules.default
|
||||
];
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
home.homeDirectory = "/home/blue";
|
||||
|
||||
imports = [
|
||||
inputs.anyrun.homeManagerModules.default
|
||||
./hyprland.nix
|
||||
./waybar.nix
|
||||
./swaync.nix
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
];
|
||||
modules-left = [ "wlr/taskbar" ];
|
||||
modules-center = [ "clock" "custom/swaync" ];
|
||||
modules-right = [ "pulseaudio" "backlight" "battery" "tray" ];
|
||||
modules-right = [ "pulseaudio/slider" "backlight" "battery" "tray" ];
|
||||
"clock" = {
|
||||
"format" = "{:%A %d %b %T}";
|
||||
# "tooltip" = true;
|
||||
|
@ -48,6 +48,16 @@
|
|||
.module {
|
||||
margin: 0px 10px 0px 10px;
|
||||
}
|
||||
#pulseaudio-slider trough {
|
||||
min-height: 10px;
|
||||
min-width: 80px;
|
||||
border-radius: 5px;
|
||||
background-color: transparent;
|
||||
}
|
||||
#pulseaudio-slider highlight {
|
||||
min-width: 80px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
@ -105,12 +105,12 @@
|
|||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
users = {
|
||||
"blue" = import ../../home-manager/home.nix;
|
||||
};
|
||||
};
|
||||
# home-manager = {
|
||||
# extraSpecialArgs = { inherit inputs; };
|
||||
# users = {
|
||||
# "blue" = import ../../home-manager/home.nix;
|
||||
# };
|
||||
# };
|
||||
|
||||
# Enable fingerprint daemon
|
||||
services.fprintd.enable = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue