diff options
| -rw-r--r-- | hosts/T495/configuration.nix | 47 | ||||
| -rw-r--r-- | hosts/T495/home.nix | 19 | ||||
| -rw-r--r-- | hosts/T495/resources/input-leap/input-leap.conf | 12 | ||||
| -rw-r--r-- | hosts/X230/configuration.nix | 29 | ||||
| -rw-r--r-- | hosts/X230/home.nix | 18 | ||||
| -rw-r--r-- | hosts/flex-wg-router/configuration.nix | 24 | ||||
| -rw-r--r-- | hosts/flex-wg-router/home.nix | 7 | ||||
| -rw-r--r-- | hosts/libreX60/configuration.nix | 26 | ||||
| -rw-r--r-- | hosts/libreX60/home.nix | 18 | ||||
| -rw-r--r-- | hosts/optiplex/configuration.nix | 6 | ||||
| -rw-r--r-- | hosts/optiplex/home.nix | 5 |
11 files changed, 96 insertions, 115 deletions
diff --git a/hosts/T495/configuration.nix b/hosts/T495/configuration.nix index 171f746..b636991 100644 --- a/hosts/T495/configuration.nix +++ b/hosts/T495/configuration.nix @@ -1,9 +1,5 @@ { config, lib, pkgs, ... }: { - imports = [ - ./hardware-configuration.nix - ./wg.nix - ../../nixos/archetypes/tjkeller - ]; + imports = [ ./wg.nix ]; # Setup bootloader boot._loader.enable = true; @@ -37,22 +33,22 @@ }; bluetooth.enable = true; }; - # Setup user - users.primary = { + }; + + # Enable user timmy + _users.timmy = { + enable = true; + autologin.enable = true; + nas = { enable = true; - autologin.enable = true; - }; - # Enable network drives - tjkeller = { - nas = { - enable = true; - office.enable = true; - }; + office.enable = true; }; }; # Install spotify - nixpkgs.config.allowUnfree = true; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "spotify" + ]; environment.systemPackages = with pkgs; [ spotify ]; @@ -60,5 +56,24 @@ # Use amdgpu driver for x11 services.xserver.videoDrivers = [ "amdgpu" ]; + # Configure home + home-manager.users.timmy = { + gtk._mintTheme = { + dark = true; + color = "Purple"; + icons.color = "Purple"; + }; + programs._st = { + enable = true; + font = { + name = "TamzenForPowerline"; + attrs = { + pixelsize = 20; + }; + }; + }; + programs._seasonalwallpaper.wallpapers.download = true; + }; + system.stateVersion = "24.05"; } diff --git a/hosts/T495/home.nix b/hosts/T495/home.nix deleted file mode 100644 index f233c08..0000000 --- a/hosts/T495/home.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ ... }: { - imports = [ ../../home ]; - - theme = { - mint.theme.color = "Dark-Purple"; - mint.icons.color = "Purple"; - st = { - enable = true; - font = "TamzenForPowerline:pixelsize=20"; - }; - }; - wallpapers.enable = true; - - home.file.input-leap-config = { - source = ./resources/input-leap; - recursive = true; - target = "./.config/input-leap"; - }; -} diff --git a/hosts/T495/resources/input-leap/input-leap.conf b/hosts/T495/resources/input-leap/input-leap.conf deleted file mode 100644 index c2d5176..0000000 --- a/hosts/T495/resources/input-leap/input-leap.conf +++ /dev/null @@ -1,12 +0,0 @@ -section: screens - T495: - optiplex: -end - -section: links - T495: - up = optiplex - - optiplex: - down = T495 -end diff --git a/hosts/X230/configuration.nix b/hosts/X230/configuration.nix index accbb1c..635d8b0 100644 --- a/hosts/X230/configuration.nix +++ b/hosts/X230/configuration.nix @@ -1,9 +1,4 @@ { config, lib, pkgs, ... }: { - imports = [ - ./hardware-configuration.nix - ../../nixos/archetypes/tjkeller - ]; - # Setup bootloader boot._loader.enable = true; @@ -26,5 +21,29 @@ }; }; + # Configure home + home-manager.users.timmy = { + gtk._mintTheme = { + dark = true; + color = "Teal"; + icons.color = "Teal"; + }; + fonts.fontconfig.defaultFonts.monospace = [ "TamzenForPowerline" ]; + gtk = { + font.name = "monospace"; + font.size = 8; + cursorTheme.size = 24; + }; + programs._st = { + enable = true; + font = { + name = "TamzenForPowerline"; + attrs = { + pixelsize = 14; + }; + }; + }; + }; + system.stateVersion = "24.05"; } diff --git a/hosts/X230/home.nix b/hosts/X230/home.nix deleted file mode 100644 index 03b559d..0000000 --- a/hosts/X230/home.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ ... }: { - imports = [ ../../home ]; - - theme = { - mint.theme.color = "Dark-Teal"; - mint.icons.color = "Teal"; - font = { - monospace = "TamzenForPowerline"; - gtk.name = "monospace"; - gtk.size = 8; - }; - cursor.size = 24; - st = { - enable = true; - font = "TamzenForPowerline:pixelsize=14"; - }; - }; -} diff --git a/hosts/flex-wg-router/configuration.nix b/hosts/flex-wg-router/configuration.nix index f21046d..b09c3f0 100644 --- a/hosts/flex-wg-router/configuration.nix +++ b/hosts/flex-wg-router/configuration.nix @@ -1,17 +1,17 @@ { config, lib, pkgs, ... }: { - imports = [ - ./hardware-configuration.nix - ../../archetypes/headless - ]; - bootloader.mode = "efi"; + # Setup bootloader + boot._loader.enable = true; - # Enable docker - software.development = { - docker.enable = true; - }; - - # Enable set root password - users.setPassword.enable = true; + _archetypes = { + # Use headless profile + profiles.headless.enable = true; + # Install software + collections = { + development = { + docker.enable = true; + }; + }; + } system.stateVersion = "25.05"; } diff --git a/hosts/flex-wg-router/home.nix b/hosts/flex-wg-router/home.nix deleted file mode 100644 index 21d548f..0000000 --- a/hosts/flex-wg-router/home.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: { - imports = [ ../../home ]; - - theme.enable = false; - programs.firefox.enable = false; - gtk.enable = false; -} diff --git a/hosts/libreX60/configuration.nix b/hosts/libreX60/configuration.nix index 9c83a42..4f20501 100644 --- a/hosts/libreX60/configuration.nix +++ b/hosts/libreX60/configuration.nix @@ -1,8 +1,6 @@ { config, lib, pkgs, ... }: { imports = [ - ./hardware-configuration.nix ./powertop-auto-tune.nix - ../../nixos/archetypes/tjkeller # Uncomment this module and reboot to enable bios flashing #./bios-flashing.nix ]; @@ -21,5 +19,29 @@ # i915 Gpu requires intel driver services.xserver.videoDrivers = [ "intel" ]; + # Configure home + home-manager.users.timmy = { + gtk._mintTheme = { + dark = true; + color = "Red"; + icons.color = "Red"; + }; + fonts.fontconfig.defaultFonts.monospace = [ "TamzenForPowerline" ]; + gtk = { + font.name = "monospace"; + font.size = 8; + cursorTheme.size = 24; + }; + programs._st = { + enable = true; + font = { + name = "TamzenForPowerline"; + attrs = { + pixelsize = 14; + }; + }; + }; + }; + system.stateVersion = "24.11"; } diff --git a/hosts/libreX60/home.nix b/hosts/libreX60/home.nix deleted file mode 100644 index f5957d6..0000000 --- a/hosts/libreX60/home.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ ... }: { - imports = [ ../../home ]; - - theme = { - mint.theme.color = "Dark-Red"; - mint.icons.color = "Red"; - font = { - monospace = "TamzenForPowerline"; - gtk.name = "monospace"; - gtk.size = 8; - }; - cursor.size = 24; - st = { - enable = true; - font = "TamzenForPowerline:pixelsize=14"; - }; - }; -} diff --git a/hosts/optiplex/configuration.nix b/hosts/optiplex/configuration.nix index b92b580..6f7d4d4 100644 --- a/hosts/optiplex/configuration.nix +++ b/hosts/optiplex/configuration.nix @@ -46,7 +46,11 @@ systemd._suspend.disable = true; # Allow unfree for nvidia + others - nixpkgs.config.allowUnfree = true; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "nvidia-x11" + "nvidia-settings" + "spotify" + ]; # Install more software environment.systemPackages = with pkgs; [ diff --git a/hosts/optiplex/home.nix b/hosts/optiplex/home.nix deleted file mode 100644 index 38646b1..0000000 --- a/hosts/optiplex/home.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - theme.mint.theme.color = "Dark-Green"; - theme.mint.icons.color = "Green"; - wallpapers.enable = true; -} |