From 8f34e848896b7e8ab5bfcb03009e7d21d06db50e Mon Sep 17 00:00:00 2001 From: Rutherther Date: Sat, 30 Sep 2023 22:27:12 +0200 Subject: [PATCH] feat: update laptop packages --- hosts/laptop/default.nix | 9 +++++++-- hosts/laptop/home.nix | 9 ++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 92af6ab..749b9cc 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -16,14 +16,19 @@ # └─ default.nix # -{ config, pkgs, user, ... }: +{ config, pkgs, lib, user, ... }: { imports = # For now, if applying to other system, swap files [(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix [(import ../../modules/desktop/dm/sddm.nix)] ++ # Desktop manager [(import ../../modules/desktop/qtile/default.nix)] ++ # Window Manager - (import ../../modules/hardware); # Hardware devices + (import ../../modules/hardware) ++ + (import ../../modules/desktop/virtualisation) ++ + [(import ../../modules/programs/fpga/vivado { + inherit pkgs lib config; + vivadoPath = "/data/fpga/xilinx/Vivado/2023.1/bin/vivado"; + })]; # Hardware devices networking.hostName = "nixos-laptop"; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 6bf95ea..ded7a9a 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -11,18 +11,21 @@ # └─ home.nix # -{ pkgs, ... }: +{ pkgs, lib, config, unstable, ... }: { imports = [ ../../modules/desktop/qtile/home.nix # Window Manager + (import ../../modules/programs/fpga/vivado/home.nix { + inherit pkgs lib config; + vivadoPath = "/data/fpga/xilinx/Vivado/2023.1/bin/vivado"; + }) ]; home = { # Specific packages for laptop packages = with pkgs; [ - # Applications - libreoffice # Office packages + unstable.distrobox # Display #light # xorg.xbacklight not supported. Other option is just use xrandr. -- 2.48.1