From c1f24f2dc2e95715b275f0a99f6c60b144130e6f Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 28 Aug 2024 14:32:51 +0200 Subject: [PATCH 1/4] c --- home-modules/programming/c.nix | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) 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}"; }; }; From 13264dfa2493f3c3bc6c2a9b8cc519307e178190 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 28 Aug 2024 14:33:10 +0200 Subject: [PATCH 2/4] vektop stable --- home-modules/discord.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-modules/discord.nix b/home-modules/discord.nix index 086c6d6..770738d 100755 --- a/home-modules/discord.nix +++ b/home-modules/discord.nix @@ -2,7 +2,7 @@ lib.mkIf (host != "NxACE") { home.packages = [ - pkgs-unstable.vesktop + pkgs.vesktop ]; home.file.".config/vesktop/settings/settings.json".text = '' From 69e2bed0ce146129657ec16063f444f9c5bf0768 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 28 Aug 2024 14:34:34 +0200 Subject: [PATCH 3/4] qmk+qmk --- system-modules/qmk.nix | 1 + 1 file changed, 1 insertion(+) 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 ]; } From cfb112429d597585cf86a97f148f3a3adcbc13aa Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 9 Sep 2024 16:15:36 +0200 Subject: [PATCH 4/4] temp fixed for xps --- configuration.nix | 13 ++++++++++--- flake.nix | 2 +- system-modules/boot.nix | 1 + system-modules/nvidia.nix | 3 +-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/configuration.nix b/configuration.nix index cc8ea9f..4febb5b 100755 --- a/configuration.nix +++ b/configuration.nix @@ -9,7 +9,7 @@ ./system-modules/users.nix ./system-modules/sound.nix ./system-modules/fonts.nix - ./system-modules/boot.nix + ./system-modules/boot.nix ./system-modules/gc.nix ./system-modules/dm.nix ./system-modules/networking.nix @@ -57,8 +57,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 +104,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 7e53685..8866fa9 100755 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,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/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;