Update richese to new flake layout

1 files changed, 3 insertions, 163 deletions

diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index f068784..a404535 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -7,130 +7,15 @@
     zfs.devNodes = "/dev/disk/by-label";
   };
 
-  documentation.dev.enable = true;
-  documentation.man.enable = true;
-
   environment.systemPackages = with pkgs; [
-    acl
-    ansible
-    autoconf
-    automake
-    bash
-    bc
-    bind
-    binutils
-    bpftools
-    bzip2
-    cmake
-    colordiff
-    conntrack-tools
-    coreutils
-    cpio
-    curl
-    diffutils
-    dig
-    dmenu
-    enscript
-    ethtool
-    evince
-    expect
-    feh
-    file
-    findutils
-    fio
-    fortune
-    fping
-    gcc
-    gcr
-    geeqie
-    ghostscript
-    #gimp-with-plugins
-    gimp
-    git
-    gnugrep
-    gnupatch
-    gnused
-    gnutar
-    google-chrome
-    gv
-    gzip
-    helm
-    i3
-    i3status
-    imagemagick
-    inkscape
-    inxi
-    iotop
-    ipcalc
-    iperf
-    iproute2
-    iputils
-    jq
-    less
-    libreoffice
-    lshw
-    lsof
-    lvm2
-    mariadb
-    mutt
-    nano
-    netcat-openbsd
-    nettools
-    nix-index
-    nmap
-    oath-toolkit
-    openldap
-    openssl
     openstackclient
-    patchelf
-    (pass.withExtensions (ext: with ext; [pass-otp])) 
-    pass
-    pavucontrol
-    pciutils
-    perl
-    pkg-config
-    polkit_gnome
-    poppler_utils
-    procps
-    psmisc
-    pv
-    pwgen
-    python3
-    qpwgraph
-    qrencode
-    recode
-    rsync
-    sqlite
-    st
-    stoken
-    strace
-    sysstat
-    tcpdump
-    traceroute
-    tree
-    unixtools.xxd
-    unrar
-    unzip
-    util-linux
-    vim
-    virtualenv
-    wdiff
-    weechat
-    wget
-    wireshark
-    whois
-    xclip
-    xdotool
-    xorg.xdpyinfo
-    xsnow
-    xz
-    zip
-    zstd
   ];
 
   imports = [
     ./hardware-configuration.nix
     ../common/core
+    ../common/optional/db.nix
+    ../common/optional/dev.nix
     ../common/optional/pipewire.nix
     ../common/optional/services/openssh.nix
     ../common/optional/services/xorg.nix
@@ -145,52 +30,7 @@
     nftables.enable = true;
   };
 
-  programs.atop.enable = true;
-  programs.firefox.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-  programs.iftop.enable = true;
-  programs.mtr.enable = true;
-  programs.tmux.enable = true;
-  programs.zsh.enable = true;
-
-  security.polkit = {
-    enable = true;
-    extraConfig = ''
-      polkit.addRule(function(action, subject) {
-        if (
-          subject.isInGroup("users")
-            && (
-              action.id == "org.freedesktop.login1.reboot" ||
-              action.id == "org.freedesktop.login1.reboot-multiple-sessions" ||
-              action.id == "org.freedesktop.login1.power-off" ||
-              action.id == "org.freedesktop.login1.power-off-multiple-sessions"
-            )
-          )
-        {
-          return polkit.Result.YES;
-        }
-      })
-    '';
-  };
-
-  systemd = {
-    user.services.polkit-gnome-authentication-agent-1 = {
-      description = "polkit-gnome-authentication-agent-1";
-      wantedBy = [ "graphical-session.target" ];
-      wants = [ "graphical-session.target" ];
-      after = [ "graphical-session.target" ];
-      serviceConfig = {
-          Type = "simple";
-          ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-          Restart = "on-failure";
-          RestartSec = 1;
-          TimeoutStopSec = 10;
-        };
-    };
-  };
+  services.xserver.videoDrivers = [ "vmware" ];
 
   system.stateVersion = "23.11";