From c1aa14f00d16c789b8acc6a5dc11d43fe7261128 Mon Sep 17 00:00:00 2001 From: Zonsopkomst Date: Fri, 29 Sep 2023 10:01:22 -0500 Subject: [PATCH] Changed user per request Username changed from `admin` which would have duplicated all items, however, it is likely the user would like to make additional program chages in the near future. Therefore, username changed to `coleman` per their request. --- flake.nix | 248 +++++++++++++++-------------- hosts/remote/tii/home.nix | 6 +- users/zonsopkomst/home-manager.nix | 1 - 3 files changed, 131 insertions(+), 124 deletions(-) diff --git a/flake.nix b/flake.nix index 35fa1fc..a07f239 100644 --- a/flake.nix +++ b/flake.nix @@ -8,72 +8,19 @@ hyprland.url = "github:hyprwm/Hyprland"; }; - outputs = inputs@{ + outputs = inputs@{ home-manager, hyprland, nixpkgs, ... }: { - nixosConfigurations = { - - sintanne = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - - # Common Resources - - # Desktop - ./desktop/gnome.nix - ./display/gdm.nix - #./desktop/kde.nix - #./display/sddm.nix - #./desktop/hyprland.nix - - # Kernels & RAM - #./common/kernel.zen.nix - #./commmon/swappiness - - # Common - #./common/amd.nix - #./common/bluetooth.nix - ./common/CUPS.nix - #./common/hyprland.nix - ./common/pipewire.nix - ./common/time.nix - #./common/docker.nix - ./common/flakeinit.nix - ./common/flatpak.nix - #./common/gaming.nix - ./common/insecure.nix - ./common/networking.nix - ./common/terminal.nix - ./common/unfree.nix - #./common/waydroid.nix - ./common/x11.nix - - # Host Specific - ./hosts/remote/sintanne/default.nix - ./hosts/remote/sintanne/hardware-configuration.nix - ./hosts/remote/sintanne/packages.nix - - # User Specific - ./users/annette/home-manager.nix - #./users/annette/hd.nix - #./users/annette/syncthing.nix - - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.annette = import ./hosts/remote/sintanne/home.nix; - } - - #hyprland.nixosModules.default - #{programs.hyprland.enable = true;} - ]; - }; + nixosConfigurations = { +########### +## LOCAL ## +########### + frija = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -181,6 +128,123 @@ ]; }; + weda = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + + # Common Resources + + # Desktop + ./desktop/gnome.nix + ./display/gdm.nix + #./desktop/kde.nix + #./display/sddm.nix + #./desktop/hyprland.nix + + # Kernels & RAM + #./common/kernel.zen.nix + #./commmon/swappiness + + # Common + ./common/amd.nix + ./common/bluetooth.nix + ./common/CUPS.nix + #./common/hyprland.nix + ./common/pipewire.nix + ./common/time.nix + ./common/docker.nix + ./common/flakeinit.nix + ./common/flatpak.nix + ./common/gaming.nix + ./common/insecure.nix + ./common/networking.nix + ./common/terminal.nix + ./common/unfree.nix + ./common/waydroid.nix + ./common/x11.nix + + # Host Specific + ./hosts/local/weda/default.nix + ./hosts/local/weda/hardware-configuration.nix + ./hosts/local/weda/packages.nix + + # User Specific + ./users/zonsopkomst/home-manager.nix + ./users/zonsopkomst/syncthing.nix + + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.zonsopkomst = import ./hosts/local/weda/home.nix; + } + + hyprland.nixosModules.default + {programs.hyprland.enable = true;} + ]; + }; + +############# +## REMOTE ## +############# + + sintanne = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + + # Common Resources + + # Desktop + ./desktop/gnome.nix + ./display/gdm.nix + #./desktop/kde.nix + #./display/sddm.nix + #./desktop/hyprland.nix + + # Kernels & RAM + #./common/kernel.zen.nix + #./commmon/swappiness + + # Common + #./common/amd.nix + #./common/bluetooth.nix + ./common/CUPS.nix + #./common/hyprland.nix + ./common/pipewire.nix + ./common/time.nix + #./common/docker.nix + ./common/flakeinit.nix + ./common/flatpak.nix + #./common/gaming.nix + ./common/insecure.nix + ./common/networking.nix + ./common/terminal.nix + ./common/unfree.nix + #./common/waydroid.nix + ./common/x11.nix + + # Host Specific + ./hosts/remote/sintanne/default.nix + ./hosts/remote/sintanne/hardware-configuration.nix + ./hosts/remote/sintanne/packages.nix + + # User Specific + ./users/annette/home-manager.nix + #./users/annette/hd.nix + #./users/annette/syncthing.nix + + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.annette = import ./hosts/remote/sintanne/home.nix; + } + + #hyprland.nixosModules.default + #{programs.hyprland.enable = true;} + ]; + }; + tii = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -222,15 +286,15 @@ ./hosts/remote/tii/packages.nix # User Specific - ./users/admin/home-manager.nix - #./users/admin/hd.nix - #./users/admin/syncthing.nix + ./users/coleman/home-manager.nix + #./users/coleman/hd.nix + ./users/coleman/syncthing.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.admin = import ./hosts/remote/tii/home.nix; + home-manager.users.coleman = import ./hosts/remote/tii/home.nix; } #hyprland.nixosModules.default @@ -294,63 +358,7 @@ #{programs.hyprland.enable = true;} ]; }; - - weda = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - - # Common Resources - - # Desktop - ./desktop/gnome.nix - ./display/gdm.nix - #./desktop/kde.nix - #./display/sddm.nix - #./desktop/hyprland.nix - - # Kernels & RAM - #./common/kernel.zen.nix - #./commmon/swappiness - - # Common - ./common/amd.nix - ./common/bluetooth.nix - ./common/CUPS.nix - #./common/hyprland.nix - ./common/pipewire.nix - ./common/time.nix - ./common/docker.nix - ./common/flakeinit.nix - ./common/flatpak.nix - ./common/gaming.nix - ./common/insecure.nix - ./common/networking.nix - ./common/terminal.nix - ./common/unfree.nix - ./common/waydroid.nix - ./common/x11.nix - - # Host Specific - ./hosts/local/weda/default.nix - ./hosts/local/weda/hardware-configuration.nix - ./hosts/local/weda/packages.nix - - # User Specific - ./users/zonsopkomst/home-manager.nix - ./users/zonsopkomst/syncthing.nix - - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.zonsopkomst = import ./hosts/local/weda/home.nix; - } - - hyprland.nixosModules.default - {programs.hyprland.enable = true;} - ]; - }; - + }; }; } diff --git a/hosts/remote/tii/home.nix b/hosts/remote/tii/home.nix index 19ad12e..ae15311 100644 --- a/hosts/remote/tii/home.nix +++ b/hosts/remote/tii/home.nix @@ -3,8 +3,8 @@ { # Home Manager needs a bit of information about you and the # paths it should manage. - home.username = "admin"; - home.homeDirectory = "/home/admin"; + home.username = "coleman"; + home.homeDirectory = "/home/coleman"; # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage @@ -14,7 +14,7 @@ # 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 = "22.11"; + home.stateVersion = "23.05"; # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/users/zonsopkomst/home-manager.nix b/users/zonsopkomst/home-manager.nix index 828ddcb..fbcf891 100644 --- a/users/zonsopkomst/home-manager.nix +++ b/users/zonsopkomst/home-manager.nix @@ -18,7 +18,6 @@ gpodder # Podcast Manager gretl # Econometric Analysis gzdoom # Doom Clone based on ZDoom - hollywood # Hollywood Melodrama Technobabble josm # Extensible editor for OpenStreetMap kitty # Terminal Emulator kitty-themes # Kitty Themes