From 3c0270df7fbc7f183a9d03ad6157b3bb6b1861fc Mon Sep 17 00:00:00 2001 From: tzlil Date: Fri, 19 May 2023 00:55:01 +0300 Subject: add bluetooth to laptop --- flake.lock | 24 ++++++++++++------------ hosts/laptop/cfg.nix | 7 +++++++ mixins/syncthing.nix | 16 +++++++++------- profiles/core.nix | 3 ++- profiles/security.nix | 2 +- 5 files changed, 31 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index a9f34c1..81a8586 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1684189380, - "narHash": "sha256-GUp9OkZynocyppLur1VX8oAjtXGue0oKRHbsksOMUm0=", + "lastModified": 1684321175, + "narHash": "sha256-V4EbM+jK7pvjKBaj0dgAiW9ultzDE27Nz5fRyu/ceMk=", "owner": "nix-community", "repo": "home-manager", - "rev": "b7d814c5744dca7e70b3dc2638f06568dce96ca6", + "rev": "59659243cd4ababda605e79b4a9c2e6d83e24c86", "type": "github" }, "original": { @@ -165,11 +165,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1684215771, - "narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=", + "lastModified": 1684385584, + "narHash": "sha256-O7y0gK8OLIDqz+LaHJJyeu09IGiXlZIS3+JgEzGmmJA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28", + "rev": "48a0fb7aab511df92a17cf239c37f2bd2ec9ae3a", "type": "github" }, "original": { @@ -187,11 +187,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1684255366, - "narHash": "sha256-kgG8wwnypHYMUAUOjjwH22xJdo5d7SbbrtzArnkGbww=", + "lastModified": 1684420343, + "narHash": "sha256-YTyBmf1U0gDHLcgs5NVgv7yxKPItpOFN8+C1ODua2GI=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "1be5a6ed07b69ff5115d6b0a23133e892d5d216b", + "rev": "75beb26facfa1b3231000fcee816ad3d2bace384", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1684262161, - "narHash": "sha256-SVGl2skgiJj4hqIuhO3pkJOIPGv8A1R8ySmG2WuqXg4=", + "lastModified": 1684329129, + "narHash": "sha256-0SSHyWU/3Qy/wAj3DCn7eKfK3Hqq/+09JEbcU6b20Vg=", "owner": "viperML", "repo": "nix-common", - "rev": "2920c1913ccca1596d83a80b46af5fe8452f74e8", + "rev": "72566be990e4af366d0d0d2f40c26adfb6ebe545", "type": "github" }, "original": { diff --git a/hosts/laptop/cfg.nix b/hosts/laptop/cfg.nix index bd0f364..eefde8b 100644 --- a/hosts/laptop/cfg.nix +++ b/hosts/laptop/cfg.nix @@ -41,6 +41,7 @@ supportedFilesystems = ["ntfs"]; kernelModules = ["kvm-intel"]; kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; + # extraModulePackages = [ config.boot.kernelPackages.rtl8821ce ]; loader = { systemd-boot = { enable = true; @@ -110,6 +111,9 @@ powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + nixpkgs.config.allowUnfree = true; + hardware.enableAllFirmware = true; + # greeter.initialSession = "${pkgs.fish}/bin/fish"; hardware.opengl = { @@ -134,5 +138,8 @@ }; acpid.enable = true; }; + + hardware.bluetooth.enable = true; + services.blueman.enable = true; }; } diff --git a/mixins/syncthing.nix b/mixins/syncthing.nix index 3e219ae..7faf5db 100644 --- a/mixins/syncthing.nix +++ b/mixins/syncthing.nix @@ -11,13 +11,15 @@ configDir = "/home/tzlil/.config/syncthing"; overrideDevices = true; overrideFolders = true; - devices = { - "phone" = {id = "UHWVTEZ-BERNFCH-3ZXQHNE-ZRBHLU6-MBAVEHB-TKLQJM7-ZGHLJ4R-6E4SAA7";}; - }; - folders = { - "passwords" = { - path = "/home/tzlil/sync/passwords"; - devices = ["phone"]; + settings = { + devices = { + "phone" = {id = "UHWVTEZ-BERNFCH-3ZXQHNE-ZRBHLU6-MBAVEHB-TKLQJM7-ZGHLJ4R-6E4SAA7";}; + }; + folders = { + "passwords" = { + path = "/home/tzlil/sync/passwords"; + devices = ["phone"]; + }; }; }; }; diff --git a/profiles/core.nix b/profiles/core.nix index f81ead8..1b18855 100644 --- a/profiles/core.nix +++ b/profiles/core.nix @@ -28,7 +28,8 @@ environment.defaultPackages = lib.mkForce []; age.identityPaths = ["/nix/persist/etc/ssh/ssh_host_ed25519_key"]; - programs.command-not-found.dbPath = inputs.programsdb.packages.${pkgs.system}.programs-sqlite; + # causing issues, fix this + #programs.command-not-found.dbPath = inputs.programsdb.packages.${pkgs.system}.programs-sqlite; # save uid/guid environment.persistence."/nix/persist".directories = ["/var/lib/nixos"]; diff --git a/profiles/security.nix b/profiles/security.nix index ddd980e..9ae5cef 100644 --- a/profiles/security.nix +++ b/profiles/security.nix @@ -16,7 +16,7 @@ environment.memoryAllocator.provider = "scudo"; environment.variables.SCUDO_OPTIONS = "ZeroContents=1"; - security.lockKernelModules = true; + # security.lockKernelModules = true; security.protectKernelImage = true; security.allowSimultaneousMultithreading = false; security.forcePageTableIsolation = true; -- cgit 1.4.1