diff options
| author | tv <tv@krebsco.de> | 2020-06-16 20:03:01 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2020-06-16 20:03:01 +0200 |
| commit | 15d1fb2627088149d1f46fc5946e1fc53b8f8d54 (patch) | |
| tree | 27d37c1cc642087175c6699093dbd7a421bb5e57 /lass/2configs | |
| parent | eb60b27e2b89bc92bfccab35bb6937023df3b518 (diff) | |
| parent | bde301139df5474a72f79122f81feab1d6387a07 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs')
| -rw-r--r-- | lass/2configs/hass/default.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/hass/lib.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/pass.nix | 2 | ||||
| -rw-r--r-- | lass/2configs/vim.nix | 23 |
4 files changed, 14 insertions, 14 deletions
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 |