From 458c94c1feb91d5ffc54ae14ab2b6b6c2731933d Mon Sep 17 00:00:00 2001 From: macronova Date: Thu, 20 Mar 2025 11:16:32 +0800 Subject: [PATCH] Use devenv --- flake.lock | 66 +++++++++++++++++++------------------- linux/quasar/default.nix | 1 + linux/quasar/device.nix | 2 ++ template/context/flake.nix | 22 ------------- template/devenv/.envrc | 2 ++ template/devenv/.gitignore | 5 +++ template/devenv/flake.nix | 43 +++++++++++++++++++++++++ template/python/flake.nix | 28 ---------------- template/r/flake.nix | 23 ------------- template/rust/.envrc | 2 -- template/rust/flake.nix | 28 ---------------- template/typst/flake.nix | 19 ----------- 12 files changed, 86 insertions(+), 155 deletions(-) delete mode 100644 template/context/flake.nix create mode 100644 template/devenv/.envrc create mode 100644 template/devenv/.gitignore create mode 100644 template/devenv/flake.nix delete mode 100644 template/python/flake.nix delete mode 100644 template/r/flake.nix delete mode 100644 template/rust/.envrc delete mode 100644 template/rust/flake.nix delete mode 100644 template/typst/flake.nix diff --git a/flake.lock b/flake.lock index d7f98c8..5660f8b 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1740485968, - "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", + "lastModified": 1741786315, + "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "owner": "nix-community", "repo": "disko", - "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", + "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "hardware": { "locked": { - "lastModified": 1741325094, - "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=", + "lastModified": 1742376361, + "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16", + "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1741635347, - "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", + "lastModified": 1742434866, + "narHash": "sha256-RIa4WyQX9hicMCG+cSYJfWFws2tfwO+Ty1NcIoIA/2U=", "owner": "nix-community", "repo": "home-manager", - "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", + "rev": "cfaa4426a3eee6e71ab02a4d72410e69abf06a12", "type": "github" }, "original": { @@ -199,11 +199,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1741588655, - "narHash": "sha256-v+bQZbis5c1uSXWCGsbMUb5oL8i8+6YbdVZYaJr4qI0=", + "lastModified": 1742379255, + "narHash": "sha256-3hawSM+/DMl86SLYX65sQXlShAsm6Jf6eWD1ZyDonE8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "c769e6fa7ea00689254eb3f8385baec7e2f771cc", + "rev": "d06c20692fc1038b7c6bf6c69acd56311bd79570", "type": "github" }, "original": { @@ -220,11 +220,11 @@ "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1740437053, - "narHash": "sha256-exPTta4qI1ka9sk+jPcLogGffJ1OVXnAsTRqpeAXeNw=", + "lastModified": 1742412370, + "narHash": "sha256-Od+DxkcIT43gfFpJcJ/vXDeTBLg9QG559T9iWWBio70=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "c8ec4d5e432f5df4838eacd39c11828d23ce66ec", + "rev": "0c40a0b2c60b097e557cd669610a8baf3540a4dd", "type": "gitlab" }, "original": { @@ -284,11 +284,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738136902, - "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", + "lastModified": 1741402956, + "narHash": "sha256-y2hByvBM03s9T2fpeLjW6iprbxnhV9mJMmSwCHc41ZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", + "rev": "ed0b1881565c1ffef490c10d663d4f542031dad3", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1731763621, - "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { @@ -466,11 +466,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1742300892, + "narHash": "sha256-QmF0proyjXI9YyZO9GZmc7/uEu5KVwCtcdLsKSoxPAI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "ea26a82dda75bee6783baca6894040c8e6599728", "type": "github" }, "original": { @@ -499,11 +499,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1741644481, - "narHash": "sha256-E0RrMykMtEv15V3QhpsFutgoSKhL1JBhidn+iZajOyg=", + "lastModified": 1742406979, + "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e653d71e82575a43fe9d228def8eddb73887b866", + "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", "type": "github" }, "original": { diff --git a/linux/quasar/default.nix b/linux/quasar/default.nix index 171fd49..0c7a1ca 100644 --- a/linux/quasar/default.nix +++ b/linux/quasar/default.nix @@ -22,5 +22,6 @@ common-hidpi common-pc common-pc-ssd + gigabyte-b650 ]); } diff --git a/linux/quasar/device.nix b/linux/quasar/device.nix index ec85d0e..1b13a5c 100644 --- a/linux/quasar/device.nix +++ b/linux/quasar/device.nix @@ -52,8 +52,10 @@ in { podman = { enable = true; autoPrune.enable = true; + defaultNetwork.settings.dns_enabled = true; dockerCompat = true; dockerSocket.enable = true; }; + spiceUSBRedirection.enable = true; }; } diff --git a/template/context/flake.nix b/template/context/flake.nix deleted file mode 100644 index d43b4b9..0000000 --- a/template/context/flake.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - }; - - outputs = { - self, - flake-utils, - nixpkgs, - }: - flake-utils.lib.eachDefaultSystem (system: let - pkgs = nixpkgs.legacyPackages.${system}; - in { - devShells.default = pkgs.mkShell { - packages = with pkgs; [texlive.combined.scheme-full]; - TEXMFHOME = "$XDG_DATA_HOME/texmf"; - TEXMFVAR = "$XDG_CACHE_HOME/texlive/texmf-var"; - EXMFCONFIG = "$XDG_CONFIG_HOME/texlive/texmf-config"; - }; - }); -} diff --git a/template/devenv/.envrc b/template/devenv/.envrc new file mode 100644 index 0000000..820888e --- /dev/null +++ b/template/devenv/.envrc @@ -0,0 +1,2 @@ +export CARGO_HOME=$(pwd)/.cargo +use flake . --no-pure-eval diff --git a/template/devenv/.gitignore b/template/devenv/.gitignore new file mode 100644 index 0000000..0cf5b7a --- /dev/null +++ b/template/devenv/.gitignore @@ -0,0 +1,5 @@ +* +!.envrc +!.gitignore +!flake.nix +!flake.lock diff --git a/template/devenv/flake.nix b/template/devenv/flake.nix new file mode 100644 index 0000000..820e44b --- /dev/null +++ b/template/devenv/flake.nix @@ -0,0 +1,43 @@ +{ + inputs = { + devenv.url = "github:cachix/devenv"; + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-python.url = "github:cachix/nixpkgs-python"; + }; + + outputs = inputs @ { + self, + devenv, + flake-utils, + nixpkgs, + ... + }: + flake-utils.lib.eachDefaultSystem (system: let + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + }; + in { + packages = { + devenv-up = self.devShells.${system}.default.config.procfileScript; + devenv-test = self.devShells.${system}.default.config.test; + }; + + devShells.default = devenv.lib.mkShell { + inherit inputs pkgs; + modules = [ + { + git-hooks.hooks.alejandra.enable = true; + languages = { + nix.enable = true; + # python.enable = true; + # r.enable = true; + # rust.enable = true; + # typst.enable = true; + }; + } + ]; + }; + }); +} diff --git a/template/python/flake.nix b/template/python/flake.nix deleted file mode 100644 index 90030ad..0000000 --- a/template/python/flake.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - }; - - outputs = { - self, - flake-utils, - nixpkgs, - }: - flake-utils.lib.eachDefaultSystem (system: let - pkgs = nixpkgs.legacyPackages.${system}; - in { - devShells.default = pkgs.mkShell { - packages = with pkgs; [ - ( - python3.withPackages (pyPkgs: - with pyPkgs; [ - pylsp-mypy - python-lsp-ruff - python-lsp-server - ]) - ) - ]; - }; - }); -} diff --git a/template/r/flake.nix b/template/r/flake.nix deleted file mode 100644 index 11ec37b..0000000 --- a/template/r/flake.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - }; - - outputs = { - self, - flake-utils, - nixpkgs, - }: - flake-utils.lib.eachDefaultSystem (system: let - pkgs = nixpkgs.legacyPackages.${system}; - in { - devShells.default = pkgs.mkShell { - packages = with pkgs; [ - (rWrapper.override { - packages = with rPackages; [tidyverse]; - }) - ]; - }; - }); -} diff --git a/template/rust/.envrc b/template/rust/.envrc deleted file mode 100644 index 89917d6..0000000 --- a/template/rust/.envrc +++ /dev/null @@ -1,2 +0,0 @@ -export CARGO_HOME=$(pwd)/cargo -use flake diff --git a/template/rust/flake.nix b/template/rust/flake.nix deleted file mode 100644 index 2a753e1..0000000 --- a/template/rust/flake.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - inputs = { - crane.url = "github:ipetkov/crane"; - flake-utils.url = "github:numtide/flake-utils"; - fenix.url = "github:nix-community/fenix"; - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - }; - - outputs = { - self, - crane, - fenix, - flake-utils, - nixpkgs, - }: - flake-utils.lib.eachDefaultSystem (system: let - pkgs = nixpkgs.legacyPackages.${system}; - fenixPkgs = fenix.packages.${system}; - craneLib = crane.mkLib pkgs; - in { - devShells.default = craneLib.devShell { - packages = [ - fenixPkgs.rust-analyzer - ]; - RUST_SRC_PATH = "${fenixPkgs.complete.rust-src}/lib/rustlib/src/rust/library"; - }; - }); -} diff --git a/template/typst/flake.nix b/template/typst/flake.nix deleted file mode 100644 index 0f0e4f8..0000000 --- a/template/typst/flake.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - }; - - outputs = { - self, - flake-utils, - nixpkgs, - }: - flake-utils.lib.eachDefaultSystem (system: let - pkgs = nixpkgs.legacyPackages.${system}; - in { - devShells.default = pkgs.mkShell { - packages = with pkgs; [typst]; - }; - }); -}