From 500c18b76a64d6476e7970fe7768d34c5533503d Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Thu, 27 Mar 2025 20:28:36 +0100 Subject: [PATCH] move desktop shit again --- modules/de/default.nix | 15 ---- modules/default.nix | 2 +- modules/desktop-legacy/default.nix | 57 ++++++++++++++++ .../{desktop => desktop-legacy}/gaming.nix | 0 .../kdeconnect.nix | 0 .../{desktop => desktop-legacy}/social.nix | 0 .../{desktop => desktop-legacy}/syncthing.nix | 0 modules/{de => desktop}/audio.nix | 0 modules/desktop/default.nix | 64 +++--------------- modules/{de => desktop}/dm.nix | 0 modules/{de => desktop}/home/browser.nix | 0 modules/{de => desktop}/home/default.nix | 0 .../eww/configDir/bottomBar/bottomBar.yuck | 0 .../eww/configDir/bottomBar/traveldings.yuck | 0 .../eww/configDir/bottomBar/workspaces.yuck | 0 .../home/eww/configDir/eww.css | 0 .../home/eww/configDir/eww.yuck | 0 .../home/eww/configDir/scripts/bat.nu | 0 .../home/eww/configDir/scripts/iceTacho.nu | 0 .../home/eww/configDir/topBar/sysinfo.yuck | 0 .../home/eww/configDir/topBar/time.yuck | 0 .../home/eww/configDir/topBar/topBar.yuck | 0 .../home/eww/configDir/util.yuck | 0 modules/{de => desktop}/home/eww/default.nix | 0 modules/{de => desktop}/home/layaway.nix | 0 modules/{de => desktop}/home/niri/binds.nix | 0 modules/{de => desktop}/home/niri/default.nix | 0 modules/{de => desktop}/home/niri/input.nix | 0 modules/{de => desktop}/home/niri/privacy.nix | 0 modules/{de => desktop}/home/niri/quirks.nix | 0 .../{de => desktop}/home/niri/screenshot.nix | 0 modules/{de => desktop}/home/niri/style.nix | 0 .../{de => desktop}/home/niri/wallpaper.jpg | Bin .../home/niri/xwayland-sat.nix | 0 .../{de => desktop}/home/notifications.nix | 0 modules/{de => desktop}/home/swayidle.nix | 0 modules/{de => desktop}/home/terminal.nix | 0 modules/{de => desktop}/locale.nix | 0 modules/{de => desktop}/printing.nix | 0 modules/{de => desktop}/themeing.nix | 0 modules/{de => desktop}/tlp.nix | 0 41 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 modules/de/default.nix create mode 100644 modules/desktop-legacy/default.nix rename modules/{desktop => desktop-legacy}/gaming.nix (100%) rename modules/{desktop => desktop-legacy}/kdeconnect.nix (100%) rename modules/{desktop => desktop-legacy}/social.nix (100%) rename modules/{desktop => desktop-legacy}/syncthing.nix (100%) rename modules/{de => desktop}/audio.nix (100%) rename modules/{de => desktop}/dm.nix (100%) rename modules/{de => desktop}/home/browser.nix (100%) rename modules/{de => desktop}/home/default.nix (100%) rename modules/{de => desktop}/home/eww/configDir/bottomBar/bottomBar.yuck (100%) rename modules/{de => desktop}/home/eww/configDir/bottomBar/traveldings.yuck (100%) rename modules/{de => desktop}/home/eww/configDir/bottomBar/workspaces.yuck (100%) rename modules/{de => desktop}/home/eww/configDir/eww.css (100%) rename modules/{de => desktop}/home/eww/configDir/eww.yuck (100%) rename modules/{de => desktop}/home/eww/configDir/scripts/bat.nu (100%) rename modules/{de => desktop}/home/eww/configDir/scripts/iceTacho.nu (100%) rename modules/{de => desktop}/home/eww/configDir/topBar/sysinfo.yuck (100%) rename modules/{de => desktop}/home/eww/configDir/topBar/time.yuck (100%) rename modules/{de => desktop}/home/eww/configDir/topBar/topBar.yuck (100%) rename modules/{de => desktop}/home/eww/configDir/util.yuck (100%) rename modules/{de => desktop}/home/eww/default.nix (100%) rename modules/{de => desktop}/home/layaway.nix (100%) rename modules/{de => desktop}/home/niri/binds.nix (100%) rename modules/{de => desktop}/home/niri/default.nix (100%) rename modules/{de => desktop}/home/niri/input.nix (100%) rename modules/{de => desktop}/home/niri/privacy.nix (100%) rename modules/{de => desktop}/home/niri/quirks.nix (100%) rename modules/{de => desktop}/home/niri/screenshot.nix (100%) rename modules/{de => desktop}/home/niri/style.nix (100%) rename modules/{de => desktop}/home/niri/wallpaper.jpg (100%) rename modules/{de => desktop}/home/niri/xwayland-sat.nix (100%) rename modules/{de => desktop}/home/notifications.nix (100%) rename modules/{de => desktop}/home/swayidle.nix (100%) rename modules/{de => desktop}/home/terminal.nix (100%) rename modules/{de => desktop}/locale.nix (100%) rename modules/{de => desktop}/printing.nix (100%) rename modules/{de => desktop}/themeing.nix (100%) rename modules/{de => desktop}/tlp.nix (100%) diff --git a/modules/de/default.nix b/modules/de/default.nix deleted file mode 100644 index ba82753..0000000 --- a/modules/de/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{...}: { - imports = [ - ./audio.nix - ./home - ./dm.nix - ./tlp.nix - ./locale.nix - ./printing.nix - ./themeing.nix - ]; - services.flatpak.enable = true; - security.polkit.enable = true; - services.illum.enable = true; - services.upower.enable = true; -} diff --git a/modules/default.nix b/modules/default.nix index 44c9a43..2f6e4d9 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,8 +2,8 @@ imports = [ ./shell ./desktop + ./desktop-legacy ./hardware - ./de ./net ./input ./media diff --git a/modules/desktop-legacy/default.nix b/modules/desktop-legacy/default.nix new file mode 100644 index 0000000..ad4114d --- /dev/null +++ b/modules/desktop-legacy/default.nix @@ -0,0 +1,57 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; { + imports = [ + ./gaming.nix + ./syncthing.nix + ./kdeconnect.nix + ./social.nix + ]; + + programs.seahorse.enable = true; + security.pam.services.jade.enableGnomeKeyring = true; + + virtualisation.libvirtd.enable = true; + + programs.xss-lock = { + enable = true; + lockerCommand = "${pkgs.i3lock}/bin/i3lock -c 1d2021"; + }; + + services.illum.enable = true; + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; + services.smartd = { + enable = true; + notifications.test = true; + }; + + home-manager.users.jade = {pkgs, ...}: { + programs.ssh = { + controlMaster = "yes"; + }; + home.packages = with pkgs; [ + just + bacon + + magic-wormhole-rs + + # filemanager + xfce.thunar + xfce.tumbler + xfce.thunar-archive-plugin + file-roller + + # from environment.systemPackages cleanup + virt-manager + ddccontrol-db + ]; + }; +} diff --git a/modules/desktop/gaming.nix b/modules/desktop-legacy/gaming.nix similarity index 100% rename from modules/desktop/gaming.nix rename to modules/desktop-legacy/gaming.nix diff --git a/modules/desktop/kdeconnect.nix b/modules/desktop-legacy/kdeconnect.nix similarity index 100% rename from modules/desktop/kdeconnect.nix rename to modules/desktop-legacy/kdeconnect.nix diff --git a/modules/desktop/social.nix b/modules/desktop-legacy/social.nix similarity index 100% rename from modules/desktop/social.nix rename to modules/desktop-legacy/social.nix diff --git a/modules/desktop/syncthing.nix b/modules/desktop-legacy/syncthing.nix similarity index 100% rename from modules/desktop/syncthing.nix rename to modules/desktop-legacy/syncthing.nix diff --git a/modules/de/audio.nix b/modules/desktop/audio.nix similarity index 100% rename from modules/de/audio.nix rename to modules/desktop/audio.nix diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index ad4114d..ba82753 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -1,57 +1,15 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; { +{...}: { imports = [ - ./gaming.nix - ./syncthing.nix - ./kdeconnect.nix - ./social.nix + ./audio.nix + ./home + ./dm.nix + ./tlp.nix + ./locale.nix + ./printing.nix + ./themeing.nix ]; - - programs.seahorse.enable = true; - security.pam.services.jade.enableGnomeKeyring = true; - - virtualisation.libvirtd.enable = true; - - programs.xss-lock = { - enable = true; - lockerCommand = "${pkgs.i3lock}/bin/i3lock -c 1d2021"; - }; - + services.flatpak.enable = true; + security.polkit.enable = true; services.illum.enable = true; - services.avahi = { - enable = true; - nssmdns4 = true; - openFirewall = true; - }; - services.smartd = { - enable = true; - notifications.test = true; - }; - - home-manager.users.jade = {pkgs, ...}: { - programs.ssh = { - controlMaster = "yes"; - }; - home.packages = with pkgs; [ - just - bacon - - magic-wormhole-rs - - # filemanager - xfce.thunar - xfce.tumbler - xfce.thunar-archive-plugin - file-roller - - # from environment.systemPackages cleanup - virt-manager - ddccontrol-db - ]; - }; + services.upower.enable = true; } diff --git a/modules/de/dm.nix b/modules/desktop/dm.nix similarity index 100% rename from modules/de/dm.nix rename to modules/desktop/dm.nix diff --git a/modules/de/home/browser.nix b/modules/desktop/home/browser.nix similarity index 100% rename from modules/de/home/browser.nix rename to modules/desktop/home/browser.nix diff --git a/modules/de/home/default.nix b/modules/desktop/home/default.nix similarity index 100% rename from modules/de/home/default.nix rename to modules/desktop/home/default.nix diff --git a/modules/de/home/eww/configDir/bottomBar/bottomBar.yuck b/modules/desktop/home/eww/configDir/bottomBar/bottomBar.yuck similarity index 100% rename from modules/de/home/eww/configDir/bottomBar/bottomBar.yuck rename to modules/desktop/home/eww/configDir/bottomBar/bottomBar.yuck diff --git a/modules/de/home/eww/configDir/bottomBar/traveldings.yuck b/modules/desktop/home/eww/configDir/bottomBar/traveldings.yuck similarity index 100% rename from modules/de/home/eww/configDir/bottomBar/traveldings.yuck rename to modules/desktop/home/eww/configDir/bottomBar/traveldings.yuck diff --git a/modules/de/home/eww/configDir/bottomBar/workspaces.yuck b/modules/desktop/home/eww/configDir/bottomBar/workspaces.yuck similarity index 100% rename from modules/de/home/eww/configDir/bottomBar/workspaces.yuck rename to modules/desktop/home/eww/configDir/bottomBar/workspaces.yuck diff --git a/modules/de/home/eww/configDir/eww.css b/modules/desktop/home/eww/configDir/eww.css similarity index 100% rename from modules/de/home/eww/configDir/eww.css rename to modules/desktop/home/eww/configDir/eww.css diff --git a/modules/de/home/eww/configDir/eww.yuck b/modules/desktop/home/eww/configDir/eww.yuck similarity index 100% rename from modules/de/home/eww/configDir/eww.yuck rename to modules/desktop/home/eww/configDir/eww.yuck diff --git a/modules/de/home/eww/configDir/scripts/bat.nu b/modules/desktop/home/eww/configDir/scripts/bat.nu similarity index 100% rename from modules/de/home/eww/configDir/scripts/bat.nu rename to modules/desktop/home/eww/configDir/scripts/bat.nu diff --git a/modules/de/home/eww/configDir/scripts/iceTacho.nu b/modules/desktop/home/eww/configDir/scripts/iceTacho.nu similarity index 100% rename from modules/de/home/eww/configDir/scripts/iceTacho.nu rename to modules/desktop/home/eww/configDir/scripts/iceTacho.nu diff --git a/modules/de/home/eww/configDir/topBar/sysinfo.yuck b/modules/desktop/home/eww/configDir/topBar/sysinfo.yuck similarity index 100% rename from modules/de/home/eww/configDir/topBar/sysinfo.yuck rename to modules/desktop/home/eww/configDir/topBar/sysinfo.yuck diff --git a/modules/de/home/eww/configDir/topBar/time.yuck b/modules/desktop/home/eww/configDir/topBar/time.yuck similarity index 100% rename from modules/de/home/eww/configDir/topBar/time.yuck rename to modules/desktop/home/eww/configDir/topBar/time.yuck diff --git a/modules/de/home/eww/configDir/topBar/topBar.yuck b/modules/desktop/home/eww/configDir/topBar/topBar.yuck similarity index 100% rename from modules/de/home/eww/configDir/topBar/topBar.yuck rename to modules/desktop/home/eww/configDir/topBar/topBar.yuck diff --git a/modules/de/home/eww/configDir/util.yuck b/modules/desktop/home/eww/configDir/util.yuck similarity index 100% rename from modules/de/home/eww/configDir/util.yuck rename to modules/desktop/home/eww/configDir/util.yuck diff --git a/modules/de/home/eww/default.nix b/modules/desktop/home/eww/default.nix similarity index 100% rename from modules/de/home/eww/default.nix rename to modules/desktop/home/eww/default.nix diff --git a/modules/de/home/layaway.nix b/modules/desktop/home/layaway.nix similarity index 100% rename from modules/de/home/layaway.nix rename to modules/desktop/home/layaway.nix diff --git a/modules/de/home/niri/binds.nix b/modules/desktop/home/niri/binds.nix similarity index 100% rename from modules/de/home/niri/binds.nix rename to modules/desktop/home/niri/binds.nix diff --git a/modules/de/home/niri/default.nix b/modules/desktop/home/niri/default.nix similarity index 100% rename from modules/de/home/niri/default.nix rename to modules/desktop/home/niri/default.nix diff --git a/modules/de/home/niri/input.nix b/modules/desktop/home/niri/input.nix similarity index 100% rename from modules/de/home/niri/input.nix rename to modules/desktop/home/niri/input.nix diff --git a/modules/de/home/niri/privacy.nix b/modules/desktop/home/niri/privacy.nix similarity index 100% rename from modules/de/home/niri/privacy.nix rename to modules/desktop/home/niri/privacy.nix diff --git a/modules/de/home/niri/quirks.nix b/modules/desktop/home/niri/quirks.nix similarity index 100% rename from modules/de/home/niri/quirks.nix rename to modules/desktop/home/niri/quirks.nix diff --git a/modules/de/home/niri/screenshot.nix b/modules/desktop/home/niri/screenshot.nix similarity index 100% rename from modules/de/home/niri/screenshot.nix rename to modules/desktop/home/niri/screenshot.nix diff --git a/modules/de/home/niri/style.nix b/modules/desktop/home/niri/style.nix similarity index 100% rename from modules/de/home/niri/style.nix rename to modules/desktop/home/niri/style.nix diff --git a/modules/de/home/niri/wallpaper.jpg b/modules/desktop/home/niri/wallpaper.jpg similarity index 100% rename from modules/de/home/niri/wallpaper.jpg rename to modules/desktop/home/niri/wallpaper.jpg diff --git a/modules/de/home/niri/xwayland-sat.nix b/modules/desktop/home/niri/xwayland-sat.nix similarity index 100% rename from modules/de/home/niri/xwayland-sat.nix rename to modules/desktop/home/niri/xwayland-sat.nix diff --git a/modules/de/home/notifications.nix b/modules/desktop/home/notifications.nix similarity index 100% rename from modules/de/home/notifications.nix rename to modules/desktop/home/notifications.nix diff --git a/modules/de/home/swayidle.nix b/modules/desktop/home/swayidle.nix similarity index 100% rename from modules/de/home/swayidle.nix rename to modules/desktop/home/swayidle.nix diff --git a/modules/de/home/terminal.nix b/modules/desktop/home/terminal.nix similarity index 100% rename from modules/de/home/terminal.nix rename to modules/desktop/home/terminal.nix diff --git a/modules/de/locale.nix b/modules/desktop/locale.nix similarity index 100% rename from modules/de/locale.nix rename to modules/desktop/locale.nix diff --git a/modules/de/printing.nix b/modules/desktop/printing.nix similarity index 100% rename from modules/de/printing.nix rename to modules/desktop/printing.nix diff --git a/modules/de/themeing.nix b/modules/desktop/themeing.nix similarity index 100% rename from modules/de/themeing.nix rename to modules/desktop/themeing.nix diff --git a/modules/de/tlp.nix b/modules/desktop/tlp.nix similarity index 100% rename from modules/de/tlp.nix rename to modules/desktop/tlp.nix