diff --git a/configs/cloud.nix b/configs/cloud.nix index 693acef..11aac2e 100644 --- a/configs/cloud.nix +++ b/configs/cloud.nix @@ -40,8 +40,9 @@ homeros.id = "HSOL72W-MMN346W-C3WCWCH-OTRKJYG-MY2WWV6-P7JUHN7-5WYYYRV-ZMH4KAA"; scardanelli.id = "7CZYHEX-3CSFDQU-PEEMYHG-6XGQ2ZD-KGVUWH5-GFRB2XK-FP57ERX-7APZUQU"; rilke.id = "NYNNHXP-7JMSTXG-SVNOPWD-RWXCCCL-CBOVBEI-X4QPLF4-NJA5G2P-RSGYRQQ"; + wilde.id = "R6DEBD7-G5RYDKN-VFA3HPO-WX4DNVI-373F7OQ-AW5MZTT-3L4BDVW-Y6ROEAF"; }; - folders."${config.users.users.me.home}/cloud/syncthing/common".peers = [ "homeros" "scardanelli" ]; + folders."${config.users.users.me.home}/cloud/syncthing/common".peers = [ "homeros" "scardanelli" "wilde" ]; folders."${config.users.users.me.home}/cloud/syncthing/library".peers = lib.attrNames peers; folders."${config.users.users.me.home}/cloud/syncthing/mundoiu".peers = lib.attrNames peers; }; diff --git a/configs/i3.nix b/configs/i3.nix index 0ea3ff6..b10fdbc 100644 --- a/configs/i3.nix +++ b/configs/i3.nix @@ -6,7 +6,7 @@ let move-to-new-workspace = pkgs.unstable.writers.writeDash "new-workspace" '' i3-msg move container to workspace $(($(i3-msg -t get_workspaces | tr , '\n' | grep '"num":' | cut -d : -f 2 | sort -rn | head -1) + 1)) ''; - wifi-interface = { scardanelli = "wlp2s0"; homeros = "wlp3s0"; }.${config.networking.hostName}; + wifi-interface = { scardanelli = "wlp2s0"; homeros = "wlp3s0"; wilde = "wwp0s29u1u4i6"; }.${config.networking.hostName}; in with config.niveum; { services.xserver = { windowManager.default = "i3"; diff --git a/configs/retiolum.nix b/configs/retiolum.nix index 0cc39bb..79b421c 100644 --- a/configs/retiolum.nix +++ b/configs/retiolum.nix @@ -15,6 +15,14 @@ ipv4 = "10.243.2.1"; ipv6 = "42:0:3c46:53e:e63d:e62a:56ea:c705"; }; + catullus = { + ipv4 = "10.243.2.3"; + ipv6 = "42:0:3c46:3ec0:7aad:d1d5:9842:da4c"; + }; + wilde = { + ipv4 = "10.243.2.4"; + ipv6 = ""; + }; }.${config.networking.hostName}; environment.etc."tinc/retiolum/rsa_key.priv" = { diff --git a/configs/ssh.nix b/configs/ssh.nix index f1f24f3..3b9e6d5 100644 --- a/configs/ssh.nix +++ b/configs/ssh.nix @@ -4,6 +4,7 @@ let sshKey = { homeros = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDn13Y6CznabMvKJPIrr/dj1TX4boe8F98yc3FDElJeprQo2RXlDzjg/po9/lHTHaoC5yQUjlRg/AnI4vizYkn2sqJebAeSPahmpS+l0eFnjZgsqds2cCFqSPB6Qc5YEkGRhN4aq/ABz0jdFJLBYOYGxuuXowYxyNrqrItxDR7tF7upG+kVjYiDoP/qFm8C7zv6Zy8aoehNbzf8HlIJd0ITbMr/vUftNsQ8C84QmbZljReHmchPgE8GUfVLTlCORkhndbvNX3jXo+75y7JOIZZ6193FZHM4seg/VSDWYLJtpnhttD1w6qmiLrlimqbJB9ihoXq2eDmQ+4zo6hxQ6pFH6P0xQClJ0hxVWn6hEM3rkMwoMfbq4v54gKJsYxcGdnwjAX6d9DQv/QVjmVZffKWsGGoC7uz7bdmc0akVKi+GLSPOx8sJwXqvyvFStfqLaweVcuikUqQ72JLK7pZyliA7na6KuQ1PE3LTpfSr0lbBJ73xtS2rU1nF/Oe5zwA4LX5s/QeDVmS86D8acUrSCO62pBB3Yv8go0KR4mEvfxLiUWV6gR2uTeIPXvo4ouYFZqyABAGybjUATlGCXJaeHd/y/VWkpIB8ocqNESlRMCEe4TrYjw91AEmYBL6kWIeop3dyhovm3dTB3fQvC97kbL16wuXBrOcN4lEc+56ShhmvdQ== kieran.meinhardt@gmail.com"; scardanelli = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC19H0FhSNWcfBRPKzbTVSMJikIWZl0CoM8zCm+/3fdMgoaLRpeZWe/AfDK6b4qOjk/sez/J0JUFCGr+JbMwjsduoazsuQowu9L9DLP9Q5UkJje4BD7MHznaeu9/XfVng/MvyaEWArA/VUJeKQesHe76tR511/+n3+bdzlIh8Zw/3wfFxmg1OTNA99/vLkXrQzHDTuV/yj1pxykL4xFtN0OIssW1IKncJeKtkO/OHGT55ypz52Daj6bNKqvxiTuzeEhv5M+5ppyIPcRf1uj/7IaPKttCgZAntEqBTIR9MbyXFeAZVayzaFnLl2okeam5XreeZbj+Y1h2ZjxiIuWoab3MLndSekVfLtfa63gtcWIf8CIvZO2wJoH8v73y0U78JsfWVaTM09ZCfFlHHA/bWqZ6laAjW+mWLO/c77DcYkB3IBzaMVNfc6mfTcGFIC+biWeYpKgA0zC6rByUPbmbIoMueP9zqJwqUaM90Nwd6559inBB107/BK3Ktb3b+37mMCstetIPB9e4EFpGMjhmnL/G81jS53ACWLXJYzt7mKU/fEsiW93MtaB+Le46OEC18y/4G8F7p/nnH7i0kO74ukxbnc4PlpiM7iWT6ra2Cyy+nzEgdXCNXywIxr05TbCQDwX6/NY8k7Hokgdfyz+1Pq3sX0yCcWRPaoB26YF12KYFQ== kieran.meinhardt@gmail.com"; + wilde = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk kfm@wilde"; }; in { services.xserver.displayManager.sessionCommands = "${pkgs.openssh}/bin/ssh-add"; diff --git a/deploy.nix b/deploy.nix index 1e1c020..d127e38 100644 --- a/deploy.nix +++ b/deploy.nix @@ -1,6 +1,7 @@ { catullus-ssh ? "root@catullus.r:22022" , scardanelli-ssh ? "root@scardanelli.r:22022" , homeros-ssh ? "root@homeros.r:22022" +, wilde-ssh ? "root@192.168.178.31:22" }: let krops = builtins.fetchGit { @@ -45,6 +46,7 @@ let dir = toString ~/.password-store; inherit name; }; + art.file = toString ./art; }; systems.scardanelli = pkgs.krops.writeDeploy "deploy-scardanelli" { @@ -57,6 +59,11 @@ let target = homeros-ssh; }; + systems.wilde = pkgs.krops.writeDeploy "deploy-wilde" { + source = regular ./systems/wilde "wilde"; + target = wilde-ssh; + }; + systems.catullus = pkgs.krops.writeDeploy "deploy-catullus" { source = minimal ./systems/catullus { secrets.pass = { diff --git a/systems/wilde/configuration.nix b/systems/wilde/configuration.nix index 77277c7..5dd26dc 100644 --- a/systems/wilde/configuration.nix +++ b/systems/wilde/configuration.nix @@ -1,89 +1,16 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - { config, pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; + imports = [ + + ./hardware-configuration.nix + + ]; - # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "wilde"; # Define your hostname. - - networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.wireless.networks.Aether.psk = "Kein ding sei wo das wort gebricht."; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - # i18n = { - # consoleFont = "Lat2-Terminus16"; - # consoleKeyMap = "us"; - # defaultLocale = "en_US.UTF-8"; - # }; - - # Set your time zone. - time.timeZone = "Europe/Berlin"; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - wget vim git - ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { enable = true; enableSSHSupport = true; }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # sound.enable = true; - # hardware.pulseaudio.enable = true; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - # services.xserver.layout = "us"; - # services.xserver.xkbOptions = "eurosign:e"; - - # Enable touchpad support. - # services.xserver.libinput.enable = true; - - # Enable the KDE Desktop Environment. - # services.xserver.displayManager.sddm.enable = true; - # services.xserver.desktopManager.plasma5.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # }; - - # This value determines the NixOS release with which your system is to be - # compatible, in order to avoid breaking some software such as database - # servers. You should change this only after NixOS release notes say you - # should. - system.stateVersion = "19.03"; # Did you read the comment? + networking.hostName = "wilde"; + system.stateVersion = "19.03"; } diff --git a/systems/wilde/hardware-configuration.nix b/systems/wilde/hardware-configuration.nix index adbebf6..b7ee4ee 100644 --- a/systems/wilde/hardware-configuration.nix +++ b/systems/wilde/hardware-configuration.nix @@ -1,6 +1,3 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, ... }: {