From e0407a761b778c8f45c45576d18cd7f3497d3cd1 Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Sun, 22 Sep 2024 18:38:25 -0700 Subject: [PATCH] t480: init --- hosts/apps-desktop.nix | 2 +- hosts/default.nix | 24 ++++++++++++++++++++++++ hosts/thinkpads/default.nix | 11 ++++++----- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/hosts/apps-desktop.nix b/hosts/apps-desktop.nix index cde2fe7..e5e0672 100644 --- a/hosts/apps-desktop.nix +++ b/hosts/apps-desktop.nix @@ -32,7 +32,7 @@ inkscape obs-studio qbittorrent - pureref + #pureref libreoffice gnome.ghex evince diff --git a/hosts/default.nix b/hosts/default.nix index 77425f8..7e562ae 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -120,6 +120,30 @@ in ]; }; + t480 = lib.nixosSystem { + inherit system; + specialArgs = { inherit user; }; + modules = configImports ++ [ + ./thinkpads + ./desktop.nix + { + boot.loader.grub.gfxmodeEfi = "1920x1080"; + networking.hostName = "t480"; + } + home-manager.nixosModules.home-manager { + home-manager = { + useUserPackages = true; + extraSpecialArgs = hmArgs; + users.${user} = { + imports = desktopHmImports ++ [ + (import ./thinkpads/home.nix) + ]; + }; + }; + } + ]; + }; + virtualbox = lib.nixosSystem { inherit system; specialArgs = { inherit user; }; diff --git a/hosts/thinkpads/default.nix b/hosts/thinkpads/default.nix index f998798..9229ebd 100644 --- a/hosts/thinkpads/default.nix +++ b/hosts/thinkpads/default.nix @@ -11,6 +11,7 @@ grub = { efiSupport = true; device = "nodev"; + useOSProber = true; }; }; @@ -24,9 +25,9 @@ }; # audio controls and polybar module don't work on pipewire - hardware.pulseaudio = { - enable = true; - support32Bit = true; - }; - services.pipewire.enable = false; + # hardware.pulseaudio = { + # enable = true; + # support32Bit = true; + # }; + # services.pipewire.enable = false; }