makefu/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

tsp.r: rebuild with flakes

Browse source
This commit is contained in:
makefu 2023-06-13 00:30:42 +02:00
parent 20a3384db6
commit db6423f146
2 changed files with 23 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
1systems/tsp/config.nix
View file

@ -1,45 +1,35 @@
# { config, pkgs, lib, self, ... }:
#
#
{ config, pkgs, lib, ... }:
{ {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware.nix ./hardware.nix
<stockholm/makefu> ../../2configs/default.nix
<stockholm/makefu/2configs/nur.nix> # (self + "/2configs/nur.nix")
<stockholm/makefu/2configs/home-manager>
<stockholm/makefu/2configs/main-laptop.nix> # (self + "/2configs/nur.nix")
<stockholm/makefu/2configs/editor/neovim> (self + "/2configs/home-manager")
<stockholm/makefu/2configs/tools/core.nix> (self + "/2configs/main-laptop.nix")
# <stockholm/makefu/2configs/tools/all.nix> (self + "/2configs/editor/neovim")
<stockholm/makefu/2configs/fs/single-partition-ext4.nix> (self + "/2configs/tools/core.nix")
# (self + "/2configs/tools/all.nix")
(self + "/2configs/fs/disko/single-disk-bcachefs.nix")
# hardware specifics are in here # hardware specifics are in here
<stockholm/makefu/2configs/hw/bluetooth.nix> (self + "/2configs/hw/bluetooth.nix")
<stockholm/makefu/2configs/hw/network-manager.nix> (self + "/2configs/hw/network-manager.nix")
# <stockholm/makefu/2configs/rad1o.nix> # (self + "/2configs/rad1o.nix")
<stockholm/makefu/2configs/zsh-user.nix> (self + "/2configs/zsh-user.nix")
<stockholm/makefu/2configs/home-manager> (self + "/2configs/home-manager")
<stockholm/makefu/2configs/home-manager/desktop.nix> (self + "/2configs/home-manager/desktop.nix")
<stockholm/makefu/2configs/home-manager/cli.nix> (self + "/2configs/home-manager/cli.nix")
<stockholm/makefu/2configs/tinc/retiolum.nix>
<stockholm/makefu/2configs/sshd-totp.nix> # still broken
{ #(self + "/2configs/tinc/retiolum.nix")
programs.adb.enable = true; # (self + "/2configs/sshd-totp.nix")
}
];
krebs.build.host = config.krebs.hosts.tsp;
boot.loader.grub.device = "/dev/sda";
networking.firewall.allowedTCPPorts = [
25
]; ];
hardware.enableRedistributableFirmware = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
} }

3
1systems/tsp/hardware.nix
View file

@ -2,8 +2,9 @@
{ {
imports = [ imports = [
# laptop is an acer aspire, but close enough i'd say # laptop is an acer aspire, but close enough i'd say
<stockholm/makefu/2configs/hw/tp-x2x0.nix> ../../2configs/hw/tp-x2x0.nix
]; ];
# the laptop only has the touchpad # the laptop only has the touchpad
services.xserver.synaptics.additionalOptions = lib.mkForce ''Option "TouchpadOff" "0"''; services.xserver.synaptics.additionalOptions = lib.mkForce ''Option "TouchpadOff" "0"'';
hardware.enableRedistributableFirmware = true;
} }