From dcfd8d81e9b6a9cf02fbaf1960ae5338869e7d73 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 1 Oct 2023 09:22:32 -0400 Subject: [PATCH] fix(gtklock): fix modules not loaded --- config/gtklock/config.ini | 4 ---- nixos/home/dotfiles.nix | 7 +++++-- nixos/home/packages.nix | 2 -- 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 config/gtklock/config.ini diff --git a/config/gtklock/config.ini b/config/gtklock/config.ini deleted file mode 100644 index 186da3f9..00000000 --- a/config/gtklock/config.ini +++ /dev/null @@ -1,4 +0,0 @@ -[main] -modules=/nix/var/nix/profiles/system/sw/lib/gtklock/powerbar-module.so;/nix/var/nix/profiles/system/sw/lib/gtklock/playerctl-module.so - -#;/nix/var/nix/profiles/system/sw/lib/gtklock/userinfo-module.so diff --git a/nixos/home/dotfiles.nix b/nixos/home/dotfiles.nix index b53f8dd0..6fd3ba43 100644 --- a/nixos/home/dotfiles.nix +++ b/nixos/home/dotfiles.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: let configDir = "/home/matt/.nix/config"; @@ -8,7 +8,10 @@ in xdg.configFile = { "swayosd/style.css".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/swayosd/style.css"; - "gtklock/config.ini".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/gtklock/config.ini"; + "gtklock/config.ini".source = pkgs.writeText "config.ini" '' + [main] + modules=${pkgs.gtklock-powerbar-module}/lib/gtklock/powerbar-module.so;${pkgs.gtklock-playerctl-module}/lib/gtklock/playerctl-module.so + ''; "gtklock/style.css".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/gtklock/style.css"; "ripgrep".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/ripgrep"; diff --git a/nixos/home/packages.nix b/nixos/home/packages.nix index 39454f38..11598eef 100644 --- a/nixos/home/packages.nix +++ b/nixos/home/packages.nix @@ -136,8 +136,6 @@ wl-clipboard cliphist gtklock - gtklock-playerctl-module - gtklock-powerbar-module grim slurp swappy