From 9da8cf8fcf35d3e0e0939b1e14d60f0c2f6b9d63 Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Mon, 15 Jun 2026 09:23:55 +0200 Subject: [PATCH] fix: small tweaks --- TODO.md | 2 +- config.py | 1 + main.py | 4 ++-- modules/core/system/base.py | 22 +++++++++++++++------- modules/core/utilities.py | 1 + 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/TODO.md b/TODO.md index ee2358d..4964e16 100644 --- a/TODO.md +++ b/TODO.md @@ -11,4 +11,4 @@ - [X] Kitty theming - [ ] Fish theming - [ ] Fastfetch theming -- [ ] DMS instead of Hyprlock for locker? +- [X] DMS instead of Hyprlock for locker? diff --git a/config.py b/config.py index 6a0a077..91b402f 100644 --- a/config.py +++ b/config.py @@ -6,4 +6,5 @@ grub_os_prober = {"desktop": True, "laptop": False} kernel_args_all = {"desktop": "", "laptop": ""} kernel_args_debug_only = {"desktop": "", "laptop": ""} kernel_args_normal_only = {"desktop": "", "laptop": ""} + user = "janis" diff --git a/main.py b/main.py index 1df8088..1dea5f0 100644 --- a/main.py +++ b/main.py @@ -9,10 +9,10 @@ if decman.aur: decman.aur.ignored_packages |= {"yay"} if decman.pacman: - decman.pacman.ignored_packages |= {"yay"} + decman.pacman.ignored_packages |= {"yay", "aylurs-gtk-shell"} decman.modules += [ - base.BasePackages(), + base.BasePackages("desktop"), pipewire.Pipewire(), dev_tools.DevTools(), games.Games(), diff --git a/modules/core/system/base.py b/modules/core/system/base.py index 6e31cb7..1989ef8 100644 --- a/modules/core/system/base.py +++ b/modules/core/system/base.py @@ -1,10 +1,13 @@ +from typing import Literal + import decman from decman.plugins import pacman, aur class BasePackages(decman.Module): - def __init__(self): + def __init__(self, platform: Literal["desktop", "laptop"]): """Base packages that should never be uninstalled""" + self._platform: Literal["desktop", "laptop"] = platform super().__init__("base") @pacman.packages @@ -54,12 +57,17 @@ class BasePackages(decman.Module): def files(self) -> dict[str, decman.File]: # TODO: File substitutions (for PC and laptop) - return { - "/etc/mkinitcpio.conf": decman.File(source_file="./system/mkinitcpio.conf"), - "/etc/pacman.conf": decman.File(source_file="./system/pacman.conf"), - "/etc/default/grub": decman.File(source_file="./system/grub"), - "/etc/environment": decman.File(source_file="./system/environment"), - } + if self._platform == "desktop": + return { + "/etc/mkinitcpio.conf": decman.File( + source_file="./system/mkinitcpio.conf" + ), + "/etc/pacman.conf": decman.File(source_file="./system/pacman.conf"), + "/etc/default/grub": decman.File(source_file="./system/grub"), + "/etc/environment": decman.File(source_file="./system/environment"), + } + else: + return {} def on_change(self, store): decman.prg(["mkinitcpio", "-P"]) diff --git a/modules/core/utilities.py b/modules/core/utilities.py index 8c405f2..a62f030 100644 --- a/modules/core/utilities.py +++ b/modules/core/utilities.py @@ -13,6 +13,7 @@ class UtilPackages(decman.Module): def pkgs(self) -> set[str]: return { "bashtop", + "brightnessctl", "bind", "bluez", "clamav",