diff --git a/flake.nix b/flake.nix index d4c415c..8ab373f 100644 --- a/flake.nix +++ b/flake.nix @@ -93,7 +93,7 @@ "yanlin@thinkpad" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.x86_64-linux; modules = [ ./hosts/nixos/thinkpad/home.nix ]; - extraSpecialArgs = { inherit claude-code nixvim firefox-addons plasma-manager; }; + extraSpecialArgs = { inherit claude-code nixvim; }; }; }; }; diff --git a/hosts/nixos/thinkpad/home.nix b/hosts/nixos/thinkpad/home.nix index 8195907..f7ebc86 100644 --- a/hosts/nixos/thinkpad/home.nix +++ b/hosts/nixos/thinkpad/home.nix @@ -1,25 +1,16 @@ -{ config, pkgs, firefox-addons, plasma-manager, ... }: +{ config, pkgs, ... }: { # Allow unfree packages in home-manager nixpkgs.config.allowUnfree = true; - + # Import the common NixOS home configuration imports = [ ../home-default.nix - ../../../modules/firefox.nix - ../../../modules/plasma.nix ../../../modules/syncthing.nix ../../../modules/ghostty.nix ../../../modules/tex.nix - plasma-manager.homeModules.plasma-manager ]; - - # Enable Firefox with NixOS-specific package - programs.firefox-custom = { - enable = true; - package = pkgs.firefox; - }; # Enable Ghostty terminal with NixOS package programs.ghostty-custom = { @@ -31,9 +22,4 @@ # Any ThinkPad-specific home configurations can be added here # For example, laptop-specific aliases or scripts - - home.packages = with pkgs; [ - keepassxc - obsidian - ]; } diff --git a/hosts/nixos/thinkpad/system.nix b/hosts/nixos/thinkpad/system.nix index f3cd0a5..8fafe93 100644 --- a/hosts/nixos/thinkpad/system.nix +++ b/hosts/nixos/thinkpad/system.nix @@ -115,35 +115,6 @@ jack.enable = true; }; - # KDE Plasma Desktop Environment - services.xserver = { - enable = true; - - # Video drivers - videoDrivers = [ "modesetting" "nvidia" ]; - - # Keyboard layout - xkb = { - layout = "us"; - variant = ""; - }; - }; - - # Display manager - services.displayManager.sddm = { - enable = true; - wayland.enable = true; - }; - - # Auto-login - services.displayManager.autoLogin = { - enable = true; - user = "yanlin"; - }; - - # Desktop environment - services.desktopManager.plasma6.enable = true; - # Touchpad configuration services.libinput = { enable = true; @@ -197,7 +168,7 @@ services.logind.settings = { Login = { HandleLidSwitch = "ignore"; # Ignore lid close - HandleLidSwitchDocked = "ignore"; + HandleLidSwitchDocked = "ignore"; HandleLidSwitchExternalPower = "ignore"; HandleSuspendKey = "ignore"; HandleHibernateKey = "ignore"; @@ -206,13 +177,6 @@ }; }; - # Disable screen blanking and DPMS - services.xserver.displayManager.sessionCommands = '' - xset s off # Disable screen saver - xset -dpms # Disable DPMS (Display Power Management Signaling) - xset s noblank # Disable screen blanking - ''; - # Thermal management services.thermald.enable = true; @@ -250,24 +214,13 @@ ]; }; - - # Enable KDE Wallet auto-unlock via PAM - security.pam.services.sddm.enableKwallet = true; - # Host-specific packages environment.systemPackages = with pkgs; [ # Additional system monitoring btop neofetch unzip - - # KDE/Plasma utilities - kdePackages.kate - kdePackages.konsole - kdePackages.spectacle - kdePackages.filelight - kdePackages.ark - + # System utilities pciutils usbutils