summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2020-06-16 20:03:01 +0200
committertv <tv@krebsco.de>2020-06-16 20:03:01 +0200
commit15d1fb2627088149d1f46fc5946e1fc53b8f8d54 (patch)
tree27d37c1cc642087175c6699093dbd7a421bb5e57 /lass
parenteb60b27e2b89bc92bfccab35bb6937023df3b518 (diff)
parentbde301139df5474a72f79122f81feab1d6387a07 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass')
-rw-r--r--lass/1systems/morpheus/config.nix25
-rw-r--r--lass/1systems/morpheus/physical.nix47
-rw-r--r--lass/2configs/hass/default.nix1
-rw-r--r--lass/2configs/hass/lib.nix2
-rw-r--r--lass/2configs/pass.nix2
-rw-r--r--lass/2configs/vim.nix23
-rw-r--r--lass/5pkgs/fzfmenu/default.nix55
7 files changed, 86 insertions, 69 deletions
diff --git a/lass/1systems/morpheus/config.nix b/lass/1systems/morpheus/config.nix
new file mode 100644
index 000000000..c3a8ea6c8
--- /dev/null
+++ b/lass/1systems/morpheus/config.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, ... }:
+with import <stockholm/lib>;
+{
+ imports = [
+ <stockholm/lass>
+ <stockholm/lass/2configs/retiolum.nix>
+ ];
+
+ krebs.build.host = config.krebs.hosts.morpheus;
+
+ networking.wireless.enable = false;
+ networking.networkmanager.enable = true;
+
+ services.logind.lidSwitch = "ignore";
+ services.logind.lidSwitchDocked = "ignore";
+
+ environment.systemPackages = with pkgs; [
+ gitAndTools.hub
+ nix-review
+ firefox
+ ];
+
+ services.openssh.forwardX11 = true;
+ programs.x2goserver.enable = true;
+}
diff --git a/lass/1systems/morpheus/physical.nix b/lass/1systems/morpheus/physical.nix
new file mode 100644
index 000000000..3fb03cda4
--- /dev/null
+++ b/lass/1systems/morpheus/physical.nix
@@ -0,0 +1,47 @@
+{
+ imports = [
+ ./config.nix
+ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+ ];
+
+ boot.loader.grub.enable = true;
+ boot.loader.grub.version = 2;
+ boot.loader.grub.efiSupport = true;
+ boot.loader.grub.efiInstallAsRemovable = true;
+ boot.loader.grub.device = "nodev";
+
+ networking.hostId = "06442b9a";
+
+ fileSystems."/" = {
+ device = "/dev/pool/root";
+ fsType = "btrfs";
+ };
+
+ fileSystems."/boot" = {
+ device = "/dev/disk/by-uuid/1F60-17C6";
+ fsType = "vfat";
+ };
+
+ fileSystems."/home" = {
+ device = "/dev/pool/home";
+ fsType = "btrfs";
+ };
+
+ fileSystems."/tmp" = {
+ device = "tmpfs";
+ fsType = "tmpfs";
+ options = ["nosuid" "nodev" "noatime"];
+ };
+ boot.initrd.luks = {
+ cryptoModules = [ "aes" "sha512" "sha1" "xts" ];
+ devices = [{
+ name = "luksroot";
+ device = "/dev/nvme0n1p3";
+ }];
+ };
+
+ services.udev.extraRules = ''
+ SUBSYSTEM=="net", ATTR{address}=="f8:59:71:a9:05:65", NAME="wl0"
+ SUBSYSTEM=="net", ATTR{address}=="54:e1:ad:4f:06:83", NAME="et0"
+ '';
+}
diff --git a/lass/2configs/hass/default.nix b/lass/2configs/hass/default.nix
index 639ba3d3f..a48c61a69 100644
--- a/lass/2configs/hass/default.nix
+++ b/lass/2configs/hass/default.nix
@@ -14,6 +14,7 @@ with import ./lib.nix { inherit lib; };
{ predicate = "-i docker0 -p tcp --dport 1883"; target = "ACCEPT"; } # mosquitto
{ predicate = "-i int0 -p tcp --dport 8123"; target = "ACCEPT"; } # hass
{ predicate = "-i retiolum -p tcp --dport 8123"; target = "ACCEPT"; } # hass
+ { predicate = "-i wiregrill -p tcp --dport 8123"; target = "ACCEPT"; } # hass
];
services.home-assistant = {
diff --git a/lass/2configs/hass/lib.nix b/lass/2configs/hass/lib.nix
index 555cfae28..9281a19ec 100644
--- a/lass/2configs/hass/lib.nix
+++ b/lass/2configs/hass/lib.nix
@@ -99,7 +99,7 @@ rec {
conditions = [
{
condition = "template";
- value_template = "{{ trigger.to_state.attributes.illuminance < 13000 }}";
+ value_template = "{{ trigger.to_state.attributes.illuminance < 7500 }}";
}
{
condition = "template";
diff --git a/lass/2configs/pass.nix b/lass/2configs/pass.nix
index 156ebcae7..6b2a0142a 100644
--- a/lass/2configs/pass.nix
+++ b/lass/2configs/pass.nix
@@ -1,7 +1,7 @@
{ config, pkgs, ... }:
{
- krebs.per-user.lass.packages = with pkgs; [
+ users.users.lass.packages = with pkgs; [
(pass.withExtensions (ext: [ ext.pass-otp ]))
gnupg
];
diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index f55886e2e..0e4ac5394 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -127,7 +127,6 @@ let
extra-runtimepath = concatMapStringsSep "," (pkg: "${pkg.rtp}") [
pkgs.vimPlugins.ack-vim
- pkgs.vimPlugins.Gundo
pkgs.vimPlugins.undotree
pkgs.vimPlugins.vim-go
pkgs.vimPlugins.fzf-vim
@@ -155,26 +154,26 @@ let
let colors_name = ${toJSON name}
- hi Normal ctermbg=235
- hi Comment ctermfg=242
- hi Constant ctermfg=062
- hi Identifier ctermfg=068
+ hi Normal ctermbg=016
+ hi Comment ctermfg=255
+ hi Constant ctermfg=229
+ hi Identifier ctermfg=123
hi Function ctermfg=041
hi Statement ctermfg=167
hi PreProc ctermfg=167
- hi Type ctermfg=041
+ hi Type ctermfg=046
hi Delimiter ctermfg=251
- hi Special ctermfg=062
+ hi Special ctermfg=146
- hi Garbage ctermbg=088
- hi TabStop ctermbg=016
- hi NBSP ctermbg=094
+ hi Garbage ctermbg=124
+ hi TabStop ctermbg=020
+ hi NBSP ctermbg=056
hi NarrowNBSP ctermbg=097
hi Todo ctermfg=174 ctermbg=NONE
- hi NixCode ctermfg=148
+ hi NixCode ctermfg=190
hi NixData ctermfg=149
- hi NixQuote ctermfg=150
+ hi NixQuote ctermfg=119
hi diffNewFile ctermfg=207
hi diffFile ctermfg=207
diff --git a/lass/5pkgs/fzfmenu/default.nix b/lass/5pkgs/fzfmenu/default.nix
deleted file mode 100644
index 64e95d233..000000000
--- a/lass/5pkgs/fzfmenu/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.writeDashBin "fzfmenu" ''
- set -efu
- PROMPT=">"
- for i in "$@"
- do
- case $i in
- -p)
- PROMPT="$2"
- shift
- shift
- break
- ;;
- -l)
- # no reason to filter number of lines
- LINES="$2"
- shift
- shift
- break
- ;;
- -i)
- # we do this anyway
- shift
- break
- ;;
- *)
- echo "Unknown option $1" >&2
- shift
- ;;
- esac
- done
- INPUT=$(${pkgs.coreutils}/bin/cat)
- OUTPUT="$(${pkgs.coreutils}/bin/mktemp)"
- if [ -z ''${TERM+x} ]; then #check if we can print fzf in the shell
- ${pkgs.rxvt_unicode}/bin/urxvt \
- -name fzfmenu -title fzfmenu \
- -e ${pkgs.dash}/bin/dash -c \
- "echo \"$INPUT\" | ${pkgs.fzf}/bin/fzf \
- --history=/dev/null \
- --print-query \
- --prompt=\"$PROMPT\" \
- --reverse \
- > \"$OUTPUT\"" 2>/dev/null
- else
- echo "$INPUT" | ${pkgs.fzf}/bin/fzf \
- --history=/dev/null \
- --print-query \
- --prompt="$PROMPT" \
- --reverse \
- > "$OUTPUT"
- fi
- ${pkgs.coreutils}/bin/tail -1 "$OUTPUT"
- ${pkgs.coreutils}/bin/rm "$OUTPUT"
-''