diff --git a/flake.nix b/flake.nix index 9464ae1..f70b0d7 100644 --- a/flake.nix +++ b/flake.nix @@ -108,6 +108,22 @@ nixos-pulse = import ./systems/nixos-pulse/disko.nix; }; homeConfigurations = { + "tester@tristan-desk-arch" = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + + modules = + [ + ./users/tester.nix + { + _module = {inherit args;}; + targets.genericLinux.enable = true; + programs.bash.enable = true; + programs.zsh.enable = true; + programs.home-manager.enable = true; + } + ] + ++ hmModules; + }; "tristand" = home-manager.lib.homeManagerConfiguration { inherit pkgs; @@ -116,6 +132,7 @@ ./users/tristand.nix { _module = {inherit args;}; + xsession.enable = true; } ] ++ hmModules; diff --git a/home-mods/dev/default.nix b/home-mods/dev/default.nix index 30440ee..0783e38 100644 --- a/home-mods/dev/default.nix +++ b/home-mods/dev/default.nix @@ -30,8 +30,14 @@ in { }; }; + programs.starship = { + enable = true; + package = pkgs.unstable.starship; + }; + programs.fish = { enable = true; + package = pkgs.unstable.fish; interactiveShellInit = '' any-nix-shell fish --info-right | source @@ -59,7 +65,7 @@ in { s = "status"; }; extraConfig = { - user.signingkey = "/home/tristand/.ssh/id_ed25519"; + user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519"; commit.gpgsign = true; gpg.format = "ssh"; }; diff --git a/users/default.nix b/users/default.nix index 82cb352..d729850 100644 --- a/users/default.nix +++ b/users/default.nix @@ -5,6 +5,14 @@ system, ... }: { + users.users.tester = { + isNormalUser = true; + description = "Testa Test"; + extraGroups = ["docker" "networkmanager" "wheel" "libvirtd" "qemu-libvirtd"]; + shell = pkgs.fish; + home = "/home/tester"; + hashedPassword = "$6$YJT50/Za3FSFQuNT$0orD1URwoURoRKO9sIAsUiIHxOtEOjmPXn5Mp7vAmIYlgVmI629qS7YPUInmztEtEorRpkSMbV3.fCy9NQhKX."; + }; users.users.tristand = { isNormalUser = true; description = "Tristan Druyen"; @@ -17,6 +25,12 @@ home-manager = { useUserPackages = true; useGlobalPkgs = true; + users.tester = import ./tester.nix { + inherit pkgs; + inherit config; + inherit inputs; + inherit system; + }; users.tristand = import ./tristand.nix { inherit pkgs; inherit config; diff --git a/users/tester.nix b/users/tester.nix new file mode 100644 index 0000000..0d3308b --- /dev/null +++ b/users/tester.nix @@ -0,0 +1,48 @@ +{ + pkgs, + config, + inputs, + system, + ... +}: let + wallpaper = inputs.nix-wallpaper.packages.${pkgs.system}.default.override { + logoSize = 24; + preset = "gruvbox-dark-rainbow"; + }; + wallpaperPath = "${wallpaper}/share/wallpapers/nixos-wallpaper.png"; +in { + imports = [ + ../home-mods/dev + ../home-mods/firefox + ../home-mods/plasma + ../home-mods/virt + ]; + + home.file.".background".source = wallpaperPath; + home.username = "tester"; + home.homeDirectory = "/home/tester"; + + home.packages = with pkgs.unstable; [ + bitwarden + brave + btop + cavalier + freetube + imagemagick + inkscape + jellyfin-media-player + kate + neofetch + nextcloud-client + onlyoffice-bin + rust-motd + rustdesk + tutanota-desktop + signal-desktop + statix + thunderbird + zellij + ]; + + home.stateVersion = "23.05"; +}