diff options
-rw-r--r-- | modules/module-list.nix | 1 | ||||
-rw-r--r-- | modules/user/aszlig/profiles/workstation/default.nix | 2 | ||||
-rw-r--r-- | modules/user/aszlig/profiles/workstation/packages.nix | 1 | ||||
-rw-r--r-- | modules/user/aszlig/programs/gajim/config.nix (renamed from cfgfiles/gajim.nix) | 0 | ||||
-rw-r--r-- | modules/user/aszlig/programs/gajim/config.patch (renamed from pkgs/gajim/config.patch) | 0 | ||||
-rw-r--r-- | modules/user/aszlig/programs/gajim/default.nix | 59 | ||||
-rw-r--r-- | overrides/default.nix | 46 |
7 files changed, 62 insertions, 47 deletions
diff --git a/modules/module-list.nix b/modules/module-list.nix index 81adaae8..dbcb08a7 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -1,6 +1,7 @@ [ ./user/aszlig/profiles/base.nix ./user/aszlig/profiles/workstation + ./user/aszlig/programs/gajim ./user/aszlig/programs/git ./user/aszlig/programs/zsh ./user/aszlig/services/i3 diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix index fa387a9b..8286fcd6 100644 --- a/modules/user/aszlig/profiles/workstation/default.nix +++ b/modules/user/aszlig/profiles/workstation/default.nix @@ -51,6 +51,8 @@ in { vuizvui.user.aszlig.services.i3.enable = true; vuizvui.user.aszlig.services.slim.enable = true; vuizvui.user.aszlig.services.vlock.enable = true; + + vuizvui.user.aszlig.programs.gajim.enable = true; vuizvui.user.aszlig.programs.zsh.enable = true; vuizvui.user.aszlig.programs.git.enable = true; diff --git a/modules/user/aszlig/profiles/workstation/packages.nix b/modules/user/aszlig/profiles/workstation/packages.nix index 48188e7f..96331c17 100644 --- a/modules/user/aszlig/profiles/workstation/packages.nix +++ b/modules/user/aszlig/profiles/workstation/packages.nix @@ -17,7 +17,6 @@ pkgs: with pkgs; [ figlet firefox flac - gajim gdb ghostscript gimp diff --git a/cfgfiles/gajim.nix b/modules/user/aszlig/programs/gajim/config.nix index e9ed1100..e9ed1100 100644 --- a/cfgfiles/gajim.nix +++ b/modules/user/aszlig/programs/gajim/config.nix diff --git a/pkgs/gajim/config.patch b/modules/user/aszlig/programs/gajim/config.patch index fcfcc371..fcfcc371 100644 --- a/pkgs/gajim/config.patch +++ b/modules/user/aszlig/programs/gajim/config.patch diff --git a/modules/user/aszlig/programs/gajim/default.nix b/modules/user/aszlig/programs/gajim/default.nix new file mode 100644 index 00000000..7c62b817 --- /dev/null +++ b/modules/user/aszlig/programs/gajim/default.nix @@ -0,0 +1,59 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.vuizvui.user.aszlig.programs.gajim; + + gtkTheme = pkgs.writeText "gajim.gtkrc" '' + style "default" { + fg[NORMAL] = "#d5faff" + fg[ACTIVE] = "#fffeff" + fg[SELECTED] = "#fffeff" + fg[INSENSITIVE] = "#85aaaf" + fg[PRELIGHT] = "#d7f2ff" + + text[NORMAL] = "#fffefe" + text[ACTIVE] = "#fffeff" + text[SELECTED] = "#fffeff" + text[INSENSITIVE] = "#85aaaf" + text[PRELIGHT] = "#d7f2ff" + + bg[NORMAL] = "#0f4866" + bg[ACTIVE] = "#0c232e" + bg[SELECTED] = "#005a56" + bg[INSENSITIVE] = "#103040" + bg[PRELIGHT] = "#1d5875" + + base[NORMAL] = "#0c232e" + base[ACTIVE] = "#0f4864" + base[SELECTED] = "#005a56" + base[INSENSITIVE] = "#103040" + base[PRELIGHT] = "#1d5875" + } + + class "GtkWidget" style "default" + + gtk-enable-animations = 0 + ''; + + gajimPatched = overrideDerivation pkgs.gajim (o: { + patches = (o.patches or []) ++ singleton (pkgs.substituteAll { + src = ./config.patch; + nix_config = pkgs.writeText "gajim.config" (import ./config.nix); + }); + postPatch = (o.postPatch or "") + '' + sed -i -e '/^export/i export GTK2_RC_FILES="${gtkTheme}"' \ + scripts/gajim.in + ''; + }); + +in { + options.vuizvui.user.aszlig.programs.gajim = { + enable = mkEnableOption "aszlig's Gajim"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ gajimPatched ]; + }; +} diff --git a/overrides/default.nix b/overrides/default.nix index f1bf422b..3dc74adf 100644 --- a/overrides/default.nix +++ b/overrides/default.nix @@ -21,54 +21,8 @@ let miro.enableBonjour = true; }; - gajimGtkTheme = everything.writeText "gajim.gtkrc" '' - style "default" { - fg[NORMAL] = "#d5faff" - fg[ACTIVE] = "#fffeff" - fg[SELECTED] = "#fffeff" - fg[INSENSITIVE] = "#85aaaf" - fg[PRELIGHT] = "#d7f2ff" - - text[NORMAL] = "#fffefe" - text[ACTIVE] = "#fffeff" - text[SELECTED] = "#fffeff" - text[INSENSITIVE] = "#85aaaf" - text[PRELIGHT] = "#d7f2ff" - - bg[NORMAL] = "#0f4866" - bg[ACTIVE] = "#0c232e" - bg[SELECTED] = "#005a56" - bg[INSENSITIVE] = "#103040" - bg[PRELIGHT] = "#1d5875" - - base[NORMAL] = "#0c232e" - base[ACTIVE] = "#0f4864" - base[SELECTED] = "#005a56" - base[INSENSITIVE] = "#103040" - base[PRELIGHT] = "#1d5875" - } - - class "GtkWidget" style "default" - - gtk-enable-animations = 0 - ''; - - gajimPatch = everything.substituteAll { - src = ../pkgs/gajim/config.patch; - nix_config = everything.writeText "gajim.config" - (import ../cfgfiles/gajim.nix); - }; - # derivation overrides drvOverrides = mapOverride overrideDerivation argOverrides { - gajim = o: { - patches = (o.patches or []) ++ singleton gajimPatch; - postPatch = (o.postPatch or "") + '' - sed -i -e '/^export/i export GTK2_RC_FILES="${gajimGtkTheme}"' \ - scripts/gajim.in - ''; - }; - mpv = o: { installPhase = o.installPhase + '' cat > "$out/etc/mpv/mpv.conf" <<CONFIG |