Update richese to new flake layout

3 files changed, 112 insertions, 72 deletions

diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index f94a4a2..ba8a861 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -9,77 +9,110 @@
   documentation.dev.enable = true;
   documentation.man.enable = true;
 
-  environment.systemPackages = builtins.attrValues {
-    inherit (pkgs)
-      bc
-      binutils
-      conntrack-tools
-      coreutils
-      curl
-      dict
-      diffutils
-      dig
-      dmidecode
-      encfs
-      enscript
-      ffmpeg
-      file
-      findutils
-      flac
-      fortune
-      fping
-      git
-      imagemagick
-      inxi
-      iotop
-      ipcalc
-      iperf
-      iputils
-      jq
-      lame
-      lshw
-      lsof
-      mkvtoolnix
-      mutt
-      netcat-openbsd
-      nix-index
-      nmap
-      ntfs3g
-      oath-toolkit
-      openldap
-      openssl
-      patchelf
-      pciutils
-      poppler_utils
-      powertop
-      psmisc
-      pv
-      pwgen
-      qemu_kvm
-      qrencode
-      radeontop
-      recode
-      sg3_utils
-      socat
-      speedtest-cli
-      sqlite
-      sshfs
-      stoken
-      sysstat
-      tcpdump
-      traceroute
-      tree
-      tshark
-      unrar
-      unzip
-      usbutils
-      vim
-      wget
-      whois
-      wireguard-tools
-      x265
-      zip;
-  };
+  #environment.systemPackages = builtins.attrValues {
+  #  inherit (pkgs)
+  environment.systemPackages = with pkgs; [
+    acl
+    ansible
+    bash
+    bc
+    bind
+    binutils
+    bpftools
+    bzip2
+    colordiff
+    conntrack-tools
+    coreutils
+    cpio
+    curl
+    dict
+    diffutils
+    dig
+    dmidecode
+    encfs
+    enscript
+    ethtool
+    expect
+    ffmpeg
+    file
+    findutils
+    fio
+    flac
+    fortune
+    fping
+    ghostscript
+    git
+    gnugrep
+    gnupatch
+    gnused
+    gnutar
+    gzip
+    imagemagick
+    inxi
+    iotop
+    ipcalc
+    iperf
+    iproute2
+    iputils
+    jq
+    lame
+    less
+    lshw
+    lsof
+    lvm2
+    mkvtoolnix
+    mutt
+    nano
+    netcat-openbsd
+    nettools
+    nix-index
+    nmap
+    ntfs3g
+    oath-toolkit
+    openldap
+    openssl
+    patchelf
+    pciutils
+    poppler_utils
+    powertop
+    procps
+    psmisc
+    pv
+    pwgen
+    qemu_kvm
+    qrencode
+    radeontop
+    recode
+    rsync
+    sg3_utils
+    socat
+    speedtest-cli
+    sqlite
+    sshfs
+    stoken
+    strace
+    sysstat
+    tcpdump
+    traceroute
+    tree
+    tshark
+    unixtools.xxd
+    unrar
+    unzip
+    usbutils
+    util-linux
+    vim
+    wdiff
+    weechat
+    wget
+    whois
+    wireguard-tools
+    x265
+    xz
+    zip
+    zstd#;
+  ];
+  #};
 
   hardware.enableRedistributableFirmware = true;
 
diff --git a/hosts/common/optional/dev.nix b/hosts/common/optional/dev.nix
index 8278387..c25ab08 100644
--- a/hosts/common/optional/dev.nix
+++ b/hosts/common/optional/dev.nix
@@ -2,11 +2,18 @@
 {
   environment.systemPackages = builtins.attrValues {
     inherit (pkgs)
+      autoconf
+      automake
       cargo
+      cmake
       gcc
       go
       nasm
+      perl
+      pkg-config
+      python3
       rustc
+      virtualenv
       yasm
       zig;
   };
diff --git a/hosts/common/optional/services/xorg.nix b/hosts/common/optional/services/xorg.nix
index ae8eb13..05db6f7 100644
--- a/hosts/common/optional/services/xorg.nix
+++ b/hosts/common/optional/services/xorg.nix
@@ -27,6 +27,7 @@
     vdpauinfo
     vlc
     vulkan-tools
+    wireshark
     x11vnc
     xclip
     xdotool
@@ -79,7 +80,6 @@
 
     enable = true;
     libinput.enable = true;
-    videoDrivers = [ "amdgpu" ];
     xkb.layout = "us";
     xkb.options = "caps:super,compose:ralt";
   };