moved home-manager config from configuration.nix into flake.nix, unified all module imports into flake.nix

This commit is contained in:
Gabriella Bere 2024-08-26 01:49:04 +01:00
parent b33b517c48
commit 19907c1d03
4 changed files with 25 additions and 10 deletions

View file

@ -28,13 +28,19 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
inherit system; inherit system;
modules = [ modules = [
# Import configuration modules # Import nixos modules here
./hosts/gabbielaptop/configuration.nix ./hosts/gabbielaptop/configuration.nix
./modules/nh.nix ./modules/nh.nix
./modules/waydroid.nix ./modules/waydroid.nix
inputs.home-manager.nixosModules.default 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
];
}
}; };
} }

View file

@ -5,7 +5,6 @@
home.homeDirectory = "/home/blue"; home.homeDirectory = "/home/blue";
imports = [ imports = [
inputs.anyrun.homeManagerModules.default
./hyprland.nix ./hyprland.nix
./waybar.nix ./waybar.nix
./swaync.nix ./swaync.nix

View file

@ -15,7 +15,7 @@
]; ];
modules-left = [ "wlr/taskbar" ]; modules-left = [ "wlr/taskbar" ];
modules-center = [ "clock" "custom/swaync" ]; modules-center = [ "clock" "custom/swaync" ];
modules-right = [ "pulseaudio" "backlight" "battery" "tray" ]; modules-right = [ "pulseaudio/slider" "backlight" "battery" "tray" ];
"clock" = { "clock" = {
"format" = "{:%A %d %b %T}"; "format" = "{:%A %d %b %T}";
# "tooltip" = true; # "tooltip" = true;
@ -48,6 +48,16 @@
.module { .module {
margin: 0px 10px 0px 10px; 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;
}
''; '';
}; };
} }

View file

@ -105,12 +105,12 @@
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
home-manager = { # home-manager = {
extraSpecialArgs = { inherit inputs; }; # extraSpecialArgs = { inherit inputs; };
users = { # users = {
"blue" = import ../../home-manager/home.nix; # "blue" = import ../../home-manager/home.nix;
}; # };
}; # };
# Enable fingerprint daemon # Enable fingerprint daemon
services.fprintd.enable = true; services.fprintd.enable = true;