aboutsummaryrefslogtreecommitdiffstats
path: root/hosts/common
diff options
context:
space:
mode:
Diffstat (limited to 'hosts/common')
-rw-r--r--hosts/common/core/default.nix186
-rw-r--r--hosts/common/core/nix.nix9
-rw-r--r--hosts/common/core/shells.nix9
-rw-r--r--hosts/common/optional/db.nix9
-rw-r--r--hosts/common/optional/dev.nix33
-rw-r--r--hosts/common/optional/ebooks.nix6
-rw-r--r--hosts/common/optional/games.nix27
-rw-r--r--hosts/common/optional/google-authenticator.nix9
-rw-r--r--hosts/common/optional/misc.nix57
-rw-r--r--hosts/common/optional/multimedia.nix15
-rw-r--r--hosts/common/optional/pipewire.nix12
-rw-r--r--hosts/common/optional/sdr.nix9
-rw-r--r--hosts/common/optional/services/dhcp.nix8
-rw-r--r--hosts/common/optional/services/nsd/bitgnome.net.zone8
-rw-r--r--hosts/common/optional/services/wayland.nix93
-rw-r--r--hosts/common/optional/services/xorg.nix99
-rw-r--r--hosts/common/optional/sound.nix90
-rw-r--r--hosts/common/users/don/default.nix32
-rw-r--r--hosts/common/users/nipsy/default.nix4
19 files changed, 419 insertions, 296 deletions
diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index 771fa0d..8a0fe8a 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -9,99 +9,99 @@
documentation.dev.enable = true;
documentation.man.enable = true;
- environment.systemPackages = with pkgs; [
- acl
- age
- bash
- bc
- bind
- binutils
- bpftools
- bpftrace
- bzip2
- colordiff
- conntrack-tools
- coreutils
- cpio
- curl
- diceware
- diffutils
- dig
- dmidecode
- elinks
- ethtool
- file
- findutils
- fping
- git
- gnugrep
- gnupatch
- gnused
- gnutar
- gptfdisk
- gzip
- htop
- iproute2
- iputils
- jq
- less
- lshw
- lsof
- lvm2
- lynx
- moreutils
- nano
- ncurses
- netcat-openbsd
- nettools
- nix-index
- nmap
- ntfs3g
- nvd
- oath-toolkit
- openldap
- openssl
- p7zip
- parted
- patchelf
- pciutils
- procps
- progress
- psmisc
- pv
- pwgen
- qemu_kvm
- recode
- rsync
- sg3_utils
- smartmontools
- socat
- sops
- sqlite
- ssh-to-age
- ssh-to-pgp
- stoken
- strace
- sysstat
- tcpdump
- tftp-hpa
- traceroute
- tree
- tshark
- unixtools.xxd
- unrar
- unzip
- usbutils
- util-linux
- vim
- wdiff
- wget
- whois
- wireguard-tools
- xkcdpass
- xz
- zip
- zstd
+ environment.systemPackages = [
+ pkgs.acl
+ pkgs.age
+ pkgs.bash
+ pkgs.bc
+ pkgs.bind
+ pkgs.binutils
+ pkgs.bpftools
+ pkgs.bpftrace
+ pkgs.bzip2
+ pkgs.colordiff
+ pkgs.conntrack-tools
+ pkgs.coreutils
+ pkgs.cpio
+ pkgs.curl
+ pkgs.diceware
+ pkgs.diffutils
+ pkgs.dig
+ pkgs.dmidecode
+ pkgs.elinks
+ pkgs.ethtool
+ pkgs.file
+ pkgs.findutils
+ pkgs.fping
+ pkgs.git
+ pkgs.gnugrep
+ pkgs.gnupatch
+ pkgs.gnused
+ pkgs.gnutar
+ pkgs.gptfdisk
+ pkgs.gzip
+ pkgs.htop
+ pkgs.iproute2
+ pkgs.iputils
+ pkgs.jq
+ pkgs.less
+ pkgs.lshw
+ pkgs.lsof
+ pkgs.lvm2
+ pkgs.lynx
+ pkgs.moreutils
+ pkgs.nano
+ pkgs.ncurses
+ pkgs.netcat-openbsd
+ pkgs.nettools
+ pkgs.nix-index
+ pkgs.nmap
+ pkgs.ntfs3g
+ pkgs.nvd
+ pkgs.oath-toolkit
+ pkgs.openldap
+ pkgs.openssl
+ pkgs.p7zip
+ pkgs.parted
+ pkgs.patchelf
+ pkgs.pciutils
+ pkgs.procps
+ pkgs.progress
+ pkgs.psmisc
+ pkgs.pv
+ pkgs.pwgen
+ pkgs.qemu_kvm
+ pkgs.recode
+ pkgs.rsync
+ pkgs.sg3_utils
+ pkgs.smartmontools
+ pkgs.socat
+ pkgs.sops
+ pkgs.sqlite
+ pkgs.ssh-to-age
+ pkgs.ssh-to-pgp
+ pkgs.stoken
+ pkgs.strace
+ pkgs.sysstat
+ pkgs.tcpdump
+ pkgs.tftp-hpa
+ pkgs.traceroute
+ pkgs.tree
+ pkgs.tshark
+ pkgs.unixtools.xxd
+ pkgs.unrar
+ pkgs.unzip
+ pkgs.usbutils
+ pkgs.util-linux
+ pkgs.vim
+ pkgs.wdiff
+ pkgs.wget
+ pkgs.whois
+ pkgs.wireguard-tools
+ pkgs.xkcdpass
+ pkgs.xz
+ pkgs.zip
+ pkgs.zstd
];
hardware.enableRedistributableFirmware = true;
diff --git a/hosts/common/core/nix.nix b/hosts/common/core/nix.nix
index 14252d8..c6279dc 100644
--- a/hosts/common/core/nix.nix
+++ b/hosts/common/core/nix.nix
@@ -24,6 +24,13 @@ in {
};
- systemd.services."nix-daemon".environment.TMPDIR = build-tmp;
+ systemd = {
+ services."nix-daemon".environment.TMPDIR = build-tmp;
+ user.services."nix-gc" = {
+ description = "Garbage collection for user profiles";
+ script = "/run/current-system/sw/bin/nix-collect-garbage --delete-older-than 30d";
+ startAt = "daily";
+ };
+ };
}
diff --git a/hosts/common/core/shells.nix b/hosts/common/core/shells.nix
index 0469b8c..f02ec63 100644
--- a/hosts/common/core/shells.nix
+++ b/hosts/common/core/shells.nix
@@ -1,8 +1,7 @@
{ pkgs, ... }:
{
- environment.systemPackages = builtins.attrValues {
- inherit (pkgs)
- bash
- zsh;
- };
+ environment.systemPackages = [
+ pkgs.bash
+ pkgs.zsh
+ ];
}
diff --git a/hosts/common/optional/db.nix b/hosts/common/optional/db.nix
index af6766e..d4410bd 100644
--- a/hosts/common/optional/db.nix
+++ b/hosts/common/optional/db.nix
@@ -1,8 +1,7 @@
{ pkgs, ... }:
{
- environment.systemPackages = builtins.attrValues {
- inherit (pkgs)
- mariadb
- postgresql;
- };
+ environment.systemPackages = [
+ pkgs.mariadb
+ pkgs.postgresql
+ ];
}
diff --git a/hosts/common/optional/dev.nix b/hosts/common/optional/dev.nix
index c25ab08..8238424 100644
--- a/hosts/common/optional/dev.nix
+++ b/hosts/common/optional/dev.nix
@@ -1,20 +1,19 @@
{ pkgs, ... }:
{
- environment.systemPackages = builtins.attrValues {
- inherit (pkgs)
- autoconf
- automake
- cargo
- cmake
- gcc
- go
- nasm
- perl
- pkg-config
- python3
- rustc
- virtualenv
- yasm
- zig;
- };
+ environment.systemPackages = [
+ pkgs.autoconf
+ pkgs.automake
+ pkgs.cargo
+ pkgs.cmake
+ pkgs.gcc
+ pkgs.go
+ pkgs.nasm
+ pkgs.perl
+ pkgs.pkg-config
+ pkgs.python3
+ pkgs.rustc
+ pkgs.virtualenv
+ pkgs.yasm
+ pkgs.zig
+ ];
}
diff --git a/hosts/common/optional/ebooks.nix b/hosts/common/optional/ebooks.nix
index e25a76d..1805b7a 100644
--- a/hosts/common/optional/ebooks.nix
+++ b/hosts/common/optional/ebooks.nix
@@ -1,8 +1,8 @@
{ pkgs, ... }:
{
- environment.systemPackages = with pkgs; [
- libgourou
- calibre
+ environment.systemPackages = [
+ pkgs.libgourou
+ pkgs.calibre
];
services.udisks2.enable = true;
diff --git a/hosts/common/optional/games.nix b/hosts/common/optional/games.nix
index 39a07cd..71bcd95 100644
--- a/hosts/common/optional/games.nix
+++ b/hosts/common/optional/games.nix
@@ -1,23 +1,14 @@
{ pkgs, ... }:
{
- #environment.systemPackages = builtins.attrValues {
- # inherit (pkgs)
- # godot_4
- # mame
- # mednafen
- # mednaffe
- # winetricks;
- #};
-
- environment.systemPackages = with pkgs; [
- godot_4
- mame
- mame.tools
- mednafen
- mednaffe
- protontricks
- winetricks
- wineWowPackages.stagingFull
+ environment.systemPackages = [
+ #pkgs.master.godot
+ pkgs.mame
+ pkgs.mame.tools
+ pkgs.mednafen
+ pkgs.mednaffe
+ pkgs.protontricks
+ pkgs.winetricks
+ pkgs.master.wineWowPackages.stagingFull
];
programs.steam = {
diff --git a/hosts/common/optional/google-authenticator.nix b/hosts/common/optional/google-authenticator.nix
index 09079d8..721346e 100644
--- a/hosts/common/optional/google-authenticator.nix
+++ b/hosts/common/optional/google-authenticator.nix
@@ -1,10 +1,9 @@
{ pkgs, ... }:
{
- environment.systemPackages = builtins.attrValues {
- inherit (pkgs)
- #other
- google-authenticator;
- };
+ environment.systemPackages = [
+ #pkgs.other
+ pkgs.google-authenticator
+ ];
security.pam.services = {
chfn.googleAuthenticator.enable = true;
diff --git a/hosts/common/optional/misc.nix b/hosts/common/optional/misc.nix
index 492d13f..c634c34 100644
--- a/hosts/common/optional/misc.nix
+++ b/hosts/common/optional/misc.nix
@@ -1,37 +1,38 @@
{ pkgs, ... }:
{
- environment.systemPackages = with pkgs; [
- ansible
- aspell
- aspellDicts.en
- aspellDicts.en-computers
- aspellDicts.en-science
- dict
- encfs
- enscript
- expect
- fio
- fortune
- ghostscript
- imagemagick
- inxi
- iotop
- ipcalc
- iperf
- mutt
- poppler_utils
- powertop
- qrencode
- radeontop
- speedtest-cli
- sshfs
- (weechat.override {
+ environment.systemPackages = [
+ pkgs.amdgpu_top
+ pkgs.ansible
+ pkgs.aspell
+ pkgs.aspellDicts.en
+ pkgs.aspellDicts.en-computers
+ pkgs.aspellDicts.en-science
+ pkgs.dict
+ pkgs.encfs
+ pkgs.enscript
+ pkgs.expect
+ pkgs.fio
+ pkgs.fortune
+ pkgs.ghostscript
+ pkgs.imagemagick
+ pkgs.inxi
+ pkgs.iotop
+ pkgs.ipcalc
+ pkgs.iperf
+ pkgs.mutt
+ pkgs.poppler_utils
+ pkgs.powertop
+ pkgs.qrencode
+ pkgs.radeontop
+ pkgs.speedtest-cli
+ pkgs.sshfs
+ (pkgs.weechat.override {
configure = { availablePlugins, ...}: {
plugins = with availablePlugins; [
(perl.withPackages(p: [ p.PodParser ]))
] ++ [ python ];
- scripts = with pkgs.weechatScripts; [
- wee-slack
+ scripts = [
+ pkgs.weechatScripts.wee-slack
];
};
})
diff --git a/hosts/common/optional/multimedia.nix b/hosts/common/optional/multimedia.nix
index f519992..03f8c03 100644
--- a/hosts/common/optional/multimedia.nix
+++ b/hosts/common/optional/multimedia.nix
@@ -1,13 +1,10 @@
{ pkgs, ... }:
{
- #environment.systemPackages = builtins.attrValues {
- # inherit (pkgs)
- environment.systemPackages = with pkgs; [
- ffmpeg
- flac
- lame
- mkvtoolnix-cli
- x265#;
+ environment.systemPackages = [
+ pkgs.ffmpeg
+ pkgs.flac
+ pkgs.lame
+ pkgs.mkvtoolnix-cli
+ pkgs.x265
];
- #};
}
diff --git a/hosts/common/optional/pipewire.nix b/hosts/common/optional/pipewire.nix
index da69705..ef50b9c 100644
--- a/hosts/common/optional/pipewire.nix
+++ b/hosts/common/optional/pipewire.nix
@@ -1,11 +1,11 @@
{ pkgs, ... }:
{
- environment.systemPackages = with pkgs; [
- easyeffects
- pamixer
- pavucontrol
- master.pwvucontrol
- qpwgraph
+ environment.systemPackages = [
+ pkgs.easyeffects
+ pkgs.pamixer
+ pkgs.pavucontrol
+ pkgs.pwvucontrol
+ pkgs.qpwgraph
];
security.pam.loginLimits = [
diff --git a/hosts/common/optional/sdr.nix b/hosts/common/optional/sdr.nix
index 8e1e5d2..8362605 100644
--- a/hosts/common/optional/sdr.nix
+++ b/hosts/common/optional/sdr.nix
@@ -1,10 +1,9 @@
{ pkgs, ... }:
{
- environment.systemPackages = builtins.attrValues {
- inherit (pkgs)
- fldigi
- sdrconnect;
- };
+ environment.systemPackages = [
+ pkgs.fldigi
+ pkgs.sdrconnect
+ ];
services.udev.extraRules = ''
SUBSYSTEM=="usb",ENV{DEVTYPE}=="usb_device",ATTRS{idVendor}=="1df7",ATTRS{idProduct}=="2500",MODE:="0666"
diff --git a/hosts/common/optional/services/dhcp.nix b/hosts/common/optional/services/dhcp.nix
index 3eed193..36f8bdb 100644
--- a/hosts/common/optional/services/dhcp.nix
+++ b/hosts/common/optional/services/dhcp.nix
@@ -7,10 +7,10 @@
"tftp/undionly.kpxe".source = "${pkgs.ipxe}/undionly.kpxe";
};
- systemPackages = with pkgs; [
- ipxe
- tftp-hpa
- wol
+ systemPackages = [
+ pkgs.ipxe
+ pkgs.tftp-hpa
+ pkgs.wol
];
};
diff --git a/hosts/common/optional/services/nsd/bitgnome.net.zone b/hosts/common/optional/services/nsd/bitgnome.net.zone
index 038a860..06a93a8 100644
--- a/hosts/common/optional/services/nsd/bitgnome.net.zone
+++ b/hosts/common/optional/services/nsd/bitgnome.net.zone
@@ -3,7 +3,7 @@ $ORIGIN bitgnome.net.
$TTL 1h
@ in soa ns.bitgnome.net. nipsy.bitgnome.net. (
- 2025033101 ; serial
+ 2025062901 ; serial
1d ; refresh
2h ; retry
4w ; expire
@@ -29,7 +29,7 @@ $TTL 1h
; name servers
ns in a 5.161.149.85
ns in aaaa 2a01:4ff:f0:e164::1
-ns2 in a 67.5.119.0
+ns2 in a 174.31.3.240
; srv records
_xmpp-client._tcp 5m in srv 0 0 5222 bitgnome.net.
@@ -67,10 +67,10 @@ mta-sts 5m in cname @
;royder in cname @
; external machines
-arrakis 1m in a 67.5.119.0
+arrakis 1m in a 174.31.3.240
;darkstar 1m in a 66.69.213.114
;nb 1m in a 67.10.209.108
;terraria 1m in a 128.83.27.4
;caladan 1m in a 104.130.129.241
;caladan 1m in aaaa 2001:4800:7818:101:be76:4eff:fe03:db44
-darkstar 1m in a 67.5.119.0
+darkstar 1m in a 174.31.3.240
diff --git a/hosts/common/optional/services/wayland.nix b/hosts/common/optional/services/wayland.nix
new file mode 100644
index 0000000..20c9996
--- /dev/null
+++ b/hosts/common/optional/services/wayland.nix
@@ -0,0 +1,93 @@
+{ config, lib, pkgs, ... }:
+{
+ environment.systemPackages = [
+ pkgs.chafa
+ pkgs.evince
+ pkgs.feh
+ pkgs.gcr
+ pkgs.geeqie
+ pkgs.ghostty
+ pkgs.gimp
+ #pkgs.gimp-with-plugins
+ pkgs.google-chrome
+ pkgs.grim
+ pkgs.gv
+ pkgs.inkscape
+ pkgs.kdePackages.okular
+ pkgs.libreoffice
+ pkgs.libva-utils
+ pkgs.mako
+ pkgs.mangohud
+ pkgs.mesa-demos
+ pkgs.mpv
+ pkgs.polkit_gnome
+ pkgs.rdesktop
+ pkgs.read-edid
+ pkgs.slurp
+ pkgs.st
+ pkgs.sxiv
+ pkgs.tigervnc
+ pkgs.turbovnc
+ pkgs.vdpauinfo
+ pkgs.vlc
+ pkgs.vulkan-tools
+ pkgs.wireshark
+ pkgs.wl-clipboard
+ pkgs.x11vnc
+ pkgs.xclip
+ pkgs.xdotool
+ pkgs.xorg.appres
+ pkgs.xorg.editres
+ pkgs.xorg.xdpyinfo
+ pkgs.xorg.xev
+ pkgs.xscreensaver
+ pkgs.xsnow
+ pkgs.xterm
+ ];
+
+ programs = {
+ firefox = {
+ enable = true;
+ package = pkgs.master.firefox;
+ };
+
+ gamemode.enable = true;
+
+ steam.gamescopeSession.enable = true;
+
+ sway = {
+ enable = true;
+ wrapperFeatures.gtk = true;
+ };
+ };
+
+ security = {
+ pam = {
+ loginLimits = [
+ { domain = "@users"; item = "rtprio"; type = "-"; value = 1; }
+ ];
+ };
+ };
+
+ services = {
+ blueman.enable = true;
+ libinput.enable = true;
+ printing.enable = true;
+ };
+
+ 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;
+ };
+ };
+ };
+}
diff --git a/hosts/common/optional/services/xorg.nix b/hosts/common/optional/services/xorg.nix
index 7dccdd3..e0150f4 100644
--- a/hosts/common/optional/services/xorg.nix
+++ b/hosts/common/optional/services/xorg.nix
@@ -1,46 +1,44 @@
-{ pkgs, ... }:
+{ config, lib, pkgs, ... }:
{
- #environment.systemPackages = builtins.attrValues {
- # inherit (pkgs)
- environment.systemPackages = with pkgs; [
- chafa
- evince
- feh
- gcr
- geeqie
- ghostty
- gimp
- #gimp-with-plugins
- google-chrome
- gv
- inkscape
- libreoffice
- libva-utils
- mesa-demos
- mpv
- polkit_gnome
- rdesktop
- read-edid
- st
- sxiv
- tigervnc
- turbovnc
- vdpauinfo
- vlc
- vulkan-tools
- wireshark
- x11vnc
- xclip
- xdotool
- xorg.appres
- xorg.editres
- xorg.xdpyinfo
- xorg.xev
- xscreensaver
- xsnow
- xterm#;
+ environment.systemPackages = [
+ pkgs.chafa
+ pkgs.evince
+ pkgs.feh
+ pkgs.gcr
+ pkgs.geeqie
+ pkgs.ghostty
+ pkgs.gimp
+ #pkgs.gimp-with-plugins
+ pkgs.google-chrome
+ pkgs.gv
+ pkgs.inkscape
+ pkgs.kdePackages.okular
+ pkgs.libreoffice
+ pkgs.libva-utils
+ pkgs.mesa-demos
+ pkgs.mpv
+ pkgs.polkit_gnome
+ pkgs.rdesktop
+ pkgs.read-edid
+ pkgs.st
+ pkgs.sxiv
+ pkgs.tigervnc
+ pkgs.turbovnc
+ pkgs.vdpauinfo
+ pkgs.vlc
+ pkgs.vulkan-tools
+ pkgs.wireshark
+ pkgs.x11vnc
+ pkgs.xclip
+ pkgs.xdotool
+ pkgs.xorg.appres
+ pkgs.xorg.editres
+ pkgs.xorg.xdpyinfo
+ pkgs.xorg.xev
+ pkgs.xscreensaver
+ pkgs.xsnow
+ pkgs.xterm
];
- #};
programs.firefox = {
enable = true;
@@ -69,17 +67,24 @@
services = {
blueman.enable = true;
- displayManager.defaultSession = "xsession";
+ displayManager = lib.mkIf (config.networking.hostName != "fangorn") {
+ defaultSession = "xsession";
+ };
libinput.enable = true;
picom.enable = true;
printing.enable = true;
xserver = {
- displayManager.lightdm = {
- enable = true;
- extraSeatDefaults = ''greeter-hide-users=true'';
- };
+ displayManager.lightdm = lib.mkMerge [
+ (lib.mkIf (config.networking.hostName == "fangorn") {
+ enable = true;
+ })
+ (lib.mkIf (config.networking.hostName != "fangorn") {
+ enable = true;
+ extraSeatDefaults = ''greeter-hide-users=true'';
+ })
+ ];
- displayManager.session = [
+ displayManager.session = lib.mkIf (config.networking.hostName != "fangorn") [
{
manage = "desktop";
name = "xsession";
diff --git a/hosts/common/optional/sound.nix b/hosts/common/optional/sound.nix
index b07de35..6d369ed 100644
--- a/hosts/common/optional/sound.nix
+++ b/hosts/common/optional/sound.nix
@@ -1,51 +1,51 @@
{ pkgs, ... }:
{
environment = {
- systemPackages = with pkgs; [
- artyFX
- audacity
- bespokesynth
- boops
- cardinal
- carla
- chow-tape-model
- cmus
- distrho-ports
- fluidsynth
- #master.fmsynth
- #gearmulator
- geonkick
- guitarix
- gxplugins-lv2
- lilypond-unstable-with-fonts
- lsp-plugins
- metersLv2
- odin2
- oxefmsynth
- polyphone
- qsynth
- reaper
- rosegarden
- samplv1
- sfizz
- sorcer
- surge-XT
- synthv1
- talentedhack
- #master.tunefish
- v4l-utils
- vapoursynth
- vital
- vmpk
- vocproc
- wavpack
- winetricks
- wineWowPackages.stagingFull
- #master.yabridge
- #master.yabridgectl
- yoshimi
- zam-plugins
- #zynaddsubfx
+ systemPackages = [
+ pkgs.artyFX
+ pkgs.audacity
+ pkgs.bespokesynth
+ pkgs.boops
+ pkgs.cardinal
+ #pkgs.carla
+ pkgs.chow-tape-model
+ pkgs.cmus
+ pkgs.distrho-ports
+ pkgs.fluidsynth
+ #pkgs.master.fmsynth
+ #pkgs.gearmulator
+ pkgs.geonkick
+ pkgs.guitarix
+ pkgs.gxplugins-lv2
+ pkgs.lilypond-unstable-with-fonts
+ pkgs.lsp-plugins
+ pkgs.metersLv2
+ pkgs.odin2
+ pkgs.master.oxefmsynth
+ pkgs.polyphone
+ pkgs.qsynth
+ pkgs.reaper
+ pkgs.rosegarden
+ pkgs.samplv1
+ pkgs.sfizz
+ pkgs.sorcer
+ pkgs.surge-XT
+ pkgs.synthv1
+ pkgs.talentedhack
+ #pkgs.master.tunefish
+ pkgs.v4l-utils
+ pkgs.vapoursynth
+ pkgs.vital
+ pkgs.vmpk
+ pkgs.vocproc
+ pkgs.wavpack
+ pkgs.winetricks
+ pkgs.master.wineWowPackages.stagingFull
+ #pkgs.master.yabridge
+ #pkgs.master.yabridgectl
+ pkgs.yoshimi
+ pkgs.zam-plugins
+ pkgs.zynaddsubfx
];
};
}
diff --git a/hosts/common/users/don/default.nix b/hosts/common/users/don/default.nix
new file mode 100644
index 0000000..3c700a7
--- /dev/null
+++ b/hosts/common/users/don/default.nix
@@ -0,0 +1,32 @@
+{ pkgs, inputs, config, ... }:
+let
+ ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+ uid = 1001;
+in
+{
+ users.groups.don.gid = uid;
+ users.users.don = {
+ description = "Don Arnold";
+ extraGroups = [
+ "audio"
+ "video"
+ "wheel"
+ ] ++ ifTheyExist [
+ "adbusers"
+ "networkmanager"
+ "vboxsf"
+ "vboxusers"
+ ];
+ group = "don";
+ home = "/home/don";
+ isNormalUser = true;
+ openssh.authorizedKeys.keys = [
+ (builtins.readFile ../nipsy/keys/id_arrakis.pub)
+ #(builtins.readFile ./keys/id_other.pub)
+ ];
+
+ packages = [ pkgs.home-manager ];
+ #shell = pkgs.zsh;
+ uid = uid;
+ };
+}
diff --git a/hosts/common/users/nipsy/default.nix b/hosts/common/users/nipsy/default.nix
index 5eacd6f..9d5bfe6 100644
--- a/hosts/common/users/nipsy/default.nix
+++ b/hosts/common/users/nipsy/default.nix
@@ -1,9 +1,10 @@
{ pkgs, inputs, config, ... }:
let
ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+ uid = 1000;
in
{
- users.groups.nipsy.gid = 1000;
+ users.groups.nipsy.gid = uid;
users.users.nipsy = {
description = "Mark Nipper";
extraGroups = [
@@ -26,5 +27,6 @@ in
packages = [ pkgs.home-manager ];
shell = pkgs.zsh;
+ uid = uid;
};
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-01 05:42:21 +0000