From ce4e5e3d50233c29d9fe4ae0c5f03bb7ee8c9d40 Mon Sep 17 00:00:00 2001 From: Sweetbread Date: Mon, 1 Dec 2025 22:22:18 +0300 Subject: [PATCH] ref: remove `host.laptop` from user modules --- host/Eclipse/configuration.nix | 5 +---- host/Impreza/configuration.nix | 7 ++----- host/Rias/configuration.nix | 5 +---- host/Senko/configuration.nix | 7 ++----- modules/user/packages/art.nix | 4 ++-- user/common.nix | 6 +----- 6 files changed, 9 insertions(+), 25 deletions(-) diff --git a/host/Eclipse/configuration.nix b/host/Eclipse/configuration.nix index 41a4654..75ca2b9 100644 --- a/host/Eclipse/configuration.nix +++ b/host/Eclipse/configuration.nix @@ -1,6 +1,4 @@ -{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let - laptop = false; -in { +{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: { imports = [ ./secrets/secrets.nix ./modules/aagl.nix @@ -21,7 +19,6 @@ in { inherit pkgs-fixed; inherit lib; inherit inputs; - inherit laptop; name = "chest"; }) ]; diff --git a/host/Impreza/configuration.nix b/host/Impreza/configuration.nix index ac3d4af..6a41404 100644 --- a/host/Impreza/configuration.nix +++ b/host/Impreza/configuration.nix @@ -1,6 +1,4 @@ -{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let - laptop = true; -in { +{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: { imports = [ ./secrets/secrets.nix ./modules/grub.nix @@ -19,7 +17,6 @@ in { inherit pkgs-fixed; inherit lib; inherit inputs; - inherit laptop; name = "chest"; }) ]; @@ -28,5 +25,5 @@ in { nixpkgs.config.allowBroken = true; programs.gamemode.enable = true; hardware.bluetooth.enable = true; - host.laptop = laptop; + host.laptop = true; } diff --git a/host/Rias/configuration.nix b/host/Rias/configuration.nix index b824341..abd2f58 100644 --- a/host/Rias/configuration.nix +++ b/host/Rias/configuration.nix @@ -1,6 +1,4 @@ -{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let - laptop = false; -in { +{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: { imports = [ ./secrets/secrets.nix ./modules/grub.nix @@ -21,7 +19,6 @@ in { inherit pkgs-fixed; inherit lib; inherit inputs; - inherit laptop; name = "sweetbread"; fullname = "Sweet Bread"; }) diff --git a/host/Senko/configuration.nix b/host/Senko/configuration.nix index 87245c3..e32c2a1 100644 --- a/host/Senko/configuration.nix +++ b/host/Senko/configuration.nix @@ -1,6 +1,4 @@ -{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: let - laptop = true; -in { +{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, ...}: { imports = [ ./secrets/secrets.nix ./modules/grub.nix @@ -19,14 +17,13 @@ in { inherit pkgs-fixed; inherit lib; inherit inputs; - inherit laptop; name = "sweetbread"; fullname = "Sweet Bread"; }) ]; hardware.bluetooth.enable = true; - host.laptop = laptop; + host.laptop = true; environment.systemPackages = [ pkgs.dbgate ]; } diff --git a/modules/user/packages/art.nix b/modules/user/packages/art.nix index 1fb9ff3..16c9e0a 100644 --- a/modules/user/packages/art.nix +++ b/modules/user/packages/art.nix @@ -1,6 +1,6 @@ -{ pkgs-fixed, lib, host, ... }: +{ pkgs-fixed, lib, osConfig, ... }: -lib.mkIf (!host.laptop) { +lib.mkIf (!osConfig.host.laptop) { home.packages = with pkgs-fixed; [ (blender.override { cudaSupport = true; }) aseprite diff --git a/user/common.nix b/user/common.nix index 0b5ed09..7f917c8 100644 --- a/user/common.nix +++ b/user/common.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, laptop, name, fullname ? name, ... }: { +{ config, pkgs, pkgs-unstable, pkgs-fixed, lib, inputs, name, fullname ? name, ... }: { imports = [ inputs.home-manager.nixosModules.home-manager { home-manager = { @@ -30,10 +30,6 @@ inherit inputs; pkgs-stable = pkgs; inherit pkgs-fixed; - host = { - laptop = laptop; - name = config.networking.hostName; - }; username = name; }; };