From b1d59bbb9e4c5426c42042283969cc1dfcc20820 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 11 Jan 2025 22:25:49 +0000 Subject: [PATCH] fix starlite paths --- configuration/kde.nix | 2 +- flake.nix | 4 +--- starlite/configuration.nix | 3 +++ starlite/home.nix | 8 ++++---- tuxedo/configuration.nix | 3 +++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/configuration/kde.nix b/configuration/kde.nix index d82ddba..385efd2 100644 --- a/configuration/kde.nix +++ b/configuration/kde.nix @@ -12,7 +12,7 @@ services.desktopManager.plasma6.enable = true; environment.systemPackages = with pkgs; - [ ] ++ (with kdePackages; [ + [ maliit-keyboard ] ++ (with kdePackages; [ sddm-kcm plasma-disks partitionmanager diff --git a/flake.nix b/flake.nix index 1039972..cffbb79 100644 --- a/flake.nix +++ b/flake.nix @@ -17,14 +17,12 @@ nixosConfigurations.tuxedo = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; modules = [ - ./configuration/base.nix ./tuxedo/configuration.nix ]; }; - nixosConfigurations.starlite = nixpkgs.lib.nixosSystem { + nixosConfigurations.starlite = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; modules = [ - ./configuration/base.nix ./starlite/configuration.nix ]; }; diff --git a/starlite/configuration.nix b/starlite/configuration.nix index 8da5a3d..773548f 100644 --- a/starlite/configuration.nix +++ b/starlite/configuration.nix @@ -7,6 +7,7 @@ { imports = [ + ../configuration/base.nix # Include the results of the hardware scan. ./hardware-configuration.nix inputs.disko.nixosModules.default @@ -15,6 +16,8 @@ ../modules/laptop.nix ]; + networking.hostName = "starlite"; # Define your hostname. + # Define a user account. Don't forget to set a password with ‘passwd’. users.users.worble = { initialPassword = "password"; diff --git a/starlite/home.nix b/starlite/home.nix index 6384ab6..31bc98c 100644 --- a/starlite/home.nix +++ b/starlite/home.nix @@ -2,10 +2,10 @@ { imports = [ - ../../home-manager/fonts.nix - ../../home-manager/terminal.nix - ../../home-manager/firefox/firefox.nix - ../../home-manager/development/vscode.nix + ../home-manager/fonts.nix + ../home-manager/terminal.nix + ../home-manager/firefox/firefox.nix + ../home-manager/development/vscode.nix ]; terminal.nixUpdateLocation = "/home/worble/Projects/nixos#starlite"; diff --git a/tuxedo/configuration.nix b/tuxedo/configuration.nix index c6ed1e7..59d0b0a 100644 --- a/tuxedo/configuration.nix +++ b/tuxedo/configuration.nix @@ -7,6 +7,7 @@ { imports = [ + ../configuration/base.nix # Include the results of the hardware scan. ./hardware-configuration.nix inputs.disko.nixosModules.default @@ -17,6 +18,8 @@ ../modules/gaming.nix ]; + networking.hostName = "tuxedo"; # Define your hostname. + fileSystems."/mnt/HDD1" = { #device = "/dev/disk/by-uuid/35763dc3-c736-4714-ade7-40bf49ad50dd"; fsType = "ext4";