diff --git a/alex/home.nix b/alex/home.nix index 0f2b13c..a0c94d5 100644 --- a/alex/home.nix +++ b/alex/home.nix @@ -62,9 +62,10 @@ }; kitty = { enable = true; + # TODO figure out how to get atau-nixpkgs working from the flake with different systems + # background_image ${atau-nixpkgs.atau-wallpapers}/share/backgrounds/atau-wallpapers/aos1.png extraConfig = '' background_tint 0.2 - background_image ${pkgs.atau-wallpapers}/share/backgrounds/atau-wallpapers/aos1.png background_image_layout centered modify_font cell_width 110% diff --git a/flake.lock b/flake.lock index 1695724..a40e835 100644 --- a/flake.lock +++ b/flake.lock @@ -29,32 +29,31 @@ ] }, "locked": { - "lastModified": 1686693375, - "narHash": "sha256-1Smjo0E8WI9PeVGmmCjpQWRX04aQvz5gAGXfdanIjgw=", + "lastModified": 1705708511, + "narHash": "sha256-3f4BkRY70Fj7yvuo87c4QQPAjnt571g2wJ50jY7hnYc=", "owner": "nix-community", "repo": "home-manager", - "rev": "61e5d1c38ef04ba30a9119825b159bce9c6010be", + "rev": "ce4b88c465d928f4f8b75d0920f1788d5b65ca94", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1686921029, - "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", + "lastModified": 1705496572, + "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", + "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 62a14e4..bf8c5fe 100644 --- a/flake.nix +++ b/flake.nix @@ -2,28 +2,28 @@ description = "Alex's super mega awesome nixos config"; inputs = { - nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05; + nixpkgs.url = github:NixOS/nixpkgs/nixos-unstable; + # unstable.url = "nixpkgs/nixos-unstable"; atau-nixpkgs.url = "git+https://git.atauno.com/atau/atau-nixpkgs?ref=main&rev=1e72f4b1e9b7a2991e3ccdebbe75d312f016da3b"; atau-nixpkgs.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs@{ self, nixpkgs, atau-nixpkgs, home-manager, ... }: - let - system = "x86_64-linux"; - pkgs = import nixpkgs { - inherit system; - config.allowUnfree = true; - overlays = [ atau-nixpkgs.overlays.default ]; - }; - in + outputs = { self, nixpkgs, home-manager, ... }@attrs: + # let + # # system = "x86_64-linux"; + # # pkgs = import nixpkgs { + # # # inherit system; + # # config.allowUnfree = true; + # # overlays = [ atau-nixpkgs.overlays.default ]; + # # }; + # in { nixosConfigurations.nixos76 = nixpkgs.lib.nixosSystem { - inherit pkgs; - inherit system; + system = "x86_64-linux"; modules = [ ./system/configuration.nix home-manager.nixosModules.home-manager @@ -38,8 +38,7 @@ }; nixosConfigurations.ursa-minor = nixpkgs.lib.nixosSystem { - inherit pkgs; - inherit system; + system = "aarch64-linux"; modules = [ ./ursa-minor/configuration.nix ]; diff --git a/system/configuration.nix b/system/configuration.nix index 3a1f697..ca38be0 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -145,14 +145,14 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - atau-wallpapers + # atau-wallpapers blueman dxvk envsubst font-manager gparted lshw - mesa_22_3 + mesa nodejs_20 pavucontrol unzip @@ -167,7 +167,7 @@ services.avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; openFirewall = true; };