summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/baseX.nix4
-rw-r--r--lass/2configs/blue-host.nix1
-rw-r--r--lass/2configs/dcso-dev.nix7
-rw-r--r--lass/2configs/dunst.nix6
-rw-r--r--lass/2configs/git.nix4
-rw-r--r--lass/2configs/logf.nix2
-rw-r--r--lass/2configs/mc.nix2
-rw-r--r--lass/2configs/reaktor-coders.nix8
-rw-r--r--lass/2configs/repo-sync.nix2
-rw-r--r--lass/2configs/starcraft.nix53
-rw-r--r--lass/2configs/urxvt.nix8
-rw-r--r--lass/2configs/virtualbox.nix2
-rw-r--r--lass/2configs/websites/lassulus.nix16
-rw-r--r--lass/2configs/websites/util.nix2
-rw-r--r--lass/2configs/wine.nix1
15 files changed, 106 insertions, 12 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index afdefaa45..7d04827f0 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -71,8 +71,10 @@ in {
ag
bank
cabal2nix
+ cholerab
dic
dmenu
+ font-size
gi
gitAndTools.qgit
git-preview
@@ -81,6 +83,7 @@ in {
mpv-poll
much
ncdu
+ nix-index
nix-repl
nmap
pavucontrol
@@ -91,7 +94,6 @@ in {
sxiv
taskwarrior
termite
- thesauron
timewarrior
xclip
xephyrify
diff --git a/lass/2configs/blue-host.nix b/lass/2configs/blue-host.nix
index 657234bc1..83c235f3e 100644
--- a/lass/2configs/blue-host.nix
+++ b/lass/2configs/blue-host.nix
@@ -5,6 +5,7 @@ with import <stockholm/lib>;
imports = [
<stockholm/lass/2configs/container-networking.nix>
];
+ systemd.services."container@blue".reloadIfChanged = mkForce false;
containers.blue = {
config = { ... }: {
environment.systemPackages = [ pkgs.git ];
diff --git a/lass/2configs/dcso-dev.nix b/lass/2configs/dcso-dev.nix
index b985b67b3..0996d21c1 100644
--- a/lass/2configs/dcso-dev.nix
+++ b/lass/2configs/dcso-dev.nix
@@ -9,7 +9,7 @@ in {
dev = {
name = "dev";
uid = genid "dev";
- extraGroups = [ "docker" ];
+ extraGroups = [ "docker" "vboxusers" ];
description = "user for collaborative development";
home = "/home/dev";
useDefaultShell = true;
@@ -54,10 +54,13 @@ in {
krebs.per-user.dev.packages = [
pkgs.go
];
+ environment.variables.GOPATH = "$HOME/go";
security.sudo.extraConfig = ''
${mainUser.name} ALL=(dev) NOPASSWD: ALL
'';
- services.minio.enable = true;
+ networking.interfaces.et0.ipv4.addresses = [
+ { address = "10.99.23.1"; prefixLength = 24; }
+ ];
}
diff --git a/lass/2configs/dunst.nix b/lass/2configs/dunst.nix
index 6d3d839bc..18a22e1da 100644
--- a/lass/2configs/dunst.nix
+++ b/lass/2configs/dunst.nix
@@ -188,21 +188,21 @@ let
foreground = "#3B7C87"
background = "#191311"
#background = "#2B313C"
- timeout = 0
+ timeout = 1
[urgency_normal]
frame_color = "#5B8234"
foreground = "#5B8234"
background = "#191311"
#background = "#2B313C"
- timeout = 0
+ timeout = 1
[urgency_critical]
frame_color = "#B7472A"
foreground = "#B7472A"
background = "#191311"
#background = "#2B313C"
- timeout = 0
+ timeout = 1
# Every section that isn't one of the above is interpreted as a rules to
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 72cfd5e75..707796dd9 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -61,6 +61,10 @@ let
cgit.desc = "krebs deployment";
cgit.section = "software";
};
+ xmonad-stockholm = {
+ cgit.desc = "krebs xmonad modules";
+ cgit.section = "configuration";
+ };
} // mapAttrs make-public-repo-silent {
nixos-aws = {
collaborators = [ {
diff --git a/lass/2configs/logf.nix b/lass/2configs/logf.nix
index 24b806efa..f141a94f5 100644
--- a/lass/2configs/logf.nix
+++ b/lass/2configs/logf.nix
@@ -11,7 +11,7 @@ let
cloudkrebs = "119";
};
urgent = [
- "\\blass@mors\\b"
+ "\\blass@blue\\b"
];
in {
environment.systemPackages = [
diff --git a/lass/2configs/mc.nix b/lass/2configs/mc.nix
index 3bd1852a8..eb457b7d3 100644
--- a/lass/2configs/mc.nix
+++ b/lass/2configs/mc.nix
@@ -326,7 +326,7 @@ in {
name = "mc";
paths = [
(pkgs.writeDashBin "mc" ''
- export MC_DATADIR=${pkgs.writeOut "mc-ext" {
+ export MC_DATADIR=${pkgs.write "mc-ext" {
"/mc.ext".link = mcExt;
"/sfs.ini".text = "";
}};
diff --git a/lass/2configs/reaktor-coders.nix b/lass/2configs/reaktor-coders.nix
index 5a39f7115..86877df7a 100644
--- a/lass/2configs/reaktor-coders.nix
+++ b/lass/2configs/reaktor-coders.nix
@@ -65,7 +65,7 @@ with import <stockholm/lib>;
})
(buildSimpleReaktorPlugin "random-unicorn-porn" {
pattern = "^!rup$$";
- script = pkgs.writePython2 [] "rup" ''
+ script = pkgs.writePython2 "rup" [] ''
t1 = """
_.
;=',_ ()
@@ -100,6 +100,12 @@ with import <stockholm/lib>;
exec echo 'DID SOMEBODY SAY BLOCKCHAIN? https://paste.krebsco.de/r99pMoQq/+inline'
'';
})
+ (buildSimpleReaktorPlugin "shrug" {
+ pattern = "^!shrug$";
+ script = pkgs.writeDash "shrug" ''
+ exec echo '¯\_(ツ)_/¯'
+ '';
+ })
];
};
}
diff --git a/lass/2configs/repo-sync.nix b/lass/2configs/repo-sync.nix
index 615f5a728..6a07172fe 100644
--- a/lass/2configs/repo-sync.nix
+++ b/lass/2configs/repo-sync.nix
@@ -27,6 +27,7 @@ let
user = with config.krebs.users; [
config.krebs.users."${config.networking.hostName}-repo-sync"
lass
+ lass-mors
lass-shodan
];
repo = [ repo ];
@@ -136,5 +137,6 @@ in {
(sync-retiolum "stockholm")
(sync-retiolum "wai-middleware-time")
(sync-retiolum "xmonad-stockholm")
+ (sync-retiolum "nix-writers")
];
}
diff --git a/lass/2configs/starcraft.nix b/lass/2configs/starcraft.nix
new file mode 100644
index 000000000..742b877e8
--- /dev/null
+++ b/lass/2configs/starcraft.nix
@@ -0,0 +1,53 @@
+{ config, pkgs, ... }: let
+ mainUser = config.users.extraUsers.mainUser;
+ newWine = pkgs.wineStaging;
+ #newWine = pkgs.wineStaging.overrideAttrs (old: {
+ # name = "wine-3.7";
+ # buildInputs = old.buildInputs ++ [
+ # pkgs.libuuid.bin
+ # pkgs.autoconf.out
+ # ];
+ # src = pkgs.fetchurl {
+ # url = "https://dl.winehq.org/wine/source/3.x/wine-3.7.tar.xz";
+ # sha256 = "1drbzk3y0m14lkq3vzwwkvain5shykgcbmyzh6gcb5r4sxh3givn";
+ # };
+ # postPatch = old.postPatch or "" + ''
+ # patchShebangs tools
+ # cp -r ${pkgs.fetchFromGitHub {
+ # sha256 = "0kam73jqhah7bzji5csxxhhfdp6byhzpcph6xnzjqz2aic5xk7xi";
+ # owner = "wine-staging";
+ # repo = "wine-staging";
+ # rev = "v3.7";
+ # }}/patches .
+ # chmod +w patches
+ # cd patches
+ # patchShebangs gitapply.sh
+ # ./patchinstall.sh DESTDIR="$PWD/.." --all
+ # cd ..
+ # '';
+
+ #});
+ #newWine = (import (builtins.fetchGit {
+ # url = "https://github.com/NixOS/nixpkgs";
+ # rev = "696c6bed4e8e2d9fd9b956dea7e5d49531e9d13f";
+ #}) {}).wineStaging;
+in {
+ users.users= {
+ starcraft = {
+ isNormalUser = true;
+ extraGroups = [
+ "audio"
+ "video"
+ ];
+ packages = [
+ newWine
+ pkgs.winetricks
+ pkgs.mpg123
+ ];
+ };
+ };
+ security.sudo.extraConfig = ''
+ ${mainUser.name} ALL=(starcraft) NOPASSWD: ALL
+ '';
+}
+
diff --git a/lass/2configs/urxvt.nix b/lass/2configs/urxvt.nix
index fc4537140..90d28d650 100644
--- a/lass/2configs/urxvt.nix
+++ b/lass/2configs/urxvt.nix
@@ -5,7 +5,7 @@ with import <stockholm/lib>;
services.urxvtd.enable = true;
krebs.xresources.resources.urxvt = ''
- URxvt*SaveLines: 4096
+ URxvt*SaveLines: 1000000
URxvt*scrollBar: false
URxvt*urgentOnBell: true
URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select
@@ -19,6 +19,12 @@ with import <stockholm/lib>;
URxvt.keysym.M-Escape: perl:keyboard-select:activate
URxvt.keysym.M-s: perl:keyboard-select:search
+ URxvt.keysym.M-F1: command:\033]710;-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1\007\033]711;-*-clean-*-*-*-*-*-*-*-*-*-*-iso10646-1\007
+ URxvt.keysym.M-F2: command:\033]710;xft:Monospace:size=15\007\033]711;xft:Monospace:size=15:bold\007
+ URxvt.keysym.M-F3: command:\033]710;xft:Monospace:size=20\007\033]711;xft:Monospace:size=20:bold\007
+ URxvt.keysym.M-F4: command:\033]710;xft:Monospace:size=25\007\033]711;xft:Monospace:size=25:bold\007
+ URxvt.keysym.M-F5: command:\033]710;xft:Monospace:size=30\007\033]711;xft:Monospace:size=30:bold\007
+
URxvt.intensityStyles: false
URxvt*background: #000000
diff --git a/lass/2configs/virtualbox.nix b/lass/2configs/virtualbox.nix
index 8171def2d..cfb835d78 100644
--- a/lass/2configs/virtualbox.nix
+++ b/lass/2configs/virtualbox.nix
@@ -15,7 +15,7 @@ in {
description = "user for running VirtualBox";
home = "/home/virtual";
useDefaultShell = true;
- extraGroups = [ "vboxusers" "audio" ];
+ extraGroups = [ "vboxusers" "audio" "video" ];
createHome = true;
};
};
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 53f1eea5c..f60a66952 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -66,6 +66,22 @@ in {
locations."/tinc".extraConfig = ''
alias ${config.krebs.tinc_graphs.workingDir}/external;
'';
+ locations."/urlaubyay2018".extraConfig = ''
+ autoindex on;
+ alias /srv/http/lassul.us-media/india2018;
+ auth_basic "Restricted Content";
+ auth_basic_user_file ${pkgs.writeText "pics-user-pass" ''
+ paolo:$apr1$aQ6mYNR3$ho.aJ7icqSO.y.xKo3GQf0
+ ''};
+ '';
+ locations."/heilstadt".extraConfig = ''
+ autoindex on;
+ alias /srv/http/lassul.us-media/grabowsee2018;
+ auth_basic "Restricted Content";
+ auth_basic_user_file ${pkgs.writeText "pics-user-pass" ''
+ c-base:$apr1$aQ6mYNR3$ho.aJ7icqSO.y.xKo3GQf0
+ ''};
+ '';
# TODO make this work!
locations."= /ddate".extraConfig = let
script = pkgs.writeBash "test" ''
diff --git a/lass/2configs/websites/util.nix b/lass/2configs/websites/util.nix
index 816449c14..a807f7160 100644
--- a/lass/2configs/websites/util.nix
+++ b/lass/2configs/websites/util.nix
@@ -194,7 +194,7 @@ rec {
in {
services.nginx.virtualHosts."${domain}" = {
enableACME = true;
- addSSL = true;
+ forceSSL = true;
serverAliases = domains;
extraConfig = ''
root /srv/http/${domain}/;
diff --git a/lass/2configs/wine.nix b/lass/2configs/wine.nix
index dd82b34eb..71a5cdda9 100644
--- a/lass/2configs/wine.nix
+++ b/lass/2configs/wine.nix
@@ -17,6 +17,7 @@ in {
createHome = true;
packages = [
pkgs.wine
+ pkgs.winetricks
];
};
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 04:48:15 +0000