summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--krebs/3modules/fetchWallpaper.nix22
-rw-r--r--lass/1systems/mors.nix6
-rw-r--r--lass/2configs/copyq.nix10
-rw-r--r--lass/2configs/default.nix5
-rw-r--r--lass/2configs/git.nix2
-rw-r--r--lass/2configs/hfos.nix9
-rw-r--r--lass/2configs/mail.nix17
-rw-r--r--lass/2configs/mc.nix6
-rw-r--r--lass/2configs/nixpkgs.nix2
-rw-r--r--lass/2configs/power-action.nix2
-rw-r--r--lass/2configs/xresources.nix6
11 files changed, 61 insertions, 26 deletions
diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix
index e226a9060..e00c0ec9b 100644
--- a/krebs/3modules/fetchWallpaper.nix
+++ b/krebs/3modules/fetchWallpaper.nix
@@ -21,10 +21,9 @@ let
OnCalendar = "*:00,10,20,30,40,50";
};
};
- # TODO find a better default stateDir
stateDir = mkOption {
type = types.str;
- default = "$HOME/wallpaper";
+ default = "/var/lib/wallpaper";
};
display = mkOption {
type = types.str;
@@ -52,27 +51,35 @@ let
mkdir -p ${cfg.stateDir}
cd ${cfg.stateDir}
(curl --max-time ${toString cfg.maxTime} -s -o wallpaper.tmp -z wallpaper ${shell.escape cfg.url} && mv wallpaper.tmp wallpaper) || :
- feh --no-fehbg --bg-scale wallpaper
+ feh --no-fehbg --bg-scale ${shell.escape cfg.stateDir}/wallpaper
'';
imp = {
- systemd.user.timers.fetchWallpaper = {
+ users.users.fetchWallpaper = {
+ name = "fetchWallpaper";
+ uid = genid "fetchWallpaper";
+ description = "fetchWallpaper user";
+ home = cfg.stateDir;
+ createHome = true;
+ };
+
+ systemd.timers.fetchWallpaper = {
description = "fetch wallpaper timer";
wantedBy = [ "timers.target" ];
timerConfig = cfg.timerConfig;
};
- systemd.user.services.fetchWallpaper = {
+ systemd.services.fetchWallpaper = {
description = "fetch wallpaper";
- wantedBy = [ "default.target" ];
+ after = [ "network.target" ];
path = with pkgs; [
curl
feh
- coreutils
];
environment = {
+ URL = cfg.url;
DISPLAY = cfg.display;
};
restartIfChanged = true;
@@ -80,6 +87,7 @@ let
serviceConfig = {
Type = "simple";
ExecStart = fetchWallpaperScript;
+ User = "fetchWallpaper";
};
unitConfig = cfg.unitConfig;
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 223e16bae..534d65162 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -86,6 +86,10 @@ with import <stockholm/lib>;
pkgs.krebszones
];
}
+ {
+ #ps vita stuff
+ boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
+ }
];
krebs.build.host = config.krebs.hosts.mors;
@@ -180,8 +184,6 @@ with import <stockholm/lib>;
'';
environment.systemPackages = with pkgs; [
- exfat
-
acronym
cac-api
sshpass
diff --git a/lass/2configs/copyq.nix b/lass/2configs/copyq.nix
index 0616c4025..b255254f2 100644
--- a/lass/2configs/copyq.nix
+++ b/lass/2configs/copyq.nix
@@ -9,7 +9,7 @@ let
${pkgs.copyq}/bin/copyq config activate_closes true
${pkgs.copyq}/bin/copyq config clipboard_notification_lines 0
- ${pkgs.copyq}/bin/copyq config clipboard_tab clipboard
+ ${pkgs.copyq}/bin/copyq config clipboard_tab \&clipboard
${pkgs.copyq}/bin/copyq config disable_tray true
${pkgs.copyq}/bin/copyq config hide_tabs true
${pkgs.copyq}/bin/copyq config hide_toolbar true
@@ -19,10 +19,9 @@ let
${pkgs.copyq}/bin/copyq config text_wrap true
'';
in {
- systemd.user.services.copyq = {
- after = [ "graphical.target" ];
- wants = [ "graphical.target" ];
- wantedBy = [ "default.target" ];
+ systemd.services.copyq = {
+ wantedBy = [ "multi-user.target" ];
+ requires = [ "display-manager.service" ];
environment = {
DISPLAY = ":0";
};
@@ -33,6 +32,7 @@ in {
Restart = "always";
RestartSec = "2s";
StartLimitBurst = 0;
+ User = "lass";
};
};
}
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 96f70d312..f4e4cd2cc 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -64,7 +64,10 @@ with import <stockholm/lib>;
];
}
{
- services.dnscrypt-proxy.enable = true;
+ services.dnscrypt-proxy = {
+ enable = true;
+ resolverName = "d0wn-nl-ns3";
+ };
networking.extraResolvconfConf = ''
name_servers='127.0.0.1'
'';
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 3e1b2c6e3..710eb9461 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -58,7 +58,7 @@ let
server = "ni.r";
verbose = config.krebs.build.host.name == "prism";
# TODO define branches in some kind of option per repo
- branches = [ "master" "newest" ];
+ branches = [ "master" ];
};
};
};
diff --git a/lass/2configs/hfos.nix b/lass/2configs/hfos.nix
index a28a6a5d2..f63e5ea53 100644
--- a/lass/2configs/hfos.nix
+++ b/lass/2configs/hfos.nix
@@ -36,5 +36,12 @@ with import <stockholm/lib>;
{ v6 = false; precedence = 1000; predicate = "-d 213.239.205.246 -p tcp --dport 443"; target = "DNAT --to-destination 192.168.122.208:1443"; }
];
- systemd.services.krebs-iptables.after = [ "libvirtd.service" ];
+ # TODO use bridge interfaces instead of this crap
+ systemd.services.libvirtd.serviceConfig.ExecStartPost = let
+ restart-iptables = pkgs.writeDash "restart-iptables" ''
+ #soo hacky
+ ${pkgs.coreutils}/bin/sleep 1s
+ ${pkgs.systemd}/bin/systemctl restart krebs-iptables.service
+ '';
+ in restart-iptables;
}
diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix
index e4b319528..a08dc88da 100644
--- a/lass/2configs/mail.nix
+++ b/lass/2configs/mail.nix
@@ -66,7 +66,6 @@ let
# notmuch bindings
macro index \\\\ "<vfolder-from-query>" # looks up a hand made query
- macro index A "<modify-labels>+archive -unread -inbox\n" # tag as Archived
macro index + "<modify-labels>+*\n<sync-mailbox>" # tag as starred
macro index - "<modify-labels>-*\n<sync-mailbox>" # tag as unstarred
@@ -75,9 +74,25 @@ let
bind index d noop
bind pager d noop
+ bind index S noop
+ bind index s noop
bind pager S noop
+ bind pager s noop
macro index S "<modify-labels-then-hide>-inbox -unread +junk\n" # tag as Junk mail
+ macro index s "<modify-labels>-junk\n" # tag as Junk mail
macro pager S "<modify-labels-then-hide>-inbox -unread +junk\n" # tag as Junk mail
+ macro pager s "<modify-labels>-junk\n" # tag as Junk mail
+
+
+ bind index A noop
+ bind index a noop
+ bind pager A noop
+ bind pager a noop
+ macro index A "<modify-labels>+archive -unread -inbox\n" # tag as Archived
+ macro index a "<modify-labels>-archive\n" # tag as Archived
+ macro pager A "<modify-labels>+archive -unread -inbox\n" # tag as Archived
+ macro pager a "<modify-labels>-archive\n" # tag as Archived
+
bind index t noop
bind pager t noop
diff --git a/lass/2configs/mc.nix b/lass/2configs/mc.nix
index fc347ba3c..513ee1bd0 100644
--- a/lass/2configs/mc.nix
+++ b/lass/2configs/mc.nix
@@ -325,12 +325,10 @@ in {
(pkgs.concat "mc" [
pkgs.mc
(pkgs.writeDashBin "mc" ''
- export MC_DATADIR=${pkgs.concat "mc-datadir" [
- (pkgs.writeOut "mc-ext" {
+ export MC_DATADIR=${pkgs.writeOut "mc-ext" {
"/mc.ext".link = mcExt;
"/sfs.ini".text = "";
- })
- ]}
+ }};
export TERM=xterm-256color
exec ${pkgs.mc}/bin/mc -S xoria256 "$@"
'')
diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 20918d294..7f6512552 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
{
krebs.build.source.nixpkgs.git = {
url = https://cgit.lassul.us/nixpkgs;
- ref = "c554a0c97f5030a66cc81d41e1f39bff5095efba";
+ ref = "ade5837";
};
}
diff --git a/lass/2configs/power-action.nix b/lass/2configs/power-action.nix
index f22bf451a..c7bdb525d 100644
--- a/lass/2configs/power-action.nix
+++ b/lass/2configs/power-action.nix
@@ -26,7 +26,7 @@ in {
lowerLimit = 0;
charging = false;
action = pkgs.writeDash "suspend-wrapper" ''
- /var/setuid-wrappers/sudo ${suspend}
+ /run/wrappers/bin/sudo ${suspend}
'';
};
user = "lass";
diff --git a/lass/2configs/xresources.nix b/lass/2configs/xresources.nix
index 35dbe2044..b5e721483 100644
--- a/lass/2configs/xresources.nix
+++ b/lass/2configs/xresources.nix
@@ -36,9 +36,10 @@ let
'';
in {
- systemd.user.services.xresources = {
+ systemd.services.xresources = {
description = "xresources";
- wantedBy = [ "default.target" ];
+ wantedBy = [ "multi-user.target" ];
+ after = [ "display-manager.service" ];
environment = {
DISPLAY = ":0";
@@ -50,6 +51,7 @@ in {
Type = "simple";
ExecStart = "${pkgs.xorg.xrdb}/bin/xrdb -merge ${xresources}";
Restart = "on-failure";
+ User = "lass";
};
};
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 22:31:29 +0000