diff --git a/flake.lock b/flake.lock index e3e2384..ebb1d27 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,14 @@ "anyrun": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1712136515, - "narHash": "sha256-LpjQJYC24S5P5XhJsZX6HqsQT1pohcFzM6N42I6qo/U=", + "lastModified": 1713259062, + "narHash": "sha256-WTO84hUL8IlNuHDK2yOCeJ38EewFzGt5E0kzBjNWxa8=", "owner": "Kirottu", "repo": "anyrun", - "rev": "be6728884d543665e7bd137bbef62dc1d04a210b", + "rev": "f9d30e34fa4ccb2797c6becec37e8bcff6585d39", "type": "github" }, "original": { @@ -30,11 +28,11 @@ ] }, "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "lastModified": 1713532798, + "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", "owner": "numtide", "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", "type": "github" }, "original": { @@ -102,11 +100,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -216,11 +214,11 @@ ] }, "locked": { - "lastModified": 1712093955, - "narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=", + "lastModified": 1713894582, + "narHash": "sha256-pHJYZIVFmzPAwyTfcMGJwlfz18nOsS4p0CuDnI1EDL4=", "owner": "nix-community", "repo": "home-manager", - "rev": "80546b220e95a575c66c213af1b09fe255299438", + "rev": "33a20182e3164f451b6a4ac2ecadcab5c2c36703", "type": "github" }, "original": { @@ -237,11 +235,11 @@ ] }, "locked": { - "lastModified": 1711625603, - "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", + "lastModified": 1713732794, + "narHash": "sha256-AYCofb8Zu4Mbc1lHDtju/uxeARawRijmOueAqEMEfMU=", "owner": "nix-community", "repo": "home-manager", - "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", + "rev": "670d9ecc3e46a6e3265c203c2d136031a3d3548e", "type": "github" }, "original": { @@ -258,11 +256,11 @@ ] }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1713543876, + "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed", "type": "github" }, "original": { @@ -273,11 +271,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712122226, - "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", + "lastModified": 1713895582, + "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", + "rev": "572af610f6151fd41c212f897c71f7056e3fb518", "type": "github" }, "original": { @@ -289,11 +287,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1711668574, - "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", + "lastModified": 1713725259, + "narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", + "rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7", "type": "github" }, "original": { @@ -305,11 +303,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1711819797, - "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=", + "lastModified": 1713042715, + "narHash": "sha256-RifMwYuKu5v6x6O65msKDTqKkQ9crGwOB7yr20qMEuE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c", + "rev": "c27f3b6d8e29346af16eecc0e9d54b1071eae27e", "type": "github" }, "original": { @@ -321,11 +319,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1712122226, - "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -353,11 +351,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -369,11 +367,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712122226, - "narHash": "sha256-pmgwKs8Thu1WETMqCrWUm0CkN1nmCKX3b51+EXsAZyY=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08b9151ed40350725eb40b1fe96b0b86304a654b", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -385,11 +383,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1711715736, - "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1712883908, + "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9", "type": "github" }, "original": { @@ -399,13 +413,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -422,15 +436,15 @@ "flake-parts": "flake-parts_2", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1712057047, - "narHash": "sha256-o5KSQO82/sCgaaSsZONTeb+P47MXo0bbp+eID9I0CwI=", + "lastModified": 1713856119, + "narHash": "sha256-TfNc8vxF7IaRhTlMgOeUN01y7QoBx50MYmGU1sSU6Vw=", "owner": "nix-community", "repo": "nixvim", - "rev": "7baefc8aa587931827797db7fbd55a733179dc79", + "rev": "c826d146c65bfa8164f31931cf54278b99f5a3a0", "type": "github" }, "original": { @@ -454,11 +468,11 @@ ] }, "locked": { - "lastModified": 1711760932, - "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=", + "lastModified": 1713775815, + "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c11e43aed6f17336c25cd120eac886b96c455731", + "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4", "type": "github" }, "original": { @@ -471,7 +485,7 @@ "inputs": { "anyrun": "anyrun", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs2105": "nixpkgs2105", @@ -482,15 +496,15 @@ }, "secrets": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "sops-nix": "sops-nix" }, "locked": { - "lastModified": 1711939252, - "narHash": "sha256-J0TNwVSDou44SaAXDrPjaBOV+9R8ONVKx6HfjumabTI=", + "lastModified": 1713901156, + "narHash": "sha256-VyDnKIsK7r/VNpqMbl8VlZrUaAgbkxX8Destq961Jkk=", "ref": "refs/heads/main", - "rev": "bd50446d5f3cd157d13fa0ff1793bfdc0c5298eb", - "revCount": 16, + "rev": "4c5ca35a5042bd3ed9653c353acb2d38440eaae1", + "revCount": 20, "type": "git", "url": "ssh://git@github.com/deltathetawastaken/secrets.git" }, @@ -511,11 +525,11 @@ "tdesktop": "tdesktop" }, "locked": { - "lastModified": 1711995482, - "narHash": "sha256-tyBewtchaYOVywYFVBwycZfHclhDoE6ZNv4Nd+T3/kE=", + "lastModified": 1714028061, + "narHash": "sha256-ahYGiDoOscpTjRBOcUZhEvi5DbH1V+YyZiXOJ5s/x2M=", "owner": "shwewo", "repo": "flake", - "rev": "fb166e20648743750d468d9550c15f0c61989800", + "rev": "a683aaee76926b4b23d81c5ed5da1ddffa097120", "type": "github" }, "original": { @@ -526,15 +540,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1711855048, - "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=", + "lastModified": 1713066950, + "narHash": "sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10", + "rev": "226062b47fe0e2130ba3ee9f4f1c880dc815cf87", "type": "github" }, "original": { @@ -606,14 +620,14 @@ "tdesktop": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1711789881, - "narHash": "sha256-BwSXsEO8rGA5d2CbKQtmJE4hmTH95KxfOPnBcaCUiBA=", + "lastModified": 1714027575, + "narHash": "sha256-Fdq1OGJqJUPgTODVeoDGoKeHae4VvBPzkvINMExHKKU=", "owner": "shwewo", "repo": "telegram-desktop-patched", - "rev": "0c6f82ed24f3411aad7b4b3116ad954961f600cc", + "rev": "93ac3b50d21ce0680639cb4c919389ed7d94315f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ad80e5f..325a78e 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; anyrun.url = "github:Kirottu/anyrun"; - anyrun.inputs.nixpkgs.follows = "nixpkgs"; + # anyrun.inputs.nixpkgs.follows = "nixpkgs"; secrets.url = "git+ssh://git@github.com/deltathetawastaken/secrets.git"; nixvim.url = "github:nix-community/nixvim"; shwewo = { diff --git a/hosts/dlaptop/hardware.nix b/hosts/dlaptop/hardware.nix index 97aab9b..9266824 100644 --- a/hosts/dlaptop/hardware.nix +++ b/hosts/dlaptop/hardware.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ unstable, config, lib, pkgs, modulesPath, self, ... }: +{ stable, unstable, config, lib, pkgs, modulesPath, self, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -111,4 +111,13 @@ networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + #services.logind = { + # lidSwitch = "suspend"; + # lidSwitchDocked = "ignore"; + # lidSwitchExternalPower = "ignore"; + # powerKey = "ignore"; + # powerKeyLongPress = "reboot"; + #}; + } diff --git a/hosts/dlaptop/services.nix b/hosts/dlaptop/services.nix index 1503195..4469f20 100644 --- a/hosts/dlaptop/services.nix +++ b/hosts/dlaptop/services.nix @@ -55,6 +55,14 @@ pkgs.android-udev-rules pkgs.yubikey-personalization ]; + # services.udev.extraRules = '' + # ACTION=="remove",\ + # ENV{ID_BUS}=="usb",\ + # ENV{ID_MODEL_ID}=="0407",\ + # ENV{ID_VENDOR_ID}=="1050",\ + # ENV{ID_VENDOR}=="Yubico",\ + # RUN+="${pkgs.systemd}/bin/loginctl lock-sessions" + # ''; systemd.services.cloudflared-tunnel-dlaptop.serviceConfig.Restart = lib.mkForce "on-failure"; systemd.services.cloudflared-tunnel-dlaptop.serviceConfig.RestartSec = lib.mkForce 60; diff --git a/hosts/dlaptop/system.nix b/hosts/dlaptop/system.nix index c235903..c90a592 100644 --- a/hosts/dlaptop/system.nix +++ b/hosts/dlaptop/system.nix @@ -116,11 +116,31 @@ services.pipewire = { enable = true; wireplumber.enable = true; + wireplumber.configPackages = [ + (pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/51-bluez-config.lua" '' + bluez_monitor.properties = { + ["bluez5.enable-sbc-xq"] = true, + ["bluez5.enable-msbc"] = true, + ["bluez5.enable-hw-volume"] = true, + ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" + } + '') + ]; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; }; + hardware.bluetooth.settings = { + General = { + Enable = "Source,Sink,Media,Socket"; + Experimental = true; + KernelExperimental = true; + }; + }; + # hardware.enableAllFirmware = true; + + sound.enable = true; hardware.pulseaudio.enable = false; @@ -161,6 +181,8 @@ yubikey-personalization yubikey-personalization-gui age-plugin-yubikey + age + rage lua5_4 nodejs_21 diff --git a/hosts/dlaptop/xorg.nix b/hosts/dlaptop/xorg.nix index 7020067..73fdd1c 100644 --- a/hosts/dlaptop/xorg.nix +++ b/hosts/dlaptop/xorg.nix @@ -10,7 +10,7 @@ QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_QPA_PLATFORM = "wayland"; STEAM_FORCE_DESKTOPUI_SCALING = "1"; - # NIXOS_OZONE_WL = "1"; + NIXOS_OZONE_WL = "1"; MOZ_ENABLE_WAYLAND = "1"; XCURSOR_SIZE = ""; EDITOR = "hx";