diff --git a/flake.nix b/flake.nix index f182d62..c5b4017 100644 --- a/flake.nix +++ b/flake.nix @@ -31,12 +31,14 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; + nixarr.url = "github:rasmus-kirk/nixarr"; }; outputs = { self, catppuccin, lanzaboote, + nixarr, nur, plasma-manager, sops-nix, @@ -124,6 +126,12 @@ home-manager = inputs.home-manager-stable; modules = []; }; + nixarr = mkNixOSConfigurations { + host = hosts.nixarr; + nixpkgs = inputs.nixpkgs-stable; + home-manager = inputs.home-manager-stable; + modules = [nixarr.nixosModules.default]; + }; }; }; } diff --git a/home/base.nix b/home/base.nix index 74d1455..790dd39 100644 --- a/home/base.nix +++ b/home/base.nix @@ -71,6 +71,7 @@ enable = true; enableCompletion = true; autosuggestion.enable = true; + dotDir = "${config.xdg.configHome}/zsh"; history = { append = true; extended = true; diff --git a/hosts/anzu/configuration.nix b/hosts/anzu/configuration.nix index b3ba066..fa16fb2 100644 --- a/hosts/anzu/configuration.nix +++ b/hosts/anzu/configuration.nix @@ -12,12 +12,8 @@ ]; hardware.graphics = { - extraPackages = with pkgs; [ - amdvlk - ]; - extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; + enable = true; + enable32Bit = true; }; services.xserver.videoDrivers = [ "amdgpu" ]; diff --git a/hosts/hosts.nix b/hosts/hosts.nix index 5092352..bf81b31 100644 --- a/hosts/hosts.nix +++ b/hosts/hosts.nix @@ -19,4 +19,10 @@ in { arch = "x86_64-Linux"; user = user; }; + nixarr = { + hostname = "nixarr"; + dir = "nixarr"; + arch = "x86_64-Linux"; + user = user; + }; } diff --git a/hosts/nixarr/configuration.nix b/hosts/nixarr/configuration.nix new file mode 100644 index 0000000..ca2bbcf --- /dev/null +++ b/hosts/nixarr/configuration.nix @@ -0,0 +1,18 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). +{ + config, + pkgs, + ... +}: { + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ../../nixos/base.nix + ]; + + networking.hostName = "nixarr"; + + system.stateVersion = "25.05"; +} diff --git a/hosts/nixarr/home.nix b/hosts/nixarr/home.nix new file mode 100644 index 0000000..77c2f6a --- /dev/null +++ b/hosts/nixarr/home.nix @@ -0,0 +1,11 @@ +{ + config, + pkgs, + ... +}: { + imports = [ + ../../home/base.nix + ]; + + home.stateVersion = "25.05"; +} diff --git a/nixos/base.nix b/nixos/base.nix index 4d588af..c79d42e 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -254,9 +254,15 @@ virtualisation = { containers.enable = true; + docker = { + enable = true; + rootless = { + enable = true; + setSocketVariable = true; + }; + }; podman = { enable = true; - dockerCompat = true; defaultNetwork.settings = { dns_enabled = true; };