diff options
| author | lassulus <lassulus@lassul.us> | 2021-03-17 15:42:13 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2021-03-17 15:42:13 +0100 |
| commit | 3d1472a7cac3ab2c5f9efd06a501368308681999 (patch) | |
| tree | 950fbe49dfd060923756dd517c41f27f646857de /makefu/1systems/tsp | |
| parent | f659c1879f6e0a0e9228205edd794aaab467aa0b (diff) | |
| parent | 2044ad632b68ce173463287a9f437aae699bda83 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/tsp')
| -rw-r--r-- | makefu/1systems/tsp/config.nix | 11 | ||||
| -rw-r--r-- | makefu/1systems/tsp/hardware.nix | 9 |
2 files changed, 17 insertions, 3 deletions
diff --git a/makefu/1systems/tsp/config.nix b/makefu/1systems/tsp/config.nix index 7c65737f7..9586578d3 100644 --- a/makefu/1systems/tsp/config.nix +++ b/makefu/1systems/tsp/config.nix @@ -6,21 +6,26 @@ { imports = [ # Include the results of the hardware scan. + ./hardware.nix <stockholm/makefu> + <stockholm/makefu/2configs/nur.nix> <stockholm/makefu/2configs/home-manager> <stockholm/makefu/2configs/main-laptop.nix> + <stockholm/makefu/2configs/editor/neovim> + <stockholm/makefu/2configs/tools/core.nix> # <stockholm/makefu/2configs/tools/all.nix> <stockholm/makefu/2configs/fs/single-partition-ext4.nix> # hardware specifics are in here - # imports tp-x2x0.nix - <stockholm/makefu/2configs/hw/tp-x230.nix> <stockholm/makefu/2configs/hw/bluetooth.nix> <stockholm/makefu/2configs/hw/network-manager.nix> + # <stockholm/makefu/2configs/rad1o.nix> <stockholm/makefu/2configs/zsh-user.nix> - <stockholm/makefu/2configs/exim-retiolum.nix> + <stockholm/makefu/2configs/home-manager> + <stockholm/makefu/2configs/home-manager/desktop.nix> + <stockholm/makefu/2configs/home-manager/cli.nix> <stockholm/makefu/2configs/tinc/retiolum.nix> <stockholm/makefu/2configs/sshd-totp.nix> diff --git a/makefu/1systems/tsp/hardware.nix b/makefu/1systems/tsp/hardware.nix new file mode 100644 index 000000000..2788eae04 --- /dev/null +++ b/makefu/1systems/tsp/hardware.nix @@ -0,0 +1,9 @@ +{ lib, ... }: +{ + imports = [ + # laptop is an acer aspire, but close enough i'd say + <stockholm/makefu/2configs/hw/tp-x2x0.nix> + ]; + # the laptop only has the touchpad + services.xserver.synaptics.additionalOptions = lib.mkForce ''Option "TouchpadOff" "0"''; +} |