From 43d36bb3d76b1fc83198337e2b16709c31b9e53e Mon Sep 17 00:00:00 2001 From: hexchen Date: Mon, 25 Jan 2021 11:32:08 +0000 Subject: [PATCH] remove hexchen from the project I am no longer comfortable with putting resources into this project and therefore request to be removed from all infrastructure. I am still happy to help out with software I set up, but I will no longer actively maintain any services. As far as possible, I will remove myself from all access groups or other privileged positions related to this project. Essentially, I'm stepping down as a maintainer. I still reserve the right to make changes via the established change processes (Merge Requests as well as Issues in the meta-repositories), but I will no longer make direct changes to infrastructure without going through those review processes. --- common/hexchen.nix | 9 ------- common/users.nix | 11 --------- desktop/default.nix | 40 +++++++++---------------------- desktop/streaming.nix | 9 ------- desktop/sway.nix | 42 --------------------------------- hosts/hainich/configuration.nix | 1 - hosts/hainich/services/mail.nix | 1 - hosts/nixda/configuration.nix | 1 - 8 files changed, 11 insertions(+), 103 deletions(-) delete mode 100644 common/hexchen.nix delete mode 100644 desktop/sway.nix diff --git a/common/hexchen.nix b/common/hexchen.nix deleted file mode 100644 index c15e3bc..0000000 --- a/common/hexchen.nix +++ /dev/null @@ -1,9 +0,0 @@ -{config, lib, pkgs, ...}: - -let - sources = import ../nix/sources.nix; -in { - imports = [ - (sources.nix-hexchen + "/users/hexchen") - ]; -} diff --git a/common/users.nix b/common/users.nix index e1cd07b..c926449 100644 --- a/common/users.nix +++ b/common/users.nix @@ -1,10 +1,6 @@ { config, pkgs, lib, ... }: { - imports = [ - ./hexchen.nix - ]; - home-manager.useGlobalPkgs = true; users.users = { @@ -12,13 +8,6 @@ openssh.authorizedKeys.keys = with pkgs.lib; concatLists (mapAttrsToList (name: user: if elem "wheel" user.extraGroups then user.openssh.authorizedKeys.keys else []) config.users.users); }; - # all the actual config is imported from hexchen's nixfiles - hexchen = { - uid = lib.mkForce 1000; - isNormalUser = true; - extraGroups = [ "wheel" ]; - }; - stuebinm = { uid = 1005; isNormalUser = true; diff --git a/desktop/default.nix b/desktop/default.nix index 619068b..1092570 100644 --- a/desktop/default.nix +++ b/desktop/default.nix @@ -7,35 +7,17 @@ allowUnfree = true; }; # boot.plymouth.splashBeforeUnlock = true; - users.users.schweby.packages = config.users.users.hexchen.packages - ++ (with pkgs; [ alacritty picom feh copyq polybar cinnamon.nemo rofi arandr notepadqq nomacs bat ]); - users.users.hexchen = { - packages = with pkgs; [ - pulsemixer pavucontrol - firefox git kitty j4-dmenu-desktop bemenu - breeze-qt5 mako - mpv youtube-dl - wl-clipboard mumble - xdg_utils - slurp grim libnotify - _1password-gui - # gnome3.nautilus - ]; - extraGroups = [ "video" "audio" ]; - }; - home-manager.users.hexchen = { - gtk = { - enable = true; - iconTheme = { - name = "Adwaita"; - package = pkgs.gnome3.adwaita-icon-theme; - }; - theme = { - name = "Adwaita"; - package = pkgs.gnome3.adwaita-icon-theme; - }; - }; - }; + users.users.schweby.packages = with pkgs; [ + pulsemixer pavucontrol + firefox git kitty j4-dmenu-desktop bemenu + breeze-qt5 mako + mpv youtube-dl + wl-clipboard mumble + xdg_utils + slurp grim libnotify + _1password-gui + # gnome3.nautilus + ] ++ (with pkgs; [ alacritty picom feh copyq polybar cinnamon.nemo rofi arandr notepadqq nomacs bat ]); sound.enable = true; hardware.pulseaudio = { diff --git a/desktop/streaming.nix b/desktop/streaming.nix index 953e594..7410c22 100644 --- a/desktop/streaming.nix +++ b/desktop/streaming.nix @@ -7,13 +7,4 @@ }; environment.systemPackages = with pkgs; [ obs-studio ]; - - home-manager.users.hexchen = { - programs.obs-studio = { - enable = true; - plugins = with pkgs; [ - obs-wlrobs obs-v4l2sink - ]; - }; - }; } diff --git a/desktop/sway.nix b/desktop/sway.nix deleted file mode 100644 index 12fbdda..0000000 --- a/desktop/sway.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - fonts.fonts = with pkgs; [ font-awesome nerdfonts ]; - users.users.hexchen.packages = with pkgs; [ ]; - home-manager.users.hexchen = { - programs.waybar = { - enable = true; - - settings = [{ - modules-left = [ "sway/workspaces" "sway/mode" ]; - modules-center = [ "sway/window" ]; - modules-right = [ "pulseaudio" "network" "cpu" "memory" "temperature" "battery" "clock" "tray" ]; - - modules = { - battery = { - states = { - good = 95; - warning = 30; - critical = 15; - }; - format = "{capacity}% {icon}"; - format-charging = "{capacity}% "; - format-plugged = "{capacity}% "; - format-alt = "{time} {icon}"; - format-icons = ["" "" "" "" ""]; - }; - network = { - format-wifi = "{essid} ({signalStrength}%) "; - format-ethernet = "{ifname}: {ipaddr}/{cidr} "; - format-linked = "{ifname} (No IP) "; - format-disconnected = "Disconnected ⚠"; - format-alt = "{ifname}: {ipaddr}/{cidr}"; - }; - }; - }]; - }; - }; - - programs.sway.enable = true; - -} diff --git a/hosts/hainich/configuration.nix b/hosts/hainich/configuration.nix index 96ffd40..db675c1 100644 --- a/hosts/hainich/configuration.nix +++ b/hosts/hainich/configuration.nix @@ -73,7 +73,6 @@ users.users.root = { openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDNVUDKx9sukRkb6INny432+2HZBWx/qIEAOvngF1qcj hexchen@montasch" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL6JWi0MBDz0Zy4zjauQv28xYmHyapb8D4zeesq91LLE schweby@txsbcct" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCvmrk3i04tXfrSlZtHFbG3o6lQgh3ODMWmGDING4TJ4ctidexmMNY15IjVjzXZgQSET1uKLDLITiaPsii8vaWERZfjm3jjub845mpKkKv48nYdM0eCbv7n604CA3lwoB5ebRgULg4oGTi60rQ4trFf3iTkJfmiLsieFBZz7l+DfgeDEjDNSJcrkOggGBrjE5vBXoDimdkNh8kBNwgMDj1kPR/FHDqybSd5hohCJ5FzQg9vzl/x/H1rzJJKYPO4svSgHkYNkeoL84IZNeHom+UEHX0rw2qAIEN6AiHvNUJR38relvQYxbVdDSlaGN3g26H2ehsmolf+U0uQlRAXTHo0NbXNVYOfijFKL/jWxNfH0aRycf09Lu60oY54gkqS/J0GoQe/OGNq1Zy72DI+zAwEzyCGfSDbAgVF7Y3mU2HqcqGqNzu7Ade5oCbLmkT7yzDM3x6IsmT1tO8dYiT8Qv+zFAECkRpw3yDkJkPOxNKg10oM318whMTtM3yqntE90hk= schweby@taxusbaccata" ]; diff --git a/hosts/hainich/services/mail.nix b/hosts/hainich/services/mail.nix index b6ea1a4..1b6cf6e 100644 --- a/hosts/hainich/services/mail.nix +++ b/hosts/hainich/services/mail.nix @@ -94,7 +94,6 @@ in { "zauberberg@hacc.space" ]; "admin@hacc.space" = [ - "hexchen@hacc.space" "schweby@hacc.space" "zauberberg@hacc.space" ]; diff --git a/hosts/nixda/configuration.nix b/hosts/nixda/configuration.nix index 6a8f382..1a168d1 100644 --- a/hosts/nixda/configuration.nix +++ b/hosts/nixda/configuration.nix @@ -7,7 +7,6 @@ ../../common ../../desktop ../../desktop/streaming.nix - ../../desktop/sway.nix ../../desktop/gnome.nix ];