diff --git a/flake.nix b/flake.nix index 37a7283..c00b050 100644 --- a/flake.nix +++ b/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 + ]; + } }; } diff --git a/home-manager/home.nix b/home-manager/home.nix index 198400c..472bc28 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -5,7 +5,6 @@ home.homeDirectory = "/home/blue"; imports = [ - inputs.anyrun.homeManagerModules.default ./hyprland.nix ./waybar.nix ./swaync.nix diff --git a/home-manager/waybar.nix b/home-manager/waybar.nix index 2e43a54..0924582 100644 --- a/home-manager/waybar.nix +++ b/home-manager/waybar.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; + } ''; }; } diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix index 168c050..d5a7312 100644 --- a/hosts/gabbielaptop/configuration.nix +++ b/hosts/gabbielaptop/configuration.nix @@ -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;