diff --git a/flake.lock b/flake.lock index ab624b7..15e44a4 100644 --- a/flake.lock +++ b/flake.lock @@ -22,10 +22,33 @@ "type": "github" } }, - "borgthin": { + "boardie": { "inputs": { "devshell": "devshell", "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "poetry2nix": "poetry2nix" + }, + "locked": { + "lastModified": 1682289679, + "narHash": "sha256-DbhSJ6y62VAO2VsJwoz3VsxCEP/4KMeFVs0wIz6Im04=", + "owner": "devplayer0", + "repo": "boardie", + "rev": "e4b977f75bf7b4f656a691efca492ae057672a77", + "type": "github" + }, + "original": { + "owner": "devplayer0", + "repo": "boardie", + "type": "github" + } + }, + "borgthin": { + "inputs": { + "devshell": "devshell_2", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs-mine" ] @@ -94,6 +117,25 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" }, + "locked": { + "lastModified": 1678957337, + "narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=", + "owner": "numtide", + "repo": "devshell", + "rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_3" + }, "locked": { "lastModified": 1671489820, "narHash": "sha256-qoei5HDJ8psd1YUPD7DhbHdhLIT9L2nadscp4Qk37uk=", @@ -108,9 +150,9 @@ "type": "github" } }, - "devshell_2": { + "devshell_3": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs-unstable" ] @@ -161,36 +203,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "inputs": { "systems": "systems" }, @@ -208,7 +220,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_3": { "inputs": { "systems": "systems_2" }, @@ -226,7 +238,88 @@ "type": "github" } }, + "flake-utils_4": { + "locked": { + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_6": { + "locked": { + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -298,11 +391,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1643381941, - "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", + "lastModified": 1677383253, + "narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5", + "rev": "9952d6bc395f5841262b006fbace8dd7e143b634", "type": "github" }, "original": { @@ -374,10 +467,60 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1681756206, + "narHash": "sha256-7B2Jc1zosXvZJKlxTPBlGew0LeX/7cxguG/d3syc1JI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6eceb07c28016ec50dd683fda94995702b67e855", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1643381941, + "narHash": "sha256-pHTwvnN4tTsEKkWlXQ8JMY423epos8wUOhthpwJjtpc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5efc8ca954272c4376ac929f4c5ffefcc20551d5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "poetry2nix": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1681532901, + "narHash": "sha256-9ZN/gaCOlkx53km4J2QkLQh4bS+6UCBsjdi87kw6+jc=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "2e66fd2623eccb3086e52929c2cefd882faac8a8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, "ragenix": { "inputs": { "agenix": "agenix", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs-unstable" ], @@ -399,10 +542,11 @@ }, "root": { "inputs": { + "boardie": "boardie", "borgthin": "borgthin", "deploy-rs": "deploy-rs", - "devshell": "devshell_2", - "flake-utils": "flake-utils_4", + "devshell": "devshell_3", + "flake-utils": "flake-utils_7", "home-manager-stable": "home-manager-stable", "home-manager-unstable": "home-manager-unstable", "impermanence": "impermanence", @@ -441,7 +585,7 @@ }, "sharry": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_9", "nixpkgs": [ "nixpkgs-unstable" ] @@ -490,6 +634,36 @@ "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" + } + }, + "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" + } + }, "utils": { "locked": { "lastModified": 1667395993, diff --git a/flake.nix b/flake.nix index 710ed66..357aa04 100644 --- a/flake.nix +++ b/flake.nix @@ -24,6 +24,8 @@ # Stuff used by systems impermanence.url = "github:nix-community/impermanence"; + boardie.url = "github:devplayer0/boardie"; + boardie.inputs.nixpkgs.follows = "nixpkgs-unstable"; # Packages not in nixpkgs sharry.url = "github:eikek/sharry"; diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix index 9cb94ce..b905b16 100644 --- a/home-manager/modules/common.nix +++ b/home-manager/modules/common.nix @@ -213,6 +213,7 @@ in nixpkgs = { overlays = [ inputs.deploy-rs.overlay + inputs.boardie.overlays.default ]; config = { allowUnfree = true; diff --git a/home-manager/modules/gui/default.nix b/home-manager/modules/gui/default.nix index 59136e7..fca06df 100644 --- a/home-manager/modules/gui/default.nix +++ b/home-manager/modules/gui/default.nix @@ -23,6 +23,7 @@ in python310Packages.python-lsp-server nil # nix language server zls # zig language server + neofetch ]; }; diff --git a/nixos/boxes/castle/default.nix b/nixos/boxes/castle/default.nix index 0314842..d2ac6a6 100644 --- a/nixos/boxes/castle/default.nix +++ b/nixos/boxes/castle/default.nix @@ -138,6 +138,8 @@ tmproot.size = "24G"; user = { + config.extraGroups = [ "input" ]; + tmphome = false; homeConfig = { services = { }; @@ -146,6 +148,9 @@ packages = with pkgs; [ jacktrip qpwgraph + (writeShellScriptBin "boardie" '' + exec pw-jack ${pkgs.boardie}/bin/boardie "$@" + '') ]; }; diff --git a/nixos/modules/common.nix b/nixos/modules/common.nix index 012ee1b..34ed3e9 100644 --- a/nixos/modules/common.nix +++ b/nixos/modules/common.nix @@ -74,6 +74,7 @@ in inputs.deploy-rs.overlay inputs.sharry.overlays.default inputs.borgthin.overlays.default + inputs.boardie.overlays.default ]; config = { allowUnfree = true; diff --git a/nixos/modules/gui.nix b/nixos/modules/gui.nix index 429fe99..1498456 100644 --- a/nixos/modules/gui.nix +++ b/nixos/modules/gui.nix @@ -23,6 +23,10 @@ in security.polkit.enable = true; + environment.systemPackages = with pkgs; [ + # for pw-jack + pipewire.jack + ]; services = { pipewire = { enable = true;