diff --git a/flake.nix b/flake.nix index 49664cc..ded9282 100644 --- a/flake.nix +++ b/flake.nix @@ -34,9 +34,8 @@ mangoModule = assert lib.hasAttrByPath [ "nixosModules" "mango" ] mango; mango.nixosModules.mango; - # IMPORTANT: Replace with actual hostname commonModules = [ - ./hosts//hardware-configuration.nix + ./hosts/atlas/hardware-configuration.nix ./modules/common.nix mangoModule ]; diff --git a/hosts/hostname/hardware-configuration.nix b/hosts/atlas/hardware-configuration.nix similarity index 100% rename from hosts/hostname/hardware-configuration.nix rename to hosts/atlas/hardware-configuration.nix diff --git a/modules/common.nix b/modules/common.nix index 47c4eb7..564e07e 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -10,10 +10,9 @@ # -------------------------------------------------------------------------- # SYSTEM # -------------------------------------------------------------------------- - # IMPORTANT: Replace with actual values - networking.hostName = ""; - time.timeZone = ""; - i18n.defaultLocale = ""; + networking.hostName = "atlas"; + time.timeZone = "Europe/Rome"; # TODO: Change to your timezone + i18n.defaultLocale = "en_US.UTF-8"; networking.networkmanager.enable = true; @@ -42,6 +41,13 @@ # This variable is optional but makes it explicit environment.variables.AMD_VULKAN_ICD = "RADV"; + # Wayland session variables for proper app integration + environment.sessionVariables = { + QT_QPA_PLATFORM = "wayland"; + MOZ_ENABLE_WAYLAND = "1"; + NIXOS_OZONE_WL = "1"; # Electron apps (VS Code, Discord, etc.) + }; + # -------------------------------------------------------------------------- # CPU - Zen 3 Optimizations (Ryzen 7 5700G) # -------------------------------------------------------------------------- @@ -75,16 +81,14 @@ enable = true; settings.default_session = { command = "mango"; - # IMPORTANT: Replace with actual username - user = ""; + user = "pinj"; }; }; # -------------------------------------------------------------------------- # USER ACCOUNT # -------------------------------------------------------------------------- - # IMPORTANT: Replace with actual username - users.users. = { + users.users.pinj = { isNormalUser = true; extraGroups = [ "wheel" "networkmanager" "video" "seat" ]; # IMPORTANT: Generate a password hash with: mkpasswd -m sha-512 diff --git a/modules/dev.nix b/modules/dev.nix index bcf47d9..2f4dca4 100644 --- a/modules/dev.nix +++ b/modules/dev.nix @@ -22,10 +22,9 @@ }; }; - # IMPORTANT: Replace with actual username # NOTE: After first enabling/applying this dev profile, you must log out and # log back in (or reboot) for the docker group membership to take effect. - users.users..extraGroups = [ "docker" ]; + users.users.pinj.extraGroups = [ "docker" ]; # -------------------------------------------------------------------------- # DEVELOPMENT TOOLS @@ -35,8 +34,7 @@ nix-direnv.enable = true; # Caches nix shells }; - # IMPORTANT: Replace with actual username - users.users..packages = with pkgs; [ + users.users.pinj.packages = with pkgs; [ # -- Git -- lazygit gh # GitHub CLI diff --git a/modules/gaming.nix b/modules/gaming.nix index ad40843..e3f207b 100644 --- a/modules/gaming.nix +++ b/modules/gaming.nix @@ -53,14 +53,12 @@ # programs to function correctly. These groups are only added when using # the gaming profile. If you need consistent group membership across # both profiles, add these groups to common.nix instead. - # IMPORTANT: Replace with actual username - users.users..extraGroups = [ "corectrl" "gamemode" ]; + users.users.pinj.extraGroups = [ "corectrl" "gamemode" ]; # -------------------------------------------------------------------------- # GAMING PACKAGES # -------------------------------------------------------------------------- - # IMPORTANT: Replace with actual username - users.users..packages = with pkgs; [ + users.users.pinj.packages = with pkgs; [ # -- Performance Overlays -- mangohud # FPS counter, GPU stats goverlay # MangoHud GUI config