diff --git a/home.nix b/home/common.nix similarity index 99% rename from home.nix rename to home/common.nix index bc5f6b6..ff09548 100644 --- a/home.nix +++ b/home/common.nix @@ -1,6 +1,7 @@ { lib, config, pkgs, + hostName, hyprland-toggle-tiling, legacy-launcher, pass-autotype, @@ -8,8 +9,10 @@ { imports = [ - ./modules/hyprland.nix + ../modules/hyprland.nix + ./hosts/${hostName}.nix ]; + home = { username = "typo"; homeDirectory = "/home/typo"; diff --git a/home/hosts/Heracles.nix b/home/hosts/Heracles.nix new file mode 100644 index 0000000..dc2359c --- /dev/null +++ b/home/hosts/Heracles.nix @@ -0,0 +1,5 @@ +{ + wayland.windowManager.hyprland.settings = { + monitor=",preferred,auto,1.0"; + }; +} diff --git a/hyprland/hypr/monitors.nix b/home/hosts/Prometheus.nix similarity index 100% rename from hyprland/hypr/monitors.nix rename to home/hosts/Prometheus.nix diff --git a/modules/common.nix b/modules/common.nix index 9638301..97b4b79 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -1,9 +1,10 @@ { pkgs, pkgs-unstable, + lib, + config, hyprland-toggle-tiling, legacy-launcher, pass-autotype, - lib, ... }: { @@ -46,7 +47,7 @@ loader.timeout = lib.mkForce 1; }; - networking.networkmanager.enable = true; + networking.networkmanager.enable = true; time.timeZone = "Europe/Budapest"; @@ -69,18 +70,20 @@ }; }; - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = { - inherit - hyprland-toggle-tiling - legacy-launcher - pass-autotype; - }; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { + inherit + hyprland-toggle-tiling + legacy-launcher + pass-autotype; + + hostName = config.networking.hostName; + }; - users.typo = import ../home.nix; - }; + users.typo = ../home/common.nix; + }; programs = { # firefox.enable = true; diff --git a/modules/hyprland.nix b/modules/hyprland.nix index 2c31696..e5934ca 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -12,7 +12,6 @@ ../hyprland/hypr/autostart.nix ../hyprland/hypr/input.nix ../hyprland/hypr/appearance.nix - ../hyprland/hypr/monitors.nix ../hyprland/hypr/permissions.nix ../hyprland/raw/kitty.nix ../hyprland/raw/fuzzel.nix