diff --git a/README.md b/README.md index c057049..507864c 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,15 @@ Flake-baseret NixOS config med KDE Plasma 6 + home-manager. ``` ├── flake.nix # Inputs (nixos-unstable, home-manager) -├── configuration.nix # System-konfig (boot, net, bruger) -├── home.nix # Brugerpakker (kun glennigen) -├── hardware-configuration.nix# Hardware (genereres, ikke i git endnu) +├── configuration.nix # System-konfig — desktop (nixos) +├── home.nix # Brugerpakker (fælles for alle hosts) ├── .gitignore +├── hosts/ +│ ├── nixos-x260/ +│ │ ├── default.nix # System-konfig — laptop +│ │ └── hardware-configuration.nix # Hardware (genereres på maskinen) +│ └── nixos/ +│ └── hardware-configuration.nix # Hardware (genereres på maskinen) └── modules/ ├── apps/ │ ├── default.nix @@ -24,18 +29,29 @@ Flake-baseret NixOS config med KDE Plasma 6 + home-manager. ```bash # Hardware-config genereres -nixos-generate-config --show-hardware-config > hardware-configuration.nix +nixos-generate-config --show-hardware-config > hosts/nixos/hardware-configuration.nix # Byg systemet sudo nixos-rebuild switch --flake ~/nix#nixos ``` +## Første gang på laptop (nixos-x260) + +```bash +# Hardware-config genereres +nixos-generate-config --show-hardware-config > hosts/nixos-x260/hardware-configuration.nix + +# Byg systemet +sudo nixos-rebuild switch --flake ~/nix#nixos-x260 +``` + ## Opdatering ```bash cd ~/nix nix flake update # opdater nixpkgs + home-manager -sudo nixos-rebuild switch --flake .#nixos +sudo nixos-rebuild switch --flake .#nixos # desktop +sudo nixos-rebuild switch --flake .#nixos-x260 # laptop ``` ## Tilføj pakker diff --git a/flake.nix b/flake.nix index 5f1ecf9..33257f8 100644 --- a/flake.nix +++ b/flake.nix @@ -21,5 +21,17 @@ } ]; }; + + nixosConfigurations.nixos-x260 = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./hosts/nixos-x260/default.nix + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.glennigen = import ./home.nix; + } + ]; + }; }; } \ No newline at end of file diff --git a/hosts/nixos-x260/default.nix b/hosts/nixos-x260/default.nix new file mode 100644 index 0000000..ef91cef --- /dev/null +++ b/hosts/nixos-x260/default.nix @@ -0,0 +1,33 @@ +{ config, pkgs, ... }: { + imports = [ + ../../modules/apps + ../../modules/desktop + ./hardware-configuration.nix # genereres på maskinen + ]; + + # System + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "nixos-x260"; + networking.networkmanager.enable = true; + + time.timeZone = "Europe/Copenhagen"; + i18n.defaultLocale = "da_DK.UTF-8"; + + # Bruger + users.users.glennigen = { + isNormalUser = true; + extraGroups = [ "wheel" "networkmanager" ]; + shell = pkgs.fish; + }; + + # Nix + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nixpkgs.config.allowUnfree = true; + + # GPU / åben driver (Intel HD 520 på x260) + hardware.graphics.enable = true; + + system.stateVersion = "26.05"; +} \ No newline at end of file