diff --git a/clhickey-nixos/configuration.nix b/clhickey-nixos/configuration.nix index 93996c8..0f5f567 100644 --- a/clhickey-nixos/configuration.nix +++ b/clhickey-nixos/configuration.nix @@ -5,10 +5,6 @@ ./hardware-configuration.nix ../cos.nix ]; - - nixpkgs.overlays = [ - inputs.nix-bwrapper.overlays.default - ]; cos.username = "clhickey"; cos.hostName = "clhickey-nixos"; @@ -216,16 +212,6 @@ kicad orca-slicer android-tools - obsidian - #(pkgs.mkBwrapper { - # app = { - # package = pkgs.obsidian; - # runScript = "obsidian"; - # }; - # mounts.readWrite = [ - # "$HOME/git/Journal" - # ]; - #}) ]; sessionVariables = { EDITOR = "${inputs.cnvim.packages.x86_64-linux.default}/bin/nvim"; diff --git a/flake.lock b/flake.lock index 0d529d9..b01d5fe 100644 --- a/flake.lock +++ b/flake.lock @@ -95,24 +95,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -133,34 +115,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nix-bwrapper", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nix-bwrapper", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "languini": { "inputs": { "nixpkgs": "nixpkgs", @@ -198,47 +152,11 @@ "type": "github" } }, - "mobile-nixos": { - "flake": false, - "locked": { - "lastModified": 1772289954, - "narHash": "sha256-iDdtwk/dFb6AsXMtcOpZixxXl6C1HNUPe6cglxxHO7M=", - "owner": "mobile-nixos", - "repo": "mobile-nixos", - "rev": "1a9e0af79dc7b5e29ed772f1a8a76fcbd9d45fdf", - "type": "github" - }, - "original": { - "owner": "mobile-nixos", - "repo": "mobile-nixos", - "type": "github" - } - }, - "nix-bwrapper": { - "inputs": { - "nixpkgs": "nixpkgs_2", - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1770308099, - "narHash": "sha256-VxuIePns4c+qpsHpLXW0CwovpKUx1xnvVIUuJwPO6fQ=", - "owner": "Naxdy", - "repo": "nix-bwrapper", - "rev": "1248b52f2bd4fe5690c1a36836a1798be21d953b", - "type": "github" - }, - "original": { - "owner": "Naxdy", - "repo": "nix-bwrapper", - "type": "github" - } - }, "nix-minecraft": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1766628630, @@ -271,54 +189,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1767892417, - "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1748929857, "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", @@ -334,7 +204,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_3": { "locked": { "lastModified": 1770197578, "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", @@ -350,7 +220,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_4": { "locked": { "lastModified": 1742422364, "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", @@ -389,26 +259,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1768249818, - "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=", - "owner": "NuschtOS", - "repo": "search", - "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "oldNixpkgs": { "locked": { "lastModified": 1701282334, @@ -443,8 +293,8 @@ }, "penn-nix": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_7" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1742609439, @@ -466,10 +316,8 @@ "home-manager": "home-manager", "languini": "languini", "mapnix": "mapnix", - "mobile-nixos": "mobile-nixos", - "nix-bwrapper": "nix-bwrapper", "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_3", "osm-bikeability": "osm-bikeability", "penn-nix": "penn-nix" } @@ -539,39 +387,6 @@ "repo": "default", "type": "github" } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "locked": { - "lastModified": 1770228511, - "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a62dd1a..9763091 100644 --- a/flake.nix +++ b/flake.nix @@ -21,11 +21,6 @@ url = "git+ssh://forgejo@10.100.0.1/TutorEngine/leptos_client.git"; }; nix-minecraft.url = "github:Infinidoge/nix-minecraft"; - nix-bwrapper.url = "github:Naxdy/nix-bwrapper"; - mobile-nixos = { - url = "github:mobile-nixos/mobile-nixos"; - flake = false; - }; }; outputs = { self, nixpkgs, ... }@inputs: { nixosConfigurations.clhickey-nixos = nixpkgs.lib.nixosSystem { @@ -47,12 +42,6 @@ ./loadedskypotato/configuration.nix ]; }; - nixosConfigurations.pinephonepro = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs; }; - modules = [ - ./pinephonepro/configuration.nix - ]; - }; }; } diff --git a/pinephonepro/configuration.nix b/pinephonepro/configuration.nix index c5459dc..4adcf09 100644 --- a/pinephonepro/configuration.nix +++ b/pinephonepro/configuration.nix @@ -1,10 +1,10 @@ -{ config, lib, pkgs, inputs, ... }: +{ config, lib, pkgs, ... }: { imports = [ - (import "${inputs.mobile-nixos}/lib/configuration.nix" { device = "pine64-pinephonepro"; }) + (import { device = "pine64-pinephonepro"; }) ./hardware-configuration.nix - "${inputs.mobile-nixos}/examples/phosh/phosh.nix" + ]; networking.hostName = "pinephonepro"; @@ -14,17 +14,17 @@ # # Use Network Manager + networking.wireless.enable = false; networking.networkmanager.enable = true; + # Use PulseAudio + hardware.pulseaudio.enable = true; + # Enable Bluetooth hardware.bluetooth.enable = true; - - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; + + # Bluetooth audio + hardware.pulseaudio.package = pkgs.pulseaudioFull; # Enable power management options powerManagement.enable = true;