diff --git a/flake.nix b/flake.nix index 10402bb..a1c8dce 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ ./system/desktop.nix ./system/hardware-nova.nix ./system/gnome.nix + ./system/steam.nix ./system/btrbk.nix ./system/yubikey.nix ./system/alt.nix @@ -43,6 +44,20 @@ ]; }; + ernst = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs; }; + modules = [ + { + networking.hostName = "ernst"; + } + ./system + ./system/hardware-ernst.nix + ./system/desktop.nix + ./system/plasma.nix + ./system/laura.nix + ]; + }; + romulus = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; modules = [ @@ -98,6 +113,13 @@ ./home/alt.nix ]; }; + "lisa@ernst" = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlay; + extraSpecialArgs = { inherit inputs; }; + modules = [ + ./home/lisa.nix + ]; + }; }; }; } diff --git a/home/lisa.nix b/home/lisa.nix new file mode 100644 index 0000000..e98b80d --- /dev/null +++ b/home/lisa.nix @@ -0,0 +1,27 @@ +{ config, pkgs, inputs, lib, ... }: + +{ + programs.home-manager.enable = true; + + services.dropbox.enable = true; + + home.packages = with pkgs; [ + chromium + drawing + dropbox + hunspell + hunspellDicts.de_DE + hunspellDicts.en_US + hyphen + libreoffice + libsecret + vlc + xournalpp + zathura + ]; + + imports = [ + ./fonts.nix + ]; + +} diff --git a/system/desktop.nix b/system/desktop.nix index 8405ff9..a412249 100644 --- a/system/desktop.nix +++ b/system/desktop.nix @@ -30,10 +30,6 @@ shell = pkgs.fish; }; - programs.steam = { - enable = true; - }; - hardware.pulseaudio.enable = false; services.pipewire = { @@ -60,6 +56,7 @@ environment.systemPackages = with pkgs; [ firefox + libreoffice foot pciutils tree diff --git a/system/laura.nix b/system/laura.nix new file mode 100644 index 0000000..60a80df --- /dev/null +++ b/system/laura.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: + +{ + users.users.laura = { + home = "/home/laura"; + isNormalUser = true; + description = "Laura"; + extraGroups = [ + "networkmanager" + ]; + }; +} diff --git a/system/lisa.nix b/system/lisa.nix index e4a228d..60a80df 100644 --- a/system/lisa.nix +++ b/system/lisa.nix @@ -1,9 +1,10 @@ { config, pkgs, ... }: { - users.users.lisa = { + users.users.laura = { + home = "/home/laura"; isNormalUser = true; - description = "Lisa"; + description = "Laura"; extraGroups = [ "networkmanager" ]; diff --git a/system/plasma.nix b/system/plasma.nix index 336ac94..6ebe62e 100644 --- a/system/plasma.nix +++ b/system/plasma.nix @@ -3,17 +3,4 @@ { services.xserver.enable = true; services.xserver.desktopManager.plasma6.enable = true; - # environment.gnome.excludePackages = (with pkgs; [ - # gnome-tour - # ]) ++ (with pkgs.gnome; [ - # geary - # yelp - # gnome-contacts - # gnome-initial-setup - # ]); - # environment.systemPackages = with pkgs.gnome; [ - # gnome-sound-recorder - # gnome-tweaks - # gnome-boxes - # ]; } diff --git a/system/steam.nix b/system/steam.nix new file mode 100644 index 0000000..781e12e --- /dev/null +++ b/system/steam.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ... }: + +{ + programs.steam.enable = true; +}