From 9714835abcf22129c20979e48c3abe3445e03677 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 15 Oct 2026 11:29:56 +0200 Subject: [PATCH] move maid modules to own dir --- flake.nix | 13 ++++++++++-- maid.nix | 36 ---------------------------------- modules/programs/#ghostty.nix# | 3 +++ modules/programs/ghostty.nix | 6 ------ theme.nix | 1 - 5 files changed, 14 insertions(+), 45 deletions(-) delete mode 100755 maid.nix create mode 100644 modules/programs/#ghostty.nix# delete mode 100644 modules/programs/ghostty.nix delete mode 100644 theme.nix diff --git a/flake.nix b/flake.nix index f3afe98..e442e86 100755 --- a/flake.nix +++ b/flake.nix @@ -41,17 +41,26 @@ tt-discord, }@inputs: let + scheme = "gruvbox-dark"; + schemePath = inputs.nixpkgs.lib.strings.concatStrings [ + "${inputs.tt-schemes}/base16/" + "${scheme}" + ".yaml" + ]; mods = [ nix-maid.nixosModules.default nixcord.nixosModules.nixcord agenix.nixosModules.default nix-easyroam.nixosModules.nix-easyroam base16.nixosModule + { + scheme = "${schemePath}"; + + } ./configuration.nix - ./maid.nix + ./modules/maid ./modules/default.nix ./secrets/age.nix - ./theme.nix ]; in { diff --git a/maid.nix b/maid.nix deleted file mode 100755 index 49575bd..0000000 --- a/maid.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - pkgs, - config, - lib, - inputs, - ... -}: -{ - users.users.lucy.maid = { config, ... }: { - gsettings.settings = { - org.gnome.desktop.interface = { - color-scheme = "prefer-dark"; - gtk-theme = "adw-gtk3"; - cursor-theme = "macOS"; - icon-theme = "Papirus"; - cursor-size = 24; - }; - }; - systemd.services."app-com.mitchellh.ghostty" = { - description = "Ghostty"; - enableDefaultPath = false; - after = [ - "graphical-session.target" - "dbus.socket" - ]; - requires = [ "dbus.socket" ]; - wantedBy = [ config.maid.systemdGraphicalTarget ]; - serviceConfig = { - Type = "notify"; # reload waits for ghostty to sd_notify READY=1 - ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID"; - BusName = "com.mitchellh.ghostty"; - ExecStart = "${pkgs.ghostty}/bin/ghostty --gtk-single-instance=true --initial-window=false"; - }; - }; - }; -} diff --git a/modules/programs/#ghostty.nix# b/modules/programs/#ghostty.nix# new file mode 100644 index 0000000..1797133 --- /dev/null +++ b/modules/programs/#ghostty.nix# @@ -0,0 +1,3 @@ +{ + +} diff --git a/modules/programs/ghostty.nix b/modules/programs/ghostty.nix deleted file mode 100644 index 28ca2aa..0000000 --- a/modules/programs/ghostty.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - programs.ghostty = { - enable = true; - systemd.enable = true; - }; -} diff --git a/theme.nix b/theme.nix deleted file mode 100644 index 5da6dc1..0000000 --- a/theme.nix +++ /dev/null @@ -1 +0,0 @@ -{ config, lib, inputs, ...}: {}