summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
Diffstat (limited to 'makefu')
-rw-r--r--makefu/0tests/data/secrets/ebk-notify.yml0
-rw-r--r--makefu/2configs/gui/urxvtd.nix2
-rw-r--r--makefu/2configs/gui/wbob-kiosk.nix2
-rw-r--r--makefu/2configs/home-manager/zsh.nix1
-rw-r--r--makefu/2configs/tools/extra-gui.nix2
-rw-r--r--makefu/2configs/tools/studio.nix3
6 files changed, 7 insertions, 3 deletions
diff --git a/makefu/0tests/data/secrets/ebk-notify.yml b/makefu/0tests/data/secrets/ebk-notify.yml
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/makefu/0tests/data/secrets/ebk-notify.yml
diff --git a/makefu/2configs/gui/urxvtd.nix b/makefu/2configs/gui/urxvtd.nix
index 286b87ab3..cb6c25840 100644
--- a/makefu/2configs/gui/urxvtd.nix
+++ b/makefu/2configs/gui/urxvtd.nix
@@ -10,7 +10,7 @@ in {
serviceConfig = {
SyslogIdentifier = "urxvtd";
ExecReload = "${pkgs.coreutils}/bin/echo NOP";
- ExecStart = "${pkgs.rxvt_unicode_with-plugins}/bin/urxvtd";
+ ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd";
Restart = "always";
RestartSec = "2s";
StartLimitBurst = 0;
diff --git a/makefu/2configs/gui/wbob-kiosk.nix b/makefu/2configs/gui/wbob-kiosk.nix
index 6da1a37e7..5d409b8df 100644
--- a/makefu/2configs/gui/wbob-kiosk.nix
+++ b/makefu/2configs/gui/wbob-kiosk.nix
@@ -12,7 +12,7 @@
windowManager = lib.mkForce {
awesome.enable = false;
- default = "none";
+ default = "xfce";
};
desktopManager.xfce = {
extraSessionCommands = ''
diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index 0dc7f256b..1f4ceea6c 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -9,6 +9,7 @@
home-manager.users.makefu.home.packages = [ pkgs.bat ];
home-manager.users.makefu.programs.zsh.shellAliases = {
cat = "bat --style=header,snip";
+ mirage = "sxiv"; # only available when tools/extra-gui is in use
catn = "${pkgs.coreutils}/bin/cat";
ncat = "${pkgs.coreutils}/bin/cat";
};
diff --git a/makefu/2configs/tools/extra-gui.nix b/makefu/2configs/tools/extra-gui.nix
index 7c01104a0..49b36a5d7 100644
--- a/makefu/2configs/tools/extra-gui.nix
+++ b/makefu/2configs/tools/extra-gui.nix
@@ -4,7 +4,7 @@
users.users.makefu.packages = with pkgs;[
# media
gimp
- mirage
+ # mirage - last time available in 19.09
inkscape
libreoffice
# skype
diff --git a/makefu/2configs/tools/studio.nix b/makefu/2configs/tools/studio.nix
index 2c8ca399d..0998a695e 100644
--- a/makefu/2configs/tools/studio.nix
+++ b/makefu/2configs/tools/studio.nix
@@ -1,6 +1,9 @@
{ pkgs, ... }:
{
+ nixpkgs.config.permittedInsecurePackages = [
+ "openssl-1.0.2u" # required for studio-link
+ ];
users.users.makefu.packages = with pkgs; [
obs-studio
studio-link