diff --git a/flake.nix b/flake.nix index 9a69c28..3eaf4eb 100644 --- a/flake.nix +++ b/flake.nix @@ -113,9 +113,7 @@ }; modules = [ ./hosts/battleship/configuration.nix - ./home/terminal/configuration.nix - inputs.stylix.nixosModules.stylix - ./style.nix + ./home/worm/configuration.nix ]; }; "fighter" = nixpkgs.lib.nixosSystem rec { @@ -179,6 +177,12 @@ ./home/terminal/home.nix ]; }; + "worm" = home-manager.lib.homeManagerConfiguration { + inherit pkgs pkgs-unstable; + modules = [ + ./home/worm/home.nix + ]; + }; }); nixosModules = { @@ -203,7 +207,6 @@ }: { audacity = pkgs.callPackage ./packages/audacity.nix {}; cal-sans = pkgs.callPackage ./packages/cal-sans.nix {}; - neovim = inputs.neovim.packages.${pkgs.stdenv.hostPlatform.system}.default; devkit = { ghostty = pkgs.callPackage ./packages/devkit/ghostty.nix { command = "${lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.devkit.zsh}"; @@ -216,6 +219,7 @@ zsh = pkgs.callPackage ./packages/devkit/zsh {}; neovim = self.packages.${pkgs.system}.neovim; }; + neovim = inputs.neovim.packages.${pkgs.stdenv.hostPlatform.system}.default; }); devShells = forAllSystems ({ diff --git a/home/worm/configuration.nix b/home/worm/configuration.nix new file mode 100644 index 0000000..4e91fab --- /dev/null +++ b/home/worm/configuration.nix @@ -0,0 +1,34 @@ +{ + lib, + inputs, + pkgs, + self, + ... +} @ args: { + imports = [ + inputs.home-manager.nixosModules.default + ]; + + # Home Manager + home-manager = { + backupFileExtension = "bkp"; + extraSpecialArgs = {inherit (args) inputs self pkgs-unstable;}; + useGlobalPkgs = true; + useUserPackages = true; + users."guz" = ./home.nix; + }; + + # Users + users.users."guz" = { + extraGroups = ["wheel" "guz"]; + isNormalUser = true; + password = "1313"; + # hashedPasswordFile = builtins.toString config.sops.secrets."guz/password".path; + shell = self.packages.${pkgs.stdenv.hostPlatform.system}.devkit.zsh; + }; + users.groups."guz" = {}; + + # Nixpkgs + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) ["via"]; +} diff --git a/home/worm/home.nix b/home/worm/home.nix new file mode 100644 index 0000000..01e465f --- /dev/null +++ b/home/worm/home.nix @@ -0,0 +1,15 @@ +{self, ...}: { + imports = [ + self.homeManagerModules.devkit + ]; + + # 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 = "25.11"; +}