diff --git a/configuration.nix b/configuration.nix index 14762e1..51b5acd 100755 --- a/configuration.nix +++ b/configuration.nix @@ -3,6 +3,14 @@ imports = [ inputs.sops-nix.nixosModules.sops ./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/dm.nix ./system-modules/docker.nix @@ -27,10 +35,8 @@ ./system-modules/syncthing.nix ./system-modules/users.nix ./system-modules/virtualisation.nix - ./system-modules/ydotool.nix ]; - - - + ./system-modules/ydotool.nix + ]; # Set your time zone. time.timeZone = "Europe/Berlin"; @@ -58,8 +64,13 @@ services.libinput.enable = true; hardware.uinput.enable = true; - hardware.bluetooth.enable = true; # enables support for Bluetooth - hardware.bluetooth.powerOnBoot = true; # + hardware.bluetooth = { + enable = true; + powerOnBoot = true; + package = pkgs.bluez5-experimental; + settings.Policy.AutoEnable = "true"; + settings.General.Enable = "Source,Sink,Media,Socket"; + }; services.blueman.enable = true; # List packages installed in system profile. To search, run: @@ -99,6 +110,8 @@ system.stateVersion = "24.05"; + nixpkgs.config.allowUnfree = true; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; programs.bash.shellInit = '' diff --git a/flake.nix b/flake.nix index 5aabf13..c8ab3a0 100755 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ system = "x86_64-linux"; 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-unstable = import nixpkgs-unstable { inherit system config; }; diff --git a/home-modules/programming/c.nix b/home-modules/programming/c.nix index f5a3d75..fbf33a0 100644 --- a/home-modules/programming/c.nix +++ b/home-modules/programming/c.nix @@ -2,25 +2,15 @@ { home = { packages = with pkgs; [ - # libclang - glibc + glibc_multi + glib gcc - # gnustep.stdenv - # pkg-config - # gnumake - # ninja - # cmake - # meson - # bashInteractive - - # lld + # pkgsi686Linux.glibc clang-tools - # clang - # cppcheck ]; sessionVariables = with pkgs; { - LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include"; - C_INCLUDE_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:${glibc_multi.dev}/include"; CLANG_RESOURCE_DIR = "${llvmPackages.clang-unwrapped}"; }; }; diff --git a/system-modules/boot.nix b/system-modules/boot.nix index b6a48e8..7757332 100755 --- a/system-modules/boot.nix +++ b/system-modules/boot.nix @@ -105,6 +105,7 @@ in ''; }; }; + kernelPackages = pkgs-unstable.linuxPackages_6_10; extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; kernelModules = [ "v4l2loopback" ]; extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS VCam" exclusive_caps=1''; diff --git a/system-modules/nvidia.nix b/system-modules/nvidia.nix index 28e5573..4921080 100755 --- a/system-modules/nvidia.nix +++ b/system-modules/nvidia.nix @@ -57,8 +57,7 @@ lib.mkIf nvidia.enable nvidiaSettings = true; # 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 = { enable = true; driSupport = true; diff --git a/system-modules/qmk.nix b/system-modules/qmk.nix index 307c92e..136662f 100644 --- a/system-modules/qmk.nix +++ b/system-modules/qmk.nix @@ -7,6 +7,7 @@ # ]; environment.systemPackages = with pkgs; [ via + qmk ]; services.udev.packages = [ pkgs.via ]; }