diff options
Diffstat (limited to 'hosts')
| -rw-r--r-- | hosts/common/core/default.nix | 175 | ||||
| -rw-r--r-- | hosts/common/optional/dev.nix | 7 | ||||
| -rw-r--r-- | hosts/common/optional/services/xorg.nix | 2 | ||||
| -rw-r--r-- | hosts/ginaz/default.nix | 2 | ||||
| -rw-r--r-- | hosts/richese/default.nix | 166 |
5 files changed, 117 insertions, 235 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"; }; diff --git a/hosts/ginaz/default.nix b/hosts/ginaz/default.nix index 97f14d9..f3ef8e2 100644 --- a/hosts/ginaz/default.nix +++ b/hosts/ginaz/default.nix @@ -40,5 +40,7 @@ nftables.enable = true; }; + services.xserver.videoDrivers = [ "amdgpu" ]; + system.stateVersion = "23.11"; } 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"; |