diff options
Diffstat (limited to 'lass')
| -rw-r--r-- | lass/1systems/icarus/config.nix | 1 | ||||
| -rw-r--r-- | lass/1systems/shodan/config.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/bitcoin.nix | 27 | ||||
| -rw-r--r-- | lass/2configs/exim-smarthost.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/git.nix | 4 | ||||
| -rw-r--r-- | lass/2configs/mail.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/vim.nix | 2 | ||||
| -rw-r--r-- | lass/5pkgs/init/default.nix | 2 | ||||
| -rw-r--r-- | lass/source.nix | 2 |
9 files changed, 36 insertions, 6 deletions
diff --git a/lass/1systems/icarus/config.nix b/lass/1systems/icarus/config.nix index 8afd97977..46dc5e873 100644 --- a/lass/1systems/icarus/config.nix +++ b/lass/1systems/icarus/config.nix @@ -16,6 +16,7 @@ <stockholm/lass/2configs/fetchWallpaper.nix> <stockholm/lass/2configs/backups.nix> <stockholm/lass/2configs/games.nix> + <stockholm/lass/2configs/bitcoin.nix> ]; krebs.build.host = config.krebs.hosts.icarus; diff --git a/lass/1systems/shodan/config.nix b/lass/1systems/shodan/config.nix index 00ea82671..b6d49d6e4 100644 --- a/lass/1systems/shodan/config.nix +++ b/lass/1systems/shodan/config.nix @@ -17,6 +17,7 @@ with import <stockholm/lib>; <stockholm/lass/2configs/fetchWallpaper.nix> <stockholm/lass/2configs/backups.nix> <stockholm/lass/2configs/wine.nix> + <stockholm/lass/2configs/bitcoin.nix> ]; krebs.build.host = config.krebs.hosts.shodan; diff --git a/lass/2configs/bitcoin.nix b/lass/2configs/bitcoin.nix index 2f4cd5710..a405addfc 100644 --- a/lass/2configs/bitcoin.nix +++ b/lass/2configs/bitcoin.nix @@ -3,11 +3,24 @@ let mainUser = config.users.extraUsers.mainUser; in { - environment.systemPackages = with pkgs; [ - electrum - ]; + krebs.per-user.bch.packages = [ + pkgs.electron-cash + ]; + krebs.per-user.bitcoin.packages = [ + pkgs.electrum + ]; + krebs.per-user.ethereum.packages = [ + pkgs.go-ethereum + ]; users.extraUsers = { + bch = { + name = "bch"; + description = "user for bch stuff"; + home = "/home/bch"; + useDefaultShell = true; + createHome = true; + }; bitcoin = { name = "bitcoin"; description = "user for bitcoin stuff"; @@ -15,8 +28,16 @@ in { useDefaultShell = true; createHome = true; }; + ethereum = { + name = "ethereum"; + description = "user for ethereum stuff"; + home = "/home/ethereum"; + useDefaultShell = true; + createHome = true; + }; }; security.sudo.extraConfig = '' ${mainUser.name} ALL=(bitcoin) NOPASSWD: ALL + ${mainUser.name} ALL=(bch) NOPASSWD: ALL ''; } diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index a43dfa215..728e265f6 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -39,6 +39,7 @@ with import <stockholm/lib>; { from = "paypal@lassul.us"; to = lass.mail; } { from = "patreon@lassul.us"; to = lass.mail; } { from = "steam@lassul.us"; to = lass.mail; } + { from = "securityfocus@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index a66d08927..d3f5d1f39 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -38,6 +38,10 @@ let cgit.desc = "take all the computers hostage, they'll love you!"; cgit.section = "configuration"; }; + stockholm-issues = { + cgit.desc = "stockholm issues"; + cgit.section = "issues"; + }; the_playlist = { cgit.desc = "Good Music collection + tools"; cgit.section = "art"; diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index a90890aab..ee0c3f938 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -76,10 +76,12 @@ let and NOT tag:killed \ and NOT to:shackspace \ and NOT to:c-base \ + and NOT from:security-alert@hpe.com \ and NOT to:nix-devel"\ "Unread" "notmuch://?query=tag:unread"\ "shack" "notmuch://?query=to:shackspace"\ "c-base" "notmuch://?query=to:c-base"\ + "security" "notmuch://?query=to:securityfocus or from:security-alert@hpe.com"\ "nix" "notmuch://?query=to:nix-devel"\ "TODO" "notmuch://?query=tag:TODO"\ "Starred" "notmuch://?query=tag:*"\ diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix index b2b0c309a..29800dbeb 100644 --- a/lass/2configs/vim.nix +++ b/lass/2configs/vim.nix @@ -210,12 +210,12 @@ let vim = pkgs.symlinkJoin { name = "vim"; paths = [ - pkgs.vim (pkgs.writeDashBin "vim" '' set -efu (umask 0077; exec ${pkgs.coreutils}/bin/mkdir -p ${toString mkdirs}) exec ${pkgs.vim}/bin/vim "$@" '') + pkgs.vim ]; }; diff --git a/lass/5pkgs/init/default.nix b/lass/5pkgs/init/default.nix index 679187531..b386fa94b 100644 --- a/lass/5pkgs/init/default.nix +++ b/lass/5pkgs/init/default.nix @@ -46,7 +46,7 @@ pkgs.writeText "init" '' # dd if=/dev/zero bs=512 count=34 of=/dev/sda # TODO zero last 34 blocks (lsblk -bno SIZE /dev/sda) if ! test "$(blkid -o value -s PTTYPE "$disk")" = gpt; then - parted -a optimal "$disk" \ + parted -s -a optimal "$disk" \ mklabel gpt \ mkpart no-fs 0 1024KiB \ set 1 bios_grub on \ diff --git a/lass/source.nix b/lass/source.nix index 1d64e3059..7d60730f1 100644 --- a/lass/source.nix +++ b/lass/source.nix @@ -19,6 +19,6 @@ in # 87a4615 & 334ac4f # + acme permissions for groups # fd7a8f1 - ref = "a732dcf"; + ref = "d9c85b3"; }; } |