diff --git a/home-manager/features/neovim/config/lua/plugins/snacks.lua b/home-manager/features/neovim/config/lua/plugins/snacks.lua index f316aa1..73b1019 100644 --- a/home-manager/features/neovim/config/lua/plugins/snacks.lua +++ b/home-manager/features/neovim/config/lua/plugins/snacks.lua @@ -6,7 +6,7 @@ return { function() Snacks.picker.buffers() end, - desc = "Open Files", + desc = "Buffers", }, { "", false }, }, diff --git a/system/hosts/drew-desktop/default.nix b/system/hosts/drew-desktop/default.nix index 1887113..b13bca1 100644 --- a/system/hosts/drew-desktop/default.nix +++ b/system/hosts/drew-desktop/default.nix @@ -1,33 +1,27 @@ -{ self, nixpkgs, inputs, ... }: -let +{ nixpkgs, inputs, ... }: +nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - # TODO: Fix this so it doesn't warn about wanting readOnlyPkgs - pkgs = import nixpkgs { - inherit system; - config.allowUnfree = true; - }; -in nixpkgs.lib.nixosSystem { - inherit system; modules = [ ./configuration.nix ./hardware-configuration.nix inputs.home-manager.nixosModules.home-manager { - home-manager.users.drew = { pkgs, inputs, ... }: + nixpkgs.config.allowUnfree = true; + home-manager.users.drew = + { ... }: { imports = [ ./drew.nix ]; }; home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { - inherit inputs; - inherit pkgs; - }; + inherit inputs; + }; } ]; specialArgs = { inherit inputs; - inherit pkgs; }; } diff --git a/system/hosts/drew-desktop/drew.nix b/system/hosts/drew-desktop/drew.nix index b2478bc..3857a20 100644 --- a/system/hosts/drew-desktop/drew.nix +++ b/system/hosts/drew-desktop/drew.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, self, ... }: +{ pkgs, ... }: { imports = map (x: ../../../home-manager + x) [ "/features/linux-desktop.nix"