summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/mors.nix2
-rw-r--r--lass/1systems/prism.nix7
-rw-r--r--lass/2configs/baseX.nix2
-rw-r--r--lass/2configs/default.nix1
-rw-r--r--lass/2configs/htop.nix40
-rw-r--r--lass/2configs/logf.nix21
-rw-r--r--lass/2configs/mc.nix20
-rw-r--r--lass/2configs/nixpkgs.nix4
-rw-r--r--lass/2configs/programs.nix1
-rw-r--r--lass/2configs/repo-sync.nix55
-rw-r--r--lass/2configs/vim.nix13
-rw-r--r--lass/2configs/websites/domsen.nix5
-rw-r--r--lass/5pkgs/xmonad-lass.nix2
13 files changed, 125 insertions, 48 deletions
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index bffb08ad3..223e16bae 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -24,6 +24,7 @@ with import <stockholm/lib>;
../2configs/krebs-pass.nix
../2configs/repo-sync.nix
../2configs/ircd.nix
+ ../2configs/logf.nix
{
#risk of rain port
krebs.iptables.tables.filter.INPUT.rules = [
@@ -192,7 +193,6 @@ with import <stockholm/lib>;
remmina
thunderbird
- logf
iodine
macchanger
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index b55732f65..a7a7f6129 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -215,8 +215,13 @@ in {
}
{
krebs.repo-sync.timerConfig = {
+ OnBootSec = "15min";
+ OnUnitInactiveSec = "90min";
+ RandomizedDelaySec = "30min";
+ };
+ krebs.repo-sync.repos.stockholm.timerConfig = {
OnBootSec = "5min";
- OnUnitInactiveSec = "3min";
+ OnUnitInactiveSec = "2min";
RandomizedDelaySec = "2min";
};
}
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 275b93f26..3032e244f 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -15,6 +15,8 @@ in {
enable = true;
systemWide = true;
};
+ security.rtkit.enable = true;
+ sound.enableOSSEmulation = false;
}
{
krebs.per-user.lass.packages = [
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 3e7881fb4..96f70d312 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -9,6 +9,7 @@ with import <stockholm/lib>;
../2configs/nixpkgs.nix
../2configs/vim.nix
../2configs/monitoring/client.nix
+ ./htop.nix
./backups.nix
./security-workarounds.nix
{
diff --git a/lass/2configs/htop.nix b/lass/2configs/htop.nix
new file mode 100644
index 000000000..0296101ac
--- /dev/null
+++ b/lass/2configs/htop.nix
@@ -0,0 +1,40 @@
+{ pkgs, ... }:
+
+with import <stockholm/lib>;
+
+{
+ nixpkgs.config.packageOverrides = super: {
+ htop = pkgs.concat "htop" [
+ super.htop
+ (pkgs.writeDashBin "htop" ''
+ export HTOPRC=${pkgs.writeText "htoprc" ''
+ fields=0 48 17 18 38 39 40 2 46 47 49 1
+ sort_key=46
+ sort_direction=1
+ hide_threads=0
+ hide_kernel_threads=1
+ hide_userland_threads=0
+ shadow_other_users=1
+ show_thread_names=1
+ show_program_path=1
+ highlight_base_name=1
+ highlight_megabytes=1
+ highlight_threads=1
+ tree_view=1
+ header_margin=1
+ detailed_cpu_time=0
+ cpu_count_from_zero=0
+ update_process_names=0
+ account_guest_in_cpu_meter=1
+ color_scheme=6
+ delay=15
+ left_meters=LeftCPUs2 RightCPUs2 Memory Swap
+ left_meter_modes=1 1 1 1
+ right_meters=Uptime Tasks LoadAverage Battery
+ right_meter_modes=2 2 2 2
+ ''}
+ exec ${super.htop}/bin/htop "$@"
+ '')
+ ];
+ };
+}
diff --git a/lass/2configs/logf.nix b/lass/2configs/logf.nix
new file mode 100644
index 000000000..3c4948db1
--- /dev/null
+++ b/lass/2configs/logf.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+with import <stockholm/lib>;
+let
+ host-colors = {
+ mors = "131";
+ prism = "95";
+ uriel = "61";
+ shodan = "51";
+ icarus = "53";
+ echelon = "197";
+ helios = "199";
+ cloudkrebs = "119";
+ };
+in {
+ environment.systemPackages = [
+ (pkgs.writeDashBin "logf" ''
+ export LOGF_HOST_COLORS=${pkgs.writeJSON "host-colors" host-colors}
+ ${pkgs.logf}/bin/logf ${concatMapStringsSep " " (name: "root@${name}") (attrNames config.lass.hosts)}
+ '')
+ ];
+}
diff --git a/lass/2configs/mc.nix b/lass/2configs/mc.nix
index b7d5a4ceb..fc347ba3c 100644
--- a/lass/2configs/mc.nix
+++ b/lass/2configs/mc.nix
@@ -322,13 +322,19 @@ let
in {
environment.systemPackages = [
- (pkgs.lib.overrideDerivation pkgs.mc (original : {
- postInstall = ''
- rm -f $out/etc/mc/mc.ext
- ln -s ${mcExt} $out/etc/mc/mc.ext
- cp $out/share/mc/skins/nicedark.ini $out/share/mc/skins/default.ini
- '';
- }))
+ (pkgs.concat "mc" [
+ pkgs.mc
+ (pkgs.writeDashBin "mc" ''
+ export MC_DATADIR=${pkgs.concat "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 9c3eafffd..a6409b7db 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -2,7 +2,7 @@
{
krebs.build.source.nixpkgs.git = {
- url = https://github.com/nixos/nixpkgs;
- ref = "5b0c9d4";
+ url = https://cgit.lassul.us/nixpkgs;
+ ref = "c0ecd31";
};
}
diff --git a/lass/2configs/programs.nix b/lass/2configs/programs.nix
index 6cf23deaf..241d263f8 100644
--- a/lass/2configs/programs.nix
+++ b/lass/2configs/programs.nix
@@ -12,7 +12,6 @@
pavucontrol
pv
pwgen
- python34Packages.livestreamer
remmina
silver-searcher
wget
diff --git a/lass/2configs/repo-sync.nix b/lass/2configs/repo-sync.nix
index 83f646130..dfea637ed 100644
--- a/lass/2configs/repo-sync.nix
+++ b/lass/2configs/repo-sync.nix
@@ -36,25 +36,27 @@ let
sync-retiolum = name:
{
krebs.repo-sync.repos.${name} = {
- makefu = {
- origin.url = "http://cgit.gum/${name}";
- mirror.url = "${mirror}${name}";
+ branches = {
+ makefu = {
+ origin.url = "http://cgit.gum/${name}";
+ mirror.url = "${mirror}${name}";
+ };
+ tv = {
+ origin.url = "http://cgit.ni.r/${name}";
+ mirror.url = "${mirror}${name}";
+ };
+ nin = {
+ origin.url = "http://cgit.onondaga.r/${name}";
+ mirror.url = "${mirror}${name}";
+ };
+ lassulus = {
+ origin.url = "http://cgit.lassul.us/${name}";
+ mirror.url = "${mirror}${name}";
+ };
};
- tv = {
- origin.url = "http://cgit.ni.r/${name}";
- mirror.url = "${mirror}${name}";
- };
- nin = {
- origin.url = "http://cgit.onondaga.r/${name}";
- mirror.url = "${mirror}${name}";
- };
- lassulus = {
- origin.url = "http://cgit.lassul.us/${name}";
- mirror.url = "${mirror}${name}";
- };
- "@latest" = {
- mirror.url = "${mirror}${name}";
- mirror.ref = "heads/newest";
+ latest = {
+ url = "${mirror}${name}";
+ ref = "heads/newest";
};
};
krebs.git = defineRepo name (config.networking.hostName == "prism");
@@ -63,9 +65,11 @@ let
sync-remote = name: url:
{
krebs.repo-sync.repos.${name} = {
- remote = {
- origin.url = url;
- mirror.url = "${mirror}${name}";
+ branches = {
+ remote = {
+ origin.url = url;
+ mirror.url = "${mirror}${name}";
+ };
};
};
krebs.git = defineRepo name (config.networking.hostName == "prism");
@@ -74,9 +78,11 @@ let
sync-remote-silent = name: url:
{
krebs.repo-sync.repos.${name} = {
- remote = {
- origin.url = url;
- mirror.url = "${mirror}${name}";
+ branches = {
+ remote = {
+ origin.url = url;
+ mirror.url = "${mirror}${name}";
+ };
};
};
krebs.git = defineRepo name false;
@@ -109,4 +115,3 @@ in {
(sync-retiolum "xmonad-stockholm")
];
}
-
diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 4e0af0dc7..e6cf8d101 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -207,11 +207,14 @@ let
alldirs = attrValues dirs ++ map dirOf (attrValues files);
in unique (sort lessThan alldirs);
- vim = pkgs.writeDashBin "vim" ''
- set -efu
- (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
- exec ${pkgs.vim}/bin/vim "$@"
- '';
+ vim = pkgs.concat "vim" [
+ pkgs.vim
+ (pkgs.writeDashBin "vim" ''
+ set -efu
+ (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs})
+ exec ${pkgs.vim}/bin/vim "$@"
+ '')
+ ];
hs.vim = pkgs.writeText "hs.vim" ''
syn region String start=+\[[[:alnum:]]*|+ end=+|]+
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 0b75425c4..daecdcd2f 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -25,15 +25,10 @@ in {
imports = [
./sqlBackup.nix
(servePage [ "reich-gebaeudereinigung.de" "www.reich-gebaeudereinigung.de" ])
-
(servePage [ "karlaskop.de" "www.karlaskop.de" ])
-
(servePage [ "makeup.apanowicz.de" "www.makeup.apanowicz.de" ])
-
(servePage [ "pixelpocket.de" ])
-
(serveOwncloud [ "o.ubikmedia.de" ])
-
(serveWordpress [
"ubikmedia.de"
"apanowicz.de"
diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix
index bc70417f5..82f507138 100644
--- a/lass/5pkgs/xmonad-lass.nix
+++ b/lass/5pkgs/xmonad-lass.nix
@@ -95,7 +95,7 @@ displaySomeException = displayException
myKeyMap :: [([Char], X ())]
myKeyMap =
- [ ("M4-<F11>", spawn "${pkgs.i3lock}/bin/i3lock -i $HOME/wallpaper -f")
+ [ ("M4-<F11>", spawn "${pkgs.i3lock}/bin/i3lock -i $HOME/wallpaper/wallpaper -f")
, ("M4-C-p", spawn "${pkgs.scrot}/bin/scrot ~/public_html/scrot.png")
, ("M4-p", spawn "${pkgs.pass}/bin/passmenu --type")
, ("<XF86AudioRaiseVolume>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume @DEFAULT_SINK@ +4%")