diff --git a/README.md b/README.md index 4ad8db2..1fbc46d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +> [!WARNING] +> This is full deprecated please use [eveeifyeve/dotfiles](https://github.com/eveeifyeve/dotfiles) instead it has fully migrated templates and has more templates using the flake partition system. + + # Flake-Templates All of my flake templates made available to use. @@ -47,4 +51,4 @@ Add the following to your flake.nix Then use ```sh nix flake init ./path/to/config/flake.nix -t # -``` \ No newline at end of file +``` diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..a95e60a --- /dev/null +++ b/flake.lock @@ -0,0 +1,84 @@ +{ + "nodes": { + "eveeifyeve-dotfiles": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs", + "systems": "systems" + }, + "locked": { + "lastModified": 1748722109, + "narHash": "sha256-bAfFfjFl2LGH1Py54p4GWYqoH3R77UhJYqekjpc81P4=", + "owner": "eveeifyeve", + "repo": "dotfiles", + "rev": "dd7382f561d5d04a7afa82d6c4ba9348d294f294", + "type": "github" + }, + "original": { + "owner": "eveeifyeve", + "ref": "flake-parts", + "repo": "dotfiles", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "eveeifyeve-dotfiles", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1748506378, + "narHash": "sha256-oS0Gxh63Df8b8r04lqEYDDLKhHIrVr9/JLOn2bn8JaI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3866ad91cfc172f08a6839def503d8fc2923c603", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "eveeifyeve-dotfiles": "eveeifyeve-dotfiles" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 7ed136a..7f6c572 100644 --- a/flake.nix +++ b/flake.nix @@ -1,49 +1,11 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - + eveeifyeve-dotfiles.url = "github:eveeifyeve/dotfiles/flake-parts"; }; - outputs = { self, nixpkgs }: + outputs = { self, eveeifyeve-dotfiles }: { - templates = { - node = { - path = ./node; - description = "Node template"; - }; - python = { - path = self.templates.python.default.path; - description = self.templates.python.default.description; - default = { - path = ./python/default; - description = "Python template"; - }; - poetry = { - path = ./python/poetry; - description = "Python template with poetry"; - }; - }; - rust = { - path = self.templates.rust.default.path; - description = self.templates.rust.default.description; - default = { - path = ./rust/default; - description = "Rust template"; - }; - fenix = { - path = ./rust/fenix; - description = "Rust template with fenix"; - }; - rust-overlay = { - path = ./rust/rust-overlay; - description = "Rust template with rust-overlay"; - }; - }; - zig = { - path = ./zig; - description = "Zig template"; - }; - }; + templates = builtins.warn "templates are deprecated on eveeifyeve/flake-templates please use eveeifyeve/dotfiles: https://github.com/eveeifyeve/dotfiles" eveeifyeve-dotfiles.templates; }; } diff --git a/node/.envrc b/node/.envrc deleted file mode 100644 index 8392d15..0000000 --- a/node/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake \ No newline at end of file diff --git a/node/flake.nix b/node/flake.nix deleted file mode 100644 index 984dfde..0000000 --- a/node/flake.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - }; - - outputs = inputs@{ self, nixpkgs, flake-parts, ... }: - flake-parts.lib.mkFlake {inherit inputs;} { - systems = nixpkgs.lib.systems.flakeExposed; - perSystem = { - pkgs, - config, - lib, - ... - }: - { - devShells.default = pkgs.mkShell - { - packages = with pkgs; [ - # Install your favourite package manager note you don't need nodejs for some package managers: - # bun - - # pnpm - # nodejs - ]; - }; - }; - }; -} \ No newline at end of file diff --git a/node/nix/exampleNpmPackage.nix b/node/nix/exampleNpmPackage.nix deleted file mode 100644 index 8ccf4d9..0000000 --- a/node/nix/exampleNpmPackage.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildNpmPackage, fetchFromGitHub }: - -buildNpmPackage rec { - pname = "name"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = ""; - repo = pname; - rev = "v${version}"; - hash = lib.fakeHash; - }; - - npmDepsHash = lib.fakeHash; - - # The prepack script runs the build script, which we'd rather do in the build phase. - # npmPackFlags = [ "--ignore-scripts" ]; - - # NODE_OPTIONS = "--openssl-legacy-provider"; - - meta = with lib; { - description = ""; - homepage = "url"; - license = licenses.unlicense; - maintainers = []; - }; -} \ No newline at end of file diff --git a/node/nix/pnpmExample.nix b/node/nix/pnpmExample.nix deleted file mode 100644 index 0246928..0000000 --- a/node/nix/pnpmExample.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, lib, pnpm_9, fetchFromGitHub, nodejs}: -let - pnpm = pnpm_9; -in -stdenv.mkDerivation rec { - pname = "name"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "owner"; - repo = pname; - rev = "v${version}"; - hash = lib.fakeHash; - }; - - pnpmDeps = pnpm.fetchDeps { - inherit pname src version; - hash = lib.fakeHash; - }; - - nativeBuildInputs = [ - nodejs - pnpm.configHook - ]; - -} \ No newline at end of file diff --git a/python/default/.envrc b/python/default/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/python/default/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/python/default/flake.nix b/python/default/flake.nix deleted file mode 100644 index 5895176..0000000 --- a/python/default/flake.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - }; - - outputs = inputs@{ self, nixpkgs, flake-parts, ... }: - flake-parts.lib.mkFlake {inherit inputs;} { - systems = nixpkgs.lib.systems.flakeExposed; - perSystem = { - pkgs, - config, - lib, - ... - }: - { - devShells.default = pkgs.mkShell - { - packages = with pkgs; [ - (python3.withPackages (p: with p; [ - # Python dependencies - ])) - ]; - }; - }; - }; -} \ No newline at end of file diff --git a/python/default/nix/exampleApplication.nix b/python/default/nix/exampleApplication.nix deleted file mode 100644 index f06e4b6..0000000 --- a/python/default/nix/exampleApplication.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, python3Packages -, fetchPypi -}: - -python3Packages.buildPythonApplication rec { - pname = "name"; - version = "0.1.0"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = lib.fakeHash; - }; - - build-system = with python3Packages; [ - setuptools - ]; - - dependencies = with python3Packages; [ - # Deps - ]; - - meta = with lib; { - description = ""; - homepage = "url"; - license = licenses.unlicense; - maintainers = []; - }; -} \ No newline at end of file diff --git a/python/default/nix/examplePackage.nix b/python/default/nix/examplePackage.nix deleted file mode 100644 index f722350..0000000 --- a/python/default/nix/examplePackage.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi - -# build-system -, setuptools-scm - }: - -buildPythonPackage rec { - pname = "name"; - version = "0.1.0"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = lib.fakeHash; - }; - - postPatch = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - build-system = [ - setuptools-scm - ]; - - dependencies = [ - # Deps - ]; - - nativeCheckInputs = [ - # Testing PyTest - ]; - - meta = with lib; { - description = ""; - homepage = "url"; - license = licenses.unlicense; - maintainers = []; - }; -} \ No newline at end of file diff --git a/python/poetry/.envrc b/python/poetry/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/python/poetry/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/python/poetry/flake.nix b/python/poetry/flake.nix deleted file mode 100644 index d659f9f..0000000 --- a/python/poetry/flake.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - }; - - outputs = inputs@{ self, nixpkgs, flake-parts, ... }: - flake-parts.lib.mkFlake {inherit inputs;} { - systems = nixpkgs.lib.systems.flakeExposed; - perSystem = { - pkgs, - config, - lib, - ... - }: - { - devShells.default = pkgs.mkShell - { - packages = with pkgs; [ - poetry - ]; - - shellHook = '' - alias py=python - ''; - }; - }; - }; -} \ No newline at end of file diff --git a/python/poetry/nix/exampleApplication.nix b/python/poetry/nix/exampleApplication.nix deleted file mode 100644 index f06e4b6..0000000 --- a/python/poetry/nix/exampleApplication.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, python3Packages -, fetchPypi -}: - -python3Packages.buildPythonApplication rec { - pname = "name"; - version = "0.1.0"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = lib.fakeHash; - }; - - build-system = with python3Packages; [ - setuptools - ]; - - dependencies = with python3Packages; [ - # Deps - ]; - - meta = with lib; { - description = ""; - homepage = "url"; - license = licenses.unlicense; - maintainers = []; - }; -} \ No newline at end of file diff --git a/python/poetry/nix/examplePackage.nix b/python/poetry/nix/examplePackage.nix deleted file mode 100644 index f722350..0000000 --- a/python/poetry/nix/examplePackage.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi - -# build-system -, setuptools-scm - }: - -buildPythonPackage rec { - pname = "name"; - version = "0.1.0"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = lib.fakeHash; - }; - - postPatch = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - - build-system = [ - setuptools-scm - ]; - - dependencies = [ - # Deps - ]; - - nativeCheckInputs = [ - # Testing PyTest - ]; - - meta = with lib; { - description = ""; - homepage = "url"; - license = licenses.unlicense; - maintainers = []; - }; -} \ No newline at end of file diff --git a/rust/default/.envrc b/rust/default/.envrc deleted file mode 100644 index e69de29..0000000 diff --git a/rust/default/flake.nix b/rust/default/flake.nix deleted file mode 100644 index 8d327c5..0000000 --- a/rust/default/flake.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - }; - - outputs = inputs@{ nixpkgs, flake-parts, ... }: - flake-parts.lib.mkFlake {inherit inputs;} { - systems = nixpkgs.lib.systems.flakeExposed; - perSystem = { - lib, - pkgs, - system, - config, - ... - }: - { - devShells.default = pkgs.mkShell - { - packages = with pkgs; [ - openssl - rust-analyzer - rustc - cargo - clippy - rustfmt - ]; - }; - }; - }; -} diff --git a/rust/default/nix/exampleRustPackage.nix b/rust/default/nix/exampleRustPackage.nix deleted file mode 100644 index 6118604..0000000 --- a/rust/default/nix/exampleRustPackage.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "name"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = ""; - repo = pname; - rev = version; - hash = lib.fakeHash; - }; - - cargoHash = lib.fakeHash; - - meta = with lib; { - description = ""; - homepage = "url"; - license = licenses.unlicense; - maintainers = []; - }; -} \ No newline at end of file diff --git a/rust/fenix/.envrc b/rust/fenix/.envrc deleted file mode 100644 index e69de29..0000000 diff --git a/rust/fenix/flake.nix b/rust/fenix/flake.nix deleted file mode 100644 index eda38a8..0000000 --- a/rust/fenix/flake.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - outputs = inputs@{ nixpkgs, flake-parts, ... }: - flake-parts.lib.mkFlake {inherit inputs;} { - systems = nixpkgs.lib.systems.flakeExposed; - perSystem = { - lib, - pkgs, - system, - config, - ... - }: - { - _module.args.pkgs = import nixpkgs { - inherit system; - overlays = [ - (inputs.fenix.overlays.default) - ]; - }; - - devShells.default = with pkgs; let - toolchain = pkgs.fenix.stable.withComponents [ - "rustc" - "cargo" - "clippy" - ]; - in mkShell - { - packages = with pkgs; [ - openssl - rust-analyzer - toolchain - ]; - }; - }; - }; -} \ No newline at end of file diff --git a/rust/fenix/nix/exampleRustPackage.nix b/rust/fenix/nix/exampleRustPackage.nix deleted file mode 100644 index 6118604..0000000 --- a/rust/fenix/nix/exampleRustPackage.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "name"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = ""; - repo = pname; - rev = version; - hash = lib.fakeHash; - }; - - cargoHash = lib.fakeHash; - - meta = with lib; { - description = ""; - homepage = "url"; - license = licenses.unlicense; - maintainers = []; - }; -} \ No newline at end of file diff --git a/rust/rust-overlay/.envrc b/rust/rust-overlay/.envrc deleted file mode 100644 index 8392d15..0000000 --- a/rust/rust-overlay/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake \ No newline at end of file diff --git a/rust/rust-overlay/flale.nix b/rust/rust-overlay/flale.nix deleted file mode 100644 index 7652736..0000000 --- a/rust/rust-overlay/flale.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - outputs = inputs@{ nixpkgs, flake-parts, ... }: - flake-parts.lib.mkFlake {inherit inputs;} { - systems = nixpkgs.lib.systems.flakeExposed; - perSystem = { - lib, - pkgs, - system, - config, - ... - }: - { - _module.args.pkgs = import nixpkgs { - inherit system; - overlays = [ - (import inputs.rust-overlay) - ]; - }; - - devShells.default = with pkgs; let - inherit (pkgs.darwin.apple_sdk.frameworks); # Required Frameworks needed for macOS - - # Rust Toolchain - toolchain = pkgs.rust-bin.stable.latest.default.override { - extensions = ["rust-src"]; - targets = ["x86_64-unknown-linux-gnu"]; - }; - - # toolchain = rust-bin.fromRustupToolchainFile ./toolchain.toml; # Alternatively - in mkShell - { - nativeBuildInputs = with pkgs; [ - toolchain - ] ++ lib.optionals stdenv.isLinux [ - openssl - # Additional Dependencies here for Linux. - ] ++ lib.optionals stdenv.isDarwin [ - # Frameworks here - ]; - }; - }; - }; -} \ No newline at end of file diff --git a/rust/rust-overlay/nix/exampleRustPackage.nix b/rust/rust-overlay/nix/exampleRustPackage.nix deleted file mode 100644 index 6118604..0000000 --- a/rust/rust-overlay/nix/exampleRustPackage.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "name"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = ""; - repo = pname; - rev = version; - hash = lib.fakeHash; - }; - - cargoHash = lib.fakeHash; - - meta = with lib; { - description = ""; - homepage = "url"; - license = licenses.unlicense; - maintainers = []; - }; -} \ No newline at end of file diff --git a/tauri/.envrc b/tauri/.envrc deleted file mode 100644 index 8392d15..0000000 --- a/tauri/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake \ No newline at end of file diff --git a/tauri/flake.nix b/tauri/flake.nix deleted file mode 100644 index 3444667..0000000 --- a/tauri/flake.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - outputs = inputs@{ nixpkgs, flake-parts, ... }: - flake-parts.lib.mkFlake {inherit inputs;} { - systems = nixpkgs.lib.systems.flakeExposed; - perSystem = { - lib, - pkgs, - system, - config, - ... - }: - { - _module.args.pkgs = import nixpkgs { - inherit system; - overlays = [ - (import inputs.rust-overlay) - ]; - }; - - devShells.default = with pkgs; let - # Rust Toolchain - toolchain = pkgs.rust-bin.stable.latest.default.override { - extensions = ["rust-src"]; - targets = [ - "aarch64-apple-darwin" - "x86_64-apple-darwin" - - # If building for iOS, add the following targets: - # "aarch64-apple-ios" - # "x86_64-apple-ios" - # "aarch64-apple-ios-sim" - - # If building for Android, add the following targets: - # "aarch64-linux-android" - # "armv7-linux-androideabi" - # "i686-linux-android" - # "x86_64-linux-android" - ]; - }; - - # toolchain = rust-bin.fromRustupToolchainFile ./toolchain.toml; # Alternatively - in mkShell - { - nativeBuildInputs = with pkgs; [ - openssl - pkgs-config - toolchain - ] ++ lib.optionals stdenv.isLinux [ - webkitgtk_4_1 - glib-networking - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.WebKit - ]; - }; - }; - }; -} diff --git a/tauri/nix/exampleRustPackage.nix b/tauri/nix/exampleRustPackage.nix deleted file mode 100644 index 99b4487..0000000 --- a/tauri/nix/exampleRustPackage.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, cargo-tauri, pkg-config, openssl, glib-networking, libsoup, webkitgtk, darwin, stdenv }: - -rustPlatform.buildRustPackage rec { - pname = "name"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = ""; - repo = pname; - rev = version; - hash = lib.fakeHash; - }; - - cargoHash = lib.fakeHash; - - nativeBuildInputs = [ - cargo-tauri.hook - pkg-config - # Setup a JS Frontend using npm, yarn, pnpm & bun (Coming soon) - ]; - - - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.isLinux [ - glib-networking # Most Tauri apps need networking - libsoup - webkitgtk - ] - ++ lib.optionals stdenv.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - AppKit - CoreServices - Security - WebKit - ] - ); - - meta = with lib; { - description = ""; - homepage = "url"; - license = licenses.unlicense; - maintainers = []; - }; -} diff --git a/zig/.envrc b/zig/.envrc deleted file mode 100644 index e69de29..0000000 diff --git a/zig/flake.nix b/zig/flake.nix deleted file mode 100644 index fcfa9f3..0000000 --- a/zig/flake.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - flake-parts.url = "github:hercules-ci/flake-parts"; - }; - - outputs = inputs@{ nixpkgs, flake-parts, ... }: - flake-parts.lib.mkFlake {inherit inputs;} { - systems = nixpkgs.lib.systems.flakeExposed; - perSystem = { - lib, - pkgs, - system, - config, - ... - }: - { - devShells.default = pkgs.mkShell - { - packages = with pkgs; [ - zig - ]; - }; - }; - }; -} \ No newline at end of file diff --git a/zig/nix/examplePackage.nix b/zig/nix/examplePackage.nix deleted file mode 100644 index 3ab8278..0000000 --- a/zig/nix/examplePackage.nix +++ /dev/null @@ -1,20 +0,0 @@ -{lib, stdenv, fetchFromGitHub, zig}: -stdenv.mkDerivation rec { - pname = "examplePackage"; - version = "0.0.1"; - - src = fetchFromGitHub { - owner = "ziglang"; - repo = "zig"; - rev = "v${version}"; - hash = lib.fakeHash; - }; - - nativeBuildInputs = [ - zig.hook - ]; - - zigBuildFlags = [ "-Dman-pages=true" ]; - - dontUseZigCheck = true; -} \ No newline at end of file