From d31795ed73231ca39b762993cbc9ae5cd2142ddf Mon Sep 17 00:00:00 2001 From: Frantisek Bohacek Date: Sat, 11 Nov 2023 09:06:03 +0100 Subject: [PATCH] chore: rename hosts --- hosts/configuration.nix | 2 +- hosts/default.nix | 43 ++++++++++--------- hosts/{desktop => desktop-clotho}/default.nix | 3 +- .../hardware-configuration.nix | 0 hosts/{desktop => desktop-clotho}/home.nix | 0 hosts/{laptop => laptop-iapetus}/default.nix | 2 +- .../hardware-configuration.nix | 0 hosts/{laptop => laptop-iapetus}/home.nix | 0 8 files changed, 26 insertions(+), 24 deletions(-) rename hosts/{desktop => desktop-clotho}/default.nix (97%) rename hosts/{desktop => desktop-clotho}/hardware-configuration.nix (100%) rename hosts/{desktop => desktop-clotho}/home.nix (100%) rename hosts/{laptop => laptop-iapetus}/default.nix (98%) rename hosts/{laptop => laptop-iapetus}/hardware-configuration.nix (100%) rename hosts/{laptop => laptop-iapetus}/home.nix (100%) diff --git a/hosts/configuration.nix b/hosts/configuration.nix index 47d0df1..3ea3f1d 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -27,7 +27,7 @@ users.users.${user} = { # System User isNormalUser = true; - extraGroups = [ "wheel" "video" "audio" "camera" "networkmanager" "lp" "scanner" "kvm" "libvirtd" "plex" ]; + extraGroups = [ "wheel" "video" "audio" "camera" "networkmanager" "lp" "scanner" "kvm" "libvirtd" "plex" "podman" ]; shell = pkgs.zsh; # Default shell }; programs.zsh.enable = true; # has to be here to set shell to zsh diff --git a/hosts/default.nix b/hosts/default.nix index c4cccfc..4666ed1 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -30,7 +30,8 @@ let in { - laptop = lib.nixosSystem { # Laptop profile + laptop-iapetus = lib.nixosSystem { # Laptop profile + # Ideapad S540 inherit system; specialArgs = { inherit inputs stable user location; @@ -38,7 +39,7 @@ in modules = [ nur.nixosModules.nur { nixpkgs.overlays = [ nur.overlay ]; } - ./laptop + ./laptop-iapetus ./configuration.nix home-manager.nixosModules.home-manager { @@ -52,65 +53,65 @@ in nix-index-database.hmModules.nix-index { nixpkgs.overlays = [ nur.overlay ]; } (import ./home.nix) - (import ./laptop/home.nix) + (import ./laptop-iapetus/home.nix) ]; }; } ]; }; - vm = lib.nixosSystem { # VM profile + desktop-clotho = lib.nixosSystem { # Desktop profile inherit system; specialArgs = { - inherit inputs stable user location; - }; - modules = [ + inherit inputs stable system user location; + }; # Pass flake variable + modules = [ # Modules that are used. nur.nixosModules.nur { nixpkgs.overlays = [ nur.overlay ]; } - ./vm + ./desktop-clotho ./configuration.nix - home-manager.nixosModules.home-manager { + home-manager.nixosModules.home-manager { # Home-Manager module that is used. home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs stable user location; - }; + }; # Pass flake variable home-manager.users.${user} = { imports = [ nur.hmModules.nur nix-index-database.hmModules.nix-index { nixpkgs.overlays = [ nur.overlay ]; } - (import ./home.nix) - (import ./vm/home.nix) + ./home.nix + ./desktop-clotho/home.nix ]; }; } ]; }; - desktop = lib.nixosSystem { # Desktop profile + vm = lib.nixosSystem { # VM profile inherit system; specialArgs = { - inherit inputs stable system user location; - }; # Pass flake variable - modules = [ # Modules that are used. + inherit inputs stable user location; + }; + modules = [ nur.nixosModules.nur { nixpkgs.overlays = [ nur.overlay ]; } - ./desktop + ./vm ./configuration.nix - home-manager.nixosModules.home-manager { # Home-Manager module that is used. + home-manager.nixosModules.home-manager { home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs stable user location; - }; # Pass flake variable + }; home-manager.users.${user} = { imports = [ nur.hmModules.nur nix-index-database.hmModules.nix-index { nixpkgs.overlays = [ nur.overlay ]; } - ./home.nix - ./desktop/home.nix + (import ./home.nix) + (import ./vm/home.nix) ]; }; } diff --git a/hosts/desktop/default.nix b/hosts/desktop-clotho/default.nix similarity index 97% rename from hosts/desktop/default.nix rename to hosts/desktop-clotho/default.nix index 7ac8b4c..80d4534 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop-clotho/default.nix @@ -25,6 +25,7 @@ [(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix [(import ../../modules/desktop/dm/sddm.nix)] ++ # Desktop manager [(import ../../modules/desktop/qtile/default.nix)] ++ # Window Manager + [(import ../../modules/programs/games.nix)] ++ (import ../../modules/desktop/virtualisation) ++ # Window Manager (import ../../modules/hardware) ++ # Hardware devices [(import ../../modules/programs/fpga/vivado { @@ -32,7 +33,7 @@ vivadoPath = "/data/Linux/fpga/apps/xilinx/Vivado/2023.1/bin/vivado"; })]; - networking.hostName = "nixos-desktop"; + networking.hostName = "desktop-clotho"; boot = { # Boot options kernelPackages = pkgs.linuxPackages_latest; diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop-clotho/hardware-configuration.nix similarity index 100% rename from hosts/desktop/hardware-configuration.nix rename to hosts/desktop-clotho/hardware-configuration.nix diff --git a/hosts/desktop/home.nix b/hosts/desktop-clotho/home.nix similarity index 100% rename from hosts/desktop/home.nix rename to hosts/desktop-clotho/home.nix diff --git a/hosts/laptop/default.nix b/hosts/laptop-iapetus/default.nix similarity index 98% rename from hosts/laptop/default.nix rename to hosts/laptop-iapetus/default.nix index 914a8ba..8e76488 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop-iapetus/default.nix @@ -30,7 +30,7 @@ vivadoPath = "/data/fpga/xilinx/Vivado/2023.1/bin/vivado"; })]; # Hardware devices - networking.hostName = "nixos-laptop"; + networking.hostName = "laptop-iapetus"; boot = { # Boot options kernelPackages = pkgs.linuxPackages_latest; diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop-iapetus/hardware-configuration.nix similarity index 100% rename from hosts/laptop/hardware-configuration.nix rename to hosts/laptop-iapetus/hardware-configuration.nix diff --git a/hosts/laptop/home.nix b/hosts/laptop-iapetus/home.nix similarity index 100% rename from hosts/laptop/home.nix rename to hosts/laptop-iapetus/home.nix -- 2.48.1