From ed86ef65dcb5b6f48dd44940d00415e56ad9b5d0 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Wed, 16 Oct 2019 10:33:57 +0200 Subject: [PATCH] WIP: remove old base nix config --- nixos.bak/configuration.nix | 60 ------------------------------------- nixos.bak/nix-home.nix | 38 ----------------------- nixos.bak/packages.nix | 41 ------------------------- nixos.bak/users.nix | 40 ------------------------- 4 files changed, 179 deletions(-) delete mode 100644 nixos.bak/configuration.nix delete mode 100644 nixos.bak/nix-home.nix delete mode 100644 nixos.bak/packages.nix delete mode 100644 nixos.bak/users.nix diff --git a/nixos.bak/configuration.nix b/nixos.bak/configuration.nix deleted file mode 100644 index 0885d93..0000000 --- a/nixos.bak/configuration.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - # Use the GRUB 2 boot loader. - boot.loader.grub.enable = true; - boot.loader.grub.version = 2; - boot.loader.grub.device = "/dev/sda"; - boot.kernel.sysctl."vm.overcommit_memory"= 1; - - # Select internationalisation properties. - i18n = { - consoleFont = "Lat2-Terminus16"; - consoleKeyMap = "us"; - defaultLocale = "en_US.UTF-8"; - }; - - # Set your time zone. - time.timeZone = "Europe/Oslo"; - - networking.search = [ "itpartner.no" "itpartner.intern" ]; - - services.openssh.enable = true; - services.nfs.server.enable = true; - - # virtualisation.vmware.guest.enable = true; - - programs.fish.enable = true; - programs.tmux.enable = true; - - security.rtkit.enable = true; - - disabledModules = [ - # "services/cluster/kubernetes/default.nix" - # "services/cluster/kubernetes/dns.nix" - # "services/cluster/kubernetes/dashboard.nix" - ]; - - imports = [ - ./users.nix - ./packages.nix - # ./overlays/dns.nix - # ./overlays/dashboard.nix - # ./overlays/kubernetes.nix - ]; - - # nixpkgs.overlays = [ - # (import ./overlays/overlays.nix) - # ]; - - users.extraUsers.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCGrS7PzjPhVnHftYRw7iCD5K1UXnxtFMS0zVLcGH3u daniel.stien@itpartner.no" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPVcSD8T9m7xuSRWrhEDEUvPrP8hxYW0WndYjTjtCjY3 itpartner@k0-0" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no" - ]; - - # The NixOS release to be compatible with for stateful data such as databases. - system.stateVersion = "19.03"; - system.autoUpgrade.enable = false; - -} diff --git a/nixos.bak/nix-home.nix b/nixos.bak/nix-home.nix deleted file mode 100644 index 670e262..0000000 --- a/nixos.bak/nix-home.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, python, fetchFromGitHub }: -stdenv.mkDerivation rec { - version = "0.3.2"; - name = "nix-home-${version}"; - - src = fetchFromGitHub { - rev = version; - repo = "nix-home"; - owner = "sheenobu"; - sha256 = "0l27vg651s9mmq0sypxgrrdq9386rhjbgh9wilzm3dmr0d2j9mwa"; - }; - - patchPhase = '' - substituteInPlace nix-home --replace "NIXHOME" "$out/nix/lib" - substituteInPlace nix-build-home --replace "NIXHOME" "$out/nix/lib" - ''; - - installPhase = '' - # install binary - mkdir -p $out/bin - cp nix-home $out/bin - cp nix-build-home $out/bin - chmod +x $out/bin/nix-build-home - chmod +x $out/bin/nix-home - - # install nix-home lib - mkdir -p $out/nix - cp -a lib $out/nix - ''; - - meta = { - homepage = https://github.com/sheenobu/nix-home; - description = "Per-user configuration management via Nix"; - licenses = [ stdenv.lib.license.mit ]; - platforms = stdenv.lib.platforms.unix; - inherit version; - }; -} diff --git a/nixos.bak/packages.nix b/nixos.bak/packages.nix deleted file mode 100644 index 6616fbb..0000000 --- a/nixos.bak/packages.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, pkgs, ... }: -{ - nixpkgs.config.allowUnfree = true; - - environment.systemPackages = - with pkgs; - let - sys = [ - stdenv - findutils - coreutils - patchelf - binutils - psmisc - iputils - nettools - netcat - rsync - htop - iotop - zsh - fish - wget - neovim - file - bc - git - python - nix-prefetch-git - home-manager - ]; - k8s = [ - ebtables - ethtool - socat - docker - ]; - in - k8s ++ - sys; -} diff --git a/nixos.bak/users.nix b/nixos.bak/users.nix deleted file mode 100644 index db43d61..0000000 --- a/nixos.bak/users.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ pkgs, ... }: -{ - # Define a user account. Don't forget to set a password with ‘passwd’. - users.extraUsers.itpartner = { - description = "Serit IT Partner Tromsø"; - home = "/home/itpartner"; - extraGroups = [ - "users" - "wheel" - "root" - "adm" - "docker" - ]; - uid = 1000; - isNormalUser = true; - createHome = true; - useDefaultShell = false; - shell = pkgs.fish; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDCGrS7PzjPhVnHftYRw7iCD5K1UXnxtFMS0zVLcGH3u daniel.stien@itpartner.no" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDUqiMnQAj5ZkFLjtBLGkVJy2/uH/dnql/92BUMs8a/W7QULnocC2y08dlD+gITP+iKUFYasrYvqBgzKWvxsJmEodkMNr7iBUlKdjiVZNWEM38IgoZbd0iDYIUyDyIlGWRfshc00FX3ecplmylZcDXqFKtGSAafQAt8wZdNmzaHiC0hBYz3x9i2x0lWcq7UXXdNd581BMNj1FqObIoKetKy+4MxZP3oc061HjIxx9m5D6krsWjz+tgkTgjrJGaMKz8aOiLYDw4F9iQSAISeVBSGNU9laPAmbi4t8tcgvBYZVo76GuhLMxRGj6Om2vOJDvbX2mYrSAJ8g5279gbC7mJddEczCyiewt5bRYVzajC8k46bAsxMMkXOVT6YnCz/0X0d8FGlA96NPn2W9oohD2Jx0fVPNJ055AcxU+WYWe5WvCYUAePaUJW/EZSPPY08di4yoJzaJASXCrXtd7aZCh2ndxbZrn3m2KAbjuoBo69CenQGkBM+HjefMFnr9QCiqz2UbrotdQCzPUG1nwhqN409vg7VYQdWuN7wtFBVK7geG/dAJZBbxngNCdcCC4fQUuXV/DjQqOkCkItCYyTRHUHX/Qrdsfm6wrJfcZy5CZQkz9H2/HuMwG7jaiACI+5nAz0A7S6eKnlkoSM9sAOVsP6S4m9eLwbK6GfM4hoeCjNisQ== dag.brattli@itpartner.no" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWEYtm1u3HiK4q4J5su6iKWfFjLXt9CIlm9Z9BfJYVj jens@itpartner@Jens-HP3" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no" - ]; - }; - - security.sudo.wheelNeedsPassword = false; - security.sudo.extraConfig = - '' - Defaults:root,%wheel env_keep+=LOCALE_ARCHIVE - Defaults:root,%wheel env_keep+=NIX_PATH - Defaults:root,%wheel env_keep+=TERMINFO_DIRS - Defaults env_keep+=SSH_AUTH_SOCK - Defaults lecture=never - Defaults shell_noargs - root ALL=(ALL) SETENV: ALL - %wheel ALL=(ALL) NOPASSWD: ALL, SETENV: ALL - ''; -}