From 664cdb07f5aad26aa8c6e264f21d60015403144d Mon Sep 17 00:00:00 2001 From: mehbark Date: Sun, 24 Nov 2024 03:20:56 -0500 Subject: [PATCH] bluetooth, fix build --- configuration.nix | 6 ++-- flake.lock | 90 ----------------------------------------------- flake.nix | 1 + home.nix | 4 +-- 4 files changed, 6 insertions(+), 95 deletions(-) diff --git a/configuration.nix b/configuration.nix index 47137fa..5843aae 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,3 +1,4 @@ +build-conf: { config, pkgs, ... }: let conf = build-conf; @@ -115,13 +116,14 @@ in open = false; nvidiaSettings = true; }; + + bluetooth.enable = true; + bluetooth.settings.General.Experimental = true; }; # Enable CUPS to print documents. services.printing.enable = true; - # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/flake.lock b/flake.lock index f06b7b2..54d60ea 100644 --- a/flake.lock +++ b/flake.lock @@ -120,24 +120,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -340,29 +322,6 @@ "type": "github" } }, - "leanpkgs": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-cadical": "nixpkgs-cadical", - "nixpkgs-old": "nixpkgs-old" - }, - "locked": { - "lastModified": 1731981752, - "narHash": "sha256-EjshM4rodYInqktJbyjAIxZ9p7SvXvLpBK6MVyGg0sE=", - "owner": "leanprover", - "repo": "lean4", - "rev": "7ccdfc30ffab9ad2059d89aa03627fd549e4e7f4", - "type": "github" - }, - "original": { - "owner": "leanprover", - "repo": "lean4", - "type": "github" - } - }, "naersk": { "inputs": { "nixpkgs": [ @@ -453,39 +412,6 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.650378.tar.gz" } }, - "nixpkgs-cadical": { - "locked": { - "lastModified": 1722221733, - "narHash": "sha256-sga9SrrPb+pQJxG1ttJfMPheZvDOxApFfwXCFO0H9xw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "12bf09802d77264e441f48e25459c10c93eada2e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "12bf09802d77264e441f48e25459c10c93eada2e", - "type": "github" - } - }, - "nixpkgs-old": { - "flake": false, - "locked": { - "lastModified": 1581379743, - "narHash": "sha256-i1XCn9rKuLjvCdu2UeXKzGLF6IuQePQKFt4hEKRU5oc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "34c7eb7545d155cc5b6f499b23a7cb1c96ab4d59", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-19.03", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1730741070, @@ -585,7 +511,6 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "hyprland": "hyprland", - "leanpkgs": "leanpkgs", "nix-darwin": "nix-darwin", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_3", @@ -639,21 +564,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 8e0c0e3..cff82d8 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,7 @@ hyprland, fh, pesterchum, + nix-darwin, ... }: let diff --git a/home.nix b/home.nix index 4023a46..dec9c33 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,4 @@ -{ conf, more-packages ? [], leanpkgs ? false, darwin ? false }: +{ conf, more-packages ? [], darwin ? false }: { config, pkgs, ... }: let wm = conf.wm; @@ -62,7 +62,6 @@ in idris2 # might as well use it consistently - # (builtins.foldl' (a: b: "${a} ${b}") "" (builtins.attrNames leanpkgs)) haskell-language-server typst @@ -101,7 +100,6 @@ in lmmath julia-mono ] ++ more-packages - ++ (if leanpkgs then [leanpkgs.lean4-mode leanpkgs.lean-all] else []) ++ (if darwin then [ m-cli libiconvReal