diff options
-rw-r--r-- | krebs/3modules/default.nix | 1 | ||||
-rw-r--r-- | krebs/3modules/lass/default.nix | 10 | ||||
-rw-r--r-- | krebs/3modules/realwallpaper.nix (renamed from lass/3modules/realwallpaper.nix) | 8 | ||||
-rw-r--r-- | krebs/5pkgs/default.nix | 1 | ||||
-rw-r--r-- | krebs/5pkgs/realwallpaper.nix (renamed from lass/5pkgs/realwallpaper.nix) | 0 | ||||
-rw-r--r-- | lass/1systems/echelon.nix | 1 | ||||
-rw-r--r-- | lass/2configs/desktop-base.nix | 4 | ||||
-rw-r--r-- | lass/2configs/git.nix | 2 | ||||
-rw-r--r-- | lass/2configs/realwallpaper.nix | 6 | ||||
-rw-r--r-- | lass/3modules/default.nix | 1 | ||||
-rw-r--r-- | lass/5pkgs/default.nix | 1 |
11 files changed, 19 insertions, 16 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 430194405..edfbde9ba 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -14,6 +14,7 @@ let ./iptables.nix ./nginx.nix ./Reaktor.nix + ./realwallpaper.nix ./retiolum.nix ./urlwatch.nix ]; diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index aa071270c..9dbc597ed 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -34,9 +34,11 @@ with import ../../4lib { inherit lib; }; ''; }; }; + ssh.privkey.path = <secrets/ssh.id_ed25519>; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL21QDOEFdODFh6WAfNp6odrXo15pEsDQuGJfMu/cKzK"; }; fastpoke = { - dc = "lass"; #dc = "cac"; + dc = "lass"; nets = rec { internet = { addrs4 = ["193.22.164.36"]; @@ -95,6 +97,8 @@ with import ../../4lib { inherit lib; }; ''; }; }; + ssh.privkey.path = <secrets/ssh.id_ed25519>; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7oYx7Lbkc0wPYNp92LQF93DCtxsGzOkVD91FJQzVZl"; }; uriel = { cores = 1; @@ -119,6 +123,8 @@ with import ../../4lib { inherit lib; }; ''; }; }; + ssh.privkey.path = <secrets/ssh.id_ed25519>; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBryIo/Waw8SWvlQ0+5I+Bd/dJgcMd6iPXtELS6gQXoc"; secure = true; }; mors = { @@ -145,6 +151,8 @@ with import ../../4lib { inherit lib; }; }; }; secure = true; + ssh.privkey.path = <secrets/ssh.id_ed25519>; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINAMPlIG+6u75GJ3kvsPF6OoIZsU+u8ZQ+rdviv5fNMD"; }; }; diff --git a/lass/3modules/realwallpaper.nix b/krebs/3modules/realwallpaper.nix index 85dd35233..d5c1aeabd 100644 --- a/lass/3modules/realwallpaper.nix +++ b/krebs/3modules/realwallpaper.nix @@ -8,12 +8,10 @@ let mkIf ; - lpkgs = import ../5pkgs { inherit pkgs; }; - - cfg = config.lass.realwallpaper; + cfg = config.krebs.realwallpaper; out = { - options.lass.realwallpaper = api; + options.krebs.realwallpaper = api; config = mkIf cfg.enable imp; }; @@ -85,7 +83,7 @@ let serviceConfig = { Type = "simple"; - ExecStart = "${lpkgs.realwallpaper}/realwallpaper.sh"; + ExecStart = "${pkgs.realwallpaper}/realwallpaper.sh"; User = "realwallpaper"; }; }; diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix index 72c113b90..616992b95 100644 --- a/krebs/5pkgs/default.nix +++ b/krebs/5pkgs/default.nix @@ -24,6 +24,7 @@ rec { pssh = callPackage ./pssh {}; passwdqc-utils = callPackage ./passwdqc-utils {}; Reaktor = callPackage ./Reaktor {}; + realwallpaper = callPackage ./realwallpaper.nix {}; youtube-tools = callPackage ./youtube-tools {}; execve = name: { filename, argv, envp ? {}, destination ? "" }: diff --git a/lass/5pkgs/realwallpaper.nix b/krebs/5pkgs/realwallpaper.nix index 4fea977ec..4fea977ec 100644 --- a/lass/5pkgs/realwallpaper.nix +++ b/krebs/5pkgs/realwallpaper.nix diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix index 45f7ebd70..b301b504a 100644 --- a/lass/1systems/echelon.nix +++ b/lass/1systems/echelon.nix @@ -13,6 +13,7 @@ in { ../2configs/retiolum.nix ../2configs/realwallpaper-server.nix ../2configs/privoxy-retiolum.nix + ../2configs/git.nix { networking.interfaces.enp2s1.ip4 = [ { diff --git a/lass/2configs/desktop-base.nix b/lass/2configs/desktop-base.nix index ed84edefa..4e693997d 100644 --- a/lass/2configs/desktop-base.nix +++ b/lass/2configs/desktop-base.nix @@ -28,14 +28,14 @@ in { environment.systemPackages = with pkgs; [ powertop + sxiv + much #window manager stuff haskellPackages.xmobar haskellPackages.yeganesh dmenu2 xlibs.fontschumachermisc - - sxiv ]; fonts.fonts = [ diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix index 78e6f0baa..595936da5 100644 --- a/lass/2configs/git.nix +++ b/lass/2configs/git.nix @@ -51,7 +51,7 @@ let nick = config.krebs.build.host.name; channel = "#retiolum"; server = "cd.retiolum"; - verbose = config.krebs.build.host.name == "cloudkrebs"; + verbose = config.krebs.build.host.name == "echelon"; }; }; }; diff --git a/lass/2configs/realwallpaper.nix b/lass/2configs/realwallpaper.nix index f1c8861e1..c69cb1660 100644 --- a/lass/2configs/realwallpaper.nix +++ b/lass/2configs/realwallpaper.nix @@ -1,9 +1,5 @@ { config, ... }: { - imports = [ - ../3modules/realwallpaper.nix - ]; - - lass.realwallpaper.enable = true; + krebs.realwallpaper.enable = true; } diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix index 9b6211278..9de987bf3 100644 --- a/lass/3modules/default.nix +++ b/lass/3modules/default.nix @@ -3,6 +3,5 @@ _: { imports = [ ./xresources.nix - ./realwallpaper.nix ]; } diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix index 6954c6a2c..7427cb620 100644 --- a/lass/5pkgs/default.nix +++ b/lass/5pkgs/default.nix @@ -13,5 +13,4 @@ rec { ublock = callPackage ./firefoxPlugins/ublock.nix {}; vimperator = callPackage ./firefoxPlugins/vimperator.nix {}; }; - realwallpaper = callPackage ./realwallpaper.nix {}; } |