Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cd/master'

Browse Source
This commit is contained in:
tv 2015-11-07 19:22:54 +01:00
commit b6e616bb13
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
krebs/3modules/tv/default.nix
View File

@ -159,7 +159,7 @@ with lib;
}; };
secure = true; secure = true;
ssh.privkey.path = <secrets/ssh.id_ed25519>; ssh.privkey.path = <secrets/ssh.id_ed25519>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILMPMh3nHxVcPqM+LrkK7eYxNJY1ShBXOTg1vlSR45wx"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMIHmwXHV7E9UGuk4voVCADjlLkyygqNw054jvrsPn5t root@nomic";
}; };
ok = { ok = {
nets = { nets = {
@ -277,7 +277,8 @@ with lib;
}; };
}; };
secure = true; secure = true;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID554niVFWomJjuSuQoiCdMUYrCFPpPzQuaoXXYYDxlw"; ssh.privkey.path = <secrets/ssh.id_ed25519>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPnjfceKuHNQu7S4eYFN1FqgzMqiL7haNZMh2ZLhvuhK root@xu";
}; };
}; };
users = addNames rec { users = addNames rec {

7
tv/1systems/wu.nix
View File

@ -44,31 +44,24 @@ with lib;
bind # dig bind # dig
cac cac
dic dic
ff
file file
get get
gitAndTools.qgit
gnupg21 gnupg21
haskellPackages.hledger haskellPackages.hledger
htop htop
jq jq
manpages manpages
mkpasswd mkpasswd
mpv
netcat netcat
nix-repl nix-repl
nmap nmap
nq nq
p7zip p7zip
pavucontrol
posix_man_pages posix_man_pages
pssh
push push
qrencode qrencode
sxiv
texLive texLive
tmux tmux
zathura
#ack #ack
#apache-httpd #apache-httpd

8
tv/1systems/xu.nix
View File

@ -47,29 +47,23 @@ with lib;
bind # dig bind # dig
#cac #cac
dic dic
ff
file file
gitAndTools.qgit #xserver
gnupg21 gnupg21
haskellPackages.hledger haskellPackages.hledger
htop htop
jq jq
manpages manpages
mkpasswd mkpasswd
mpv #xserver
netcat netcat
nix-repl nix-repl
nmap nmap
nq nq
p7zip p7zip
pavucontrol #xserver pass
posix_man_pages posix_man_pages
#pssh
qrencode qrencode
sxiv #xserver
texLive texLive
tmux tmux
zathura #xserver
#ack #ack
#apache-httpd #apache-httpd

6
tv/2configs/xserver/default.nix
View File

@ -34,7 +34,13 @@ let
}; };
environment.systemPackages = [ environment.systemPackages = [
pkgs.ff
pkgs.gitAndTools.qgit
pkgs.mpv
pkgs.pavucontrol
pkgs.slock pkgs.slock
pkgs.sxiv
pkgs.zathura
]; ];
security.setuidPrograms = [ security.setuidPrograms = [