From ebac4259e5cb57ec2b93eb5e15e1a4130e40c97e Mon Sep 17 00:00:00 2001 From: clay53 Date: Sun, 8 Mar 2026 14:55:34 -0400 Subject: [PATCH] try wrapping obsidian --- clhickey-nixos/configuration.nix | 14 +++ flake.lock | 182 +++++++++++++++++++++++++++++-- flake.nix | 1 + 3 files changed, 190 insertions(+), 7 deletions(-) diff --git a/clhickey-nixos/configuration.nix b/clhickey-nixos/configuration.nix index 0f5f567..93996c8 100644 --- a/clhickey-nixos/configuration.nix +++ b/clhickey-nixos/configuration.nix @@ -5,6 +5,10 @@ ./hardware-configuration.nix ../cos.nix ]; + + nixpkgs.overlays = [ + inputs.nix-bwrapper.overlays.default + ]; cos.username = "clhickey"; cos.hostName = "clhickey-nixos"; @@ -212,6 +216,16 @@ 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 b01d5fe..4a661b6 100644 --- a/flake.lock +++ b/flake.lock @@ -95,6 +95,24 @@ "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": [ @@ -115,6 +133,34 @@ "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", @@ -152,11 +198,31 @@ "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", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1766628630, @@ -189,6 +255,54 @@ } }, "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=", @@ -204,7 +318,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_6": { "locked": { "lastModified": 1770197578, "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", @@ -220,7 +334,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_7": { "locked": { "lastModified": 1742422364, "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", @@ -259,6 +373,26 @@ "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, @@ -293,8 +427,8 @@ }, "penn-nix": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1742609439, @@ -316,8 +450,9 @@ "home-manager": "home-manager", "languini": "languini", "mapnix": "mapnix", + "nix-bwrapper": "nix-bwrapper", "nix-minecraft": "nix-minecraft", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_6", "osm-bikeability": "osm-bikeability", "penn-nix": "penn-nix" } @@ -387,6 +522,39 @@ "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 9763091..dd45eeb 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,7 @@ 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"; }; outputs = { self, nixpkgs, ... }@inputs: { nixosConfigurations.clhickey-nixos = nixpkgs.lib.nixosSystem {