diff --git a/.config/linux/system/flake.nix b/.config/linux/system/flake.nix index a215a28..b189720 100644 --- a/.config/linux/system/flake.nix +++ b/.config/linux/system/flake.nix @@ -54,7 +54,7 @@ system = "x86_64-linux"; modules = [ ./module/AmdGpu.nix - ./module/Flatpak.nix + ./module/Desktop.nix ./module/Gnome.nix ./module/IntelCpu.nix ./module/PowersaveIntel.nix @@ -70,7 +70,6 @@ ./module/AmdGpu.nix ./module/AmdCpu.nix ./module/Desktop.nix - # ./module/Flatpak.nix ./module/Gnome.nix ./module/PowersaveAmd.nix ./module/Print.nix @@ -105,9 +104,9 @@ hostname = "laptop"; system = "x86_64-linux"; modules = [ - ./module/AmdGpu.nix ./module/AmdCpu.nix - ./module/Flatpak.nix + ./module/AmdGpu.nix + ./module/Desktop.nix ./module/Gnome.nix ./module/PowersaveAmd.nix ./module/Print.nix @@ -133,7 +132,6 @@ system = "x86_64-linux"; modules = [ ./module/Desktop.nix - # ./module/Flatpak.nix ./module/Gnome.nix ./module/IntelCpu.nix ./module/Powerlimit.nix diff --git a/.config/linux/system/host/dasha/Tablet.nix b/.config/linux/system/host/dasha/Tablet.nix index a5e98be..96fad38 100644 --- a/.config/linux/system/host/dasha/Tablet.nix +++ b/.config/linux/system/host/dasha/Tablet.nix @@ -1,3 +1,6 @@ -{ ... }: { +{ pkgs, ... }: { hardware.opentabletdriver.enable = true; + environment.systemPackages = with pkgs; [ + krita + ]; } diff --git a/.config/linux/system/module/Flatpak.nix b/.config/linux/system/module/Flatpak.nix index 8088a87..2960d70 100644 --- a/.config/linux/system/module/Flatpak.nix +++ b/.config/linux/system/module/Flatpak.nix @@ -13,7 +13,7 @@ in { serviceConfig.Type = "oneshot"; script = '' ${pkgs.flatpak}/bin/flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo - cat ${list} | cut -f2 | ${pkgs.parallel}/bin/parallel -j1 -- ${pkgs.flatpak}/bin/flatpak install -y --system {} + [[ -f ${list}]] && cat ${list} | cut -f2 | ${pkgs.parallel}/bin/parallel -j1 -- ${pkgs.flatpak}/bin/flatpak install -y --system {} ''; }; }