Sadan/dotfiles
1
0
Fork 0
mirror of https://github.com/sadan4/dotfiles.git synced 2024-11-16 23:04:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

262 current 2024-10-02 15:05:19 24.11.20240916.99dc878 6.11.0 *

Browse source
This commit is contained in:
sadan 2024-10-02 15:05:29 -04:00
parent bf348c1b68
commit c88a1ca201
No known key found for this signature in database
3 changed files with 36 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
boxes/desktop/configuration.nix
View file

@ -7,45 +7,15 @@
let let
_v = import ../../common/programs/virt.nix { }; _v = import ../../common/programs/virt.nix { };
wireshark = import ../../common/programs/wireshark.nix { }; wireshark = import ../../common/programs/wireshark.nix { };
# audio = import ../../common/modules/audio.nix { };
util = import ../../common/util.nix { inherit pkgs; };
in in
{ {
fileSystems."/mnt/d" = {
device = "/dev/disks/by-uuid/A02A12F22A12C566";
options = [
"nofail"
"uid=1000"
"gid=100"
];
};
fileSystems."/mnt/c" = {
device = "/dev/disks/by-uuid/046C2BB16C2B9D04";
options = [
"nofail"
"uid=1000"
"gid=100"
"noauto"
];
};
fileSystems."/mnt/f" = {
device = "/dev/disks/by-uuid/2E06B65306B61C31";
options = [
"nofail"
"uid=1000"
"gid=100"
];
};
fileSystems."/mnt/h" = {
device = "/dev/disks/by-uuid/E0A4F8C1A4F89B6C";
options = [
"nofail"
"uid=1000"
"gid=100"
];
};
imports = imports =
[ [
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../../common/modules/audio.nix
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
]; ];
sops.defaultSopsFile = ../../secrets.yaml; sops.defaultSopsFile = ../../secrets.yaml;
@ -56,6 +26,7 @@ in
isNormalUser = true; isNormalUser = true;
hashedPasswordFile = config.sops.secrets.password.path; hashedPasswordFile = config.sops.secrets.password.path;
extraGroups = [ extraGroups = [
"wireshark"
"kvm" "kvm"
"libvirtd" "libvirtd"
"wheel" # Enable ‘sudo’ for the user. "wheel" # Enable ‘sudo’ for the user.
@ -139,12 +110,6 @@ in
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
# Enable sound. # Enable sound.
# sound.enable = true; # sound.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
};
# hardware.pulseaudio.enable = true; # hardware.pulseaudio.enable = true;
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).

14
common/modules/audio.nix Normal file
View file

@ -0,0 +1,14 @@
{...}: {
services = {
pipewire = {
enable = true;
alsa = {
enable = true;
support32Bit = true;
};
pulse = {
enable = true;
};
};
};
}

16
common/util.nix Normal file
View file

@ -0,0 +1,16 @@
{ pkgs }: with pkgs.lib; {
merge = attrList:
let
f = attrPath:
zipAttrsWith (n: values:
if tail values == [ ]
then head values
else if all isList values
then unique (concatLists values)
else if all isAttrs values
then f (attrPath ++ [ n ]) values
else last values
);
in
f [ ] attrList;
}