From 1f6270da038fe0142c4bc5e8f92386c1ed000bc7 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 3 May 2018 18:41:08 +0200 Subject: tv gitrepos: kops -> krops --- tv/2configs/gitrepos.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index c3418e7..a4e3aaf 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -42,7 +42,7 @@ let { kirk = { cgit.desc = "IRC tools"; }; - kops = { + krops = { cgit.desc = "deployment tools"; }; load-env = {}; -- cgit v1.2.3 From 19e98c2ed2a741d4628354fbad12320504f3c4b7 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 4 May 2018 17:15:50 +0200 Subject: j zsh: pin LS_COLORS rev --- jeschli/2configs/zsh.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jeschli/2configs/zsh.nix b/jeschli/2configs/zsh.nix index be5b661..0f6775e 100644 --- a/jeschli/2configs/zsh.nix +++ b/jeschli/2configs/zsh.nix @@ -53,8 +53,8 @@ eval $(dircolors -b ${pkgs.fetchFromGitHub { owner = "trapd00r"; repo = "LS_COLORS"; - rev = "master"; - sha256="05lh5w3bgj9h8d8lrbbwbzw8788709cnzzkl8yh7m1dawkpf6nlp"; + rev = "a75fca8545f91abb8a5f802981033ef54bf1eac0"; + sha256="1lzj0qnj89mzh76ha137mnz2hf86k278rh0y9x124ghxj9yqsnb4"; }}/LS_COLORS) #beautiful colors -- cgit v1.2.3 From f74a1e121dfc69dfca92c1e83c3abcc20c81b5a8 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 8 May 2018 19:25:59 +0200 Subject: tv nixpkgs: 53e6d67 -> 7cbf6ca --- tv/source.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tv/source.nix b/tv/source.nix index e5e5e04..14527d9 100644 --- a/tv/source.nix +++ b/tv/source.nix @@ -16,8 +16,7 @@ in { nixos-config.symlink = "stockholm/tv/1systems/${name}/config.nix"; nixpkgs.git = { - # nixos-17.09 - ref = mkDefault "53e6d671a9662922080635482b7e1c418d2cdc72"; + ref = mkDefault "7cbf6ca1c84dfc917c1a99524e082fb677501844"; url = https://github.com/NixOS/nixpkgs; }; secrets.file = getAttr builder { -- cgit v1.2.3 From abf30c53a9816ff218d7611f4e7ca26e07bac504 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 9 May 2018 11:11:50 +0200 Subject: krebs: 6tests -> 0tests --- nin/0tests/dummysecrets/hashedPasswords.nix | 1 + nin/0tests/dummysecrets/ssh.id_ed25519 | 0 nin/6tests/dummysecrets/hashedPasswords.nix | 1 - nin/6tests/dummysecrets/ssh.id_ed25519 | 0 nin/source.nix | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 nin/0tests/dummysecrets/hashedPasswords.nix create mode 100644 nin/0tests/dummysecrets/ssh.id_ed25519 delete mode 100644 nin/6tests/dummysecrets/hashedPasswords.nix delete mode 100644 nin/6tests/dummysecrets/ssh.id_ed25519 diff --git a/nin/0tests/dummysecrets/hashedPasswords.nix b/nin/0tests/dummysecrets/hashedPasswords.nix new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/nin/0tests/dummysecrets/hashedPasswords.nix @@ -0,0 +1 @@ +{} diff --git a/nin/0tests/dummysecrets/ssh.id_ed25519 b/nin/0tests/dummysecrets/ssh.id_ed25519 new file mode 100644 index 0000000..e69de29 diff --git a/nin/6tests/dummysecrets/hashedPasswords.nix b/nin/6tests/dummysecrets/hashedPasswords.nix deleted file mode 100644 index 0967ef4..0000000 --- a/nin/6tests/dummysecrets/hashedPasswords.nix +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/nin/6tests/dummysecrets/ssh.id_ed25519 b/nin/6tests/dummysecrets/ssh.id_ed25519 deleted file mode 100644 index e69de29..0000000 diff --git a/nin/source.nix b/nin/source.nix index 9fb2cb3..ae13c55 100644 --- a/nin/source.nix +++ b/nin/source.nix @@ -13,7 +13,7 @@ in evalSource (toString _file) { nixos-config.symlink = "stockholm/nin/1systems/${name}/config.nix"; secrets.file = getAttr builder { - buildbot = toString ; + buildbot = toString ; nin = "/home/nin/secrets/${name}"; }; stockholm.file = toString ; -- cgit v1.2.3 From 7208c2149243dae83ae00da8229e4dafa11329f1 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 9 May 2018 12:22:32 +0200 Subject: tv otpmenu: init --- tv/5pkgs/simple/otpmenu.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 tv/5pkgs/simple/otpmenu.nix diff --git a/tv/5pkgs/simple/otpmenu.nix b/tv/5pkgs/simple/otpmenu.nix new file mode 100644 index 0000000..b35e160 --- /dev/null +++ b/tv/5pkgs/simple/otpmenu.nix @@ -0,0 +1,15 @@ +{ dmenu, gnused, pass, writeDashBin, xdotool }: + +writeDashBin "otpmenu" '' + set -efu + + x=$( + ${pass}/bin/pass git ls-files '*/otp.gpg' \ + | ${gnused}/bin/sed 's:/otp\.gpg$::' \ + | ${dmenu}/bin/dmenu -f -p OTP + ) + + otp=$(${pass}/bin/pass otp code "$x/otp") + + printf %s "$otp" | ${xdotool}/bin/xdotool type -f - +'' -- cgit v1.2.3 From 15802fb477f51c580c10ee98f69cab310d769bee Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 9 May 2018 13:40:26 +0200 Subject: tv xmonad: add otpmenu --- tv/5pkgs/simple/xmonad-tv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/tv/5pkgs/simple/xmonad-tv/default.nix b/tv/5pkgs/simple/xmonad-tv/default.nix index d474b7e..cb59e85 100644 --- a/tv/5pkgs/simple/xmonad-tv/default.nix +++ b/tv/5pkgs/simple/xmonad-tv/default.nix @@ -133,6 +133,7 @@ myKeys conf = Map.fromList $ [ ((_4 , xK_Escape ), forkFile "/run/wrappers/bin/slock" [] Nothing) , ((_4S , xK_c ), kill) + , ((_4 , xK_o ), forkFile "${pkgs.otpmenu}/bin/otpmenu" [] Nothing) , ((_4 , xK_p ), forkFile "${pkgs.pass}/bin/passmenu" ["--type"] Nothing) , ((_4 , xK_x ), chooseAction spawnTermAt) -- cgit v1.2.3 From 7e8d0b67a5d3d96986e5fe6541ad9f28406c44f8 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 12 May 2018 18:51:43 +0200 Subject: tv urlwatch nixos: 17.09 -> 18.03 --- tv/2configs/urlwatch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix index 897def8..aa71be7 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -34,7 +34,7 @@ with import ; ## other - https://nixos.org/channels/nixos-17.09/git-revision + https://nixos.org/channels/nixos-18.03/git-revision https://nixos.org/channels/nixos-unstable/git-revision ## 2014-10-17 -- cgit v1.2.3 From d633848269a6ef23bb1ad7120c148070cd2f511d Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 12 Jun 2018 20:30:05 +0200 Subject: tv gitrepos: add nix-writers --- tv/2configs/gitrepos.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index a4e3aaf..6e4830a 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -54,6 +54,7 @@ let { netcup = { cgit.desc = "netcup command line interface"; }; + nix-writers = {}; populate = { cgit.desc = "source code installer"; }; -- cgit v1.2.3 From b74ea0ee6a44a4c3e2f8f42bd119c75758168ad6 Mon Sep 17 00:00:00 2001 From: nin Date: Thu, 14 Jun 2018 20:22:33 +0200 Subject: nin axon: add login manager & some programs --- nin/1systems/axon/config.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nin/1systems/axon/config.nix b/nin/1systems/axon/config.nix index 483a4f8..5e81afd 100644 --- a/nin/1systems/axon/config.nix +++ b/nin/1systems/axon/config.nix @@ -59,7 +59,11 @@ with lib; # nin config time.timeZone = "Europe/Berlin"; - services.xserver.enable = true; + services.xserver = { + enable = true; + + displayManager.lightdm.enable = true; + }; networking.networkmanager.enable = true; #networking.wireless.enable = true; @@ -76,12 +80,19 @@ with lib; #nixpkgs.config.steam.java = true; environment.systemPackages = with pkgs; [ + atom + chromium firefox git + htop + keepassx lmms networkmanagerapplet + openvpn python + ruby steam + taskwarrior thunderbird vim virtmanager @@ -109,7 +120,7 @@ with lib; Control + p ''; in { - enable = true; + enable = true; extraSessionCommands = '' ${pkgs.xbindkeys}/bin/xbindkeys -f ${xbindConfig} ''; -- cgit v1.2.3