From edd2cf0ec1f81722c4c8c9797a830c98c953bd5a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 7 Jun 2020 13:03:56 +0200 Subject: l vim: new colorscheme --- lass/2configs/vim.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'lass') 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 -- cgit v1.2.3 From 586ff0a72d4d3c97a6042fe47dc0c441e7288a27 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 7 Jun 2020 13:06:25 +0200 Subject: l hass: allow from wiregrill --- lass/2configs/hass/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') 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 = { -- cgit v1.2.3 From 4242c2ad0eff7a9bfaae456050232e745a2ac05c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 7 Jun 2020 13:06:54 +0200 Subject: l hass: lower dark sensitivity --- lass/2configs/hass/lib.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') 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"; -- cgit v1.2.3 From e425c80236046bfd74f1ed61b9cc3856fb17d50a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 7 Jun 2020 13:08:22 +0200 Subject: l pass: krebs.per-user -> users.users.*.packages --- lass/2configs/pass.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') 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 ]; -- cgit v1.2.3 From 0f01f2899f68b8e142610994da529b5893f2a5f6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 7 Jun 2020 13:09:08 +0200 Subject: l: readd morpheus.r --- lass/1systems/morpheus/config.nix | 25 ++++++++++++++++++++ lass/1systems/morpheus/physical.nix | 47 +++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 lass/1systems/morpheus/config.nix create mode 100644 lass/1systems/morpheus/physical.nix (limited to 'lass') 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 ; +{ + imports = [ + + + ]; + + 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 + + ]; + + 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" + ''; +} -- cgit v1.2.3 From bde301139df5474a72f79122f81feab1d6387a07 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 16 Jun 2020 19:58:40 +0200 Subject: fzfmenu: move to krebs --- lass/5pkgs/fzfmenu/default.nix | 55 ------------------------------------------ 1 file changed, 55 deletions(-) delete mode 100644 lass/5pkgs/fzfmenu/default.nix (limited to 'lass') 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" -'' -- cgit v1.2.3