diff --git a/flake.nix b/flake.nix index 6efb1b0..7eb7598 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; #nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "nixpkgs"; - }; home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -16,7 +12,7 @@ pinix.url = "github:remi-dupre/pinix"; }; - outputs = inputs@{ self, nixpkgs, nixos-cosmic, home-manager, nixos-hardware, pinix, ... }: { + outputs = inputs@{ self, nixpkgs, home-manager, nixos-hardware, pinix }: { nixosConfigurations = { "nixos" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -62,20 +58,13 @@ ./garrus.nix ./gnome.nix ./configuration.nix + nixos-hardware.nixosModules.system76 home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.aaronh = import ./home.nix; } - nixos-hardware.nixosModules.system76 - { - nix.settings = { - substituters = [ "https://cosmic.cachix.org/" ]; - trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; - }; - } - nixos-cosmic.nixosModules.default ]; }; diff --git a/home.nix b/home.nix index 2495c92..cc51dde 100644 --- a/home.nix +++ b/home.nix @@ -1,20 +1,12 @@ { config, pkgs, ... }: { - # Home Manager needs a bit of information about you and the - # paths it should manage. - home.username = "aaronh"; - home.homeDirectory = "/home/aaronh"; - # This value determines the Home Manager release that your - # configuration is compatible with. This helps avoid breakage - # when a new Home Manager release introduces backwards - # incompatible changes. - # - # You can update Home Manager without changing this value. See - # the Home Manager release notes for a list of state version - # changes in each release. - home.stateVersion = "24.11"; + home = { + username = "aaronh"; + homeDirectory = "/home/aaronh"; + stateVersion = "24.11"; + }; home.packages = with pkgs; [ deja-dup diff --git a/hosts/aarch64/vetra/configuration.nix b/hosts/aarch64/vetra/configuration.nix index 112627a..f2ad7c5 100644 --- a/hosts/aarch64/vetra/configuration.nix +++ b/hosts/aarch64/vetra/configuration.nix @@ -70,9 +70,7 @@ # Enable SSH services.openssh.enable = true; - # Enable CUPS - services.printing.enable = true; - + # Enable Tailscale services.tailscale.enable = true; # Allow Unfree