Merge branch 'master' of ssh://git.nx2.site:20022/nx2/dotfiles

This commit is contained in:
Lennart J. Kurzweg (Nx2)
2024-09-09 16:29:11 +02:00
6 changed files with 28 additions and 24 deletions

View File

@@ -3,6 +3,14 @@
imports = [ imports = [
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
./system-modules/auto-mount.nix ./system-modules/auto-mount.nix
./system-modules/hardware-configuration.nix
./system-modules/fuse.nix
./system-modules/nvidia.nix
./system-modules/users.nix
./system-modules/sound.nix
./system-modules/fonts.nix
./system-modules/boot.nix
./system-modules/gc.nix
./system-modules/boot.nix ./system-modules/boot.nix
./system-modules/dm.nix ./system-modules/dm.nix
./system-modules/docker.nix ./system-modules/docker.nix
@@ -27,10 +35,8 @@
./system-modules/syncthing.nix ./system-modules/syncthing.nix
./system-modules/users.nix ./system-modules/users.nix
./system-modules/virtualisation.nix ./system-modules/virtualisation.nix
./system-modules/ydotool.nix ]; ./system-modules/ydotool.nix
];
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
@@ -58,8 +64,13 @@
services.libinput.enable = true; services.libinput.enable = true;
hardware.uinput.enable = true; hardware.uinput.enable = true;
hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth = {
hardware.bluetooth.powerOnBoot = true; # enable = true;
powerOnBoot = true;
package = pkgs.bluez5-experimental;
settings.Policy.AutoEnable = "true";
settings.General.Enable = "Source,Sink,Media,Socket";
};
services.blueman.enable = true; services.blueman.enable = true;
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
@@ -99,6 +110,8 @@
system.stateVersion = "24.05"; system.stateVersion = "24.05";
nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
programs.bash.shellInit = '' programs.bash.shellInit = ''

View File

@@ -22,7 +22,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
user = "nx2"; user = "nx2";
config = { allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; }; config = { allowUnfree = true; allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };
pkgs = import nixpkgs { inherit system config; }; pkgs = import nixpkgs { inherit system config; };
pkgs-unstable = import nixpkgs-unstable { inherit system config; }; pkgs-unstable = import nixpkgs-unstable { inherit system config; };

View File

@@ -2,25 +2,15 @@
{ {
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
# libclang glibc_multi
glibc glib
gcc gcc
# gnustep.stdenv # pkgsi686Linux.glibc
# pkg-config
# gnumake
# ninja
# cmake
# meson
# bashInteractive
# lld
clang-tools clang-tools
# clang
# cppcheck
]; ];
sessionVariables = with pkgs; { sessionVariables = with pkgs; {
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include:${glibc_multi.dev}/include";
C_INCLUDE_PATH = "${llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include"; C_INCLUDE_PATH = "${llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include:${glibc_multi.dev}/include";
CLANG_RESOURCE_DIR = "${llvmPackages.clang-unwrapped}"; CLANG_RESOURCE_DIR = "${llvmPackages.clang-unwrapped}";
}; };
}; };

View File

@@ -105,6 +105,7 @@ in
''; '';
}; };
}; };
kernelPackages = pkgs-unstable.linuxPackages_6_10;
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
kernelModules = [ "v4l2loopback" ]; kernelModules = [ "v4l2loopback" ];
extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS VCam" exclusive_caps=1''; extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS VCam" exclusive_caps=1'';

View File

@@ -57,8 +57,7 @@ lib.mkIf nvidia.enable
nvidiaSettings = true; nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.beta; };
};
opengl = { opengl = {
enable = true; enable = true;
driSupport = true; driSupport = true;

View File

@@ -7,6 +7,7 @@
# ]; # ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
via via
qmk
]; ];
services.udev.packages = [ pkgs.via ]; services.udev.packages = [ pkgs.via ];
} }