From 78023b3b12e3e4999e0de6dcacb977e67bc4a9f6 Mon Sep 17 00:00:00 2001 From: rotterdam Date: Wed, 5 Apr 2023 14:52:29 -0300 Subject: [PATCH 01/10] Fixed hello template --- hello/flake.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hello/flake.nix b/hello/flake.nix index 587a41a..ee74b8c 100644 --- a/hello/flake.nix +++ b/hello/flake.nix @@ -1,5 +1,5 @@ { - description = "Flake template for a rust project"; + description = "Flake template for a nix shell with packages"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; @@ -7,6 +7,7 @@ }; outputs = { self, nixpkgs, flake-utils, ... }: - flake-utils.lib.eachDefaultSystem - (system: { devShells.default = mkShell { packages = [ hello ]; }; }); + flake-utils.lib.eachDefaultSystem (system: + let pkgs = import nixpkgs { inherit system; }; + in with pkgs; { devShells.default = mkShell { packages = [ typst ]; }; }); } From 868d01d3a197b0fffb96e0a9932da98f9549a9c9 Mon Sep 17 00:00:00 2001 From: rotterdam Date: Thu, 6 Apr 2023 12:25:33 -0300 Subject: [PATCH 02/10] Added package template --- package/.envrc | 4 ++++ package/flake.nix | 17 +++++++++++++++++ package/package.nix | 16 ++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 package/.envrc create mode 100644 package/flake.nix create mode 100644 package/package.nix diff --git a/package/.envrc b/package/.envrc new file mode 100644 index 0000000..e31c306 --- /dev/null +++ b/package/.envrc @@ -0,0 +1,4 @@ +if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs=" +fi +use flake diff --git a/package/flake.nix b/package/flake.nix new file mode 100644 index 0000000..2b20800 --- /dev/null +++ b/package/flake.nix @@ -0,0 +1,17 @@ +{ + description = "Flake template for nix package"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils, ... }: + flake-utils.lib.eachDefaultSystem (system: + let pkgs = import nixpkgs { inherit system; }; + in with pkgs; { + devShells.default = mkShell { packages = [ ]; }; + packages.default = self.packages."${system}".package; + packages."package" = pkgs.callPackage ./package.nix { }; + }); +} diff --git a/package/package.nix b/package/package.nix new file mode 100644 index 0000000..b642733 --- /dev/null +++ b/package/package.nix @@ -0,0 +1,16 @@ +{ lib +, stdenv +}: + +stdenv.mkDerivation (finalAttrs: { + pname = ""; + version = ""; + + meta = with lib; { + description = ""; + homepage = ""; + license = licenses.; + platforms = platforms.all; + }; +}) + From 741dad4df562e1a77ab4ab886e14ecb4cf3e2579 Mon Sep 17 00:00:00 2001 From: rotterdam Date: Thu, 6 Apr 2023 12:29:12 -0300 Subject: [PATCH 03/10] Finished adding package template --- flake.nix | 4 ++++ package/flake.nix | 8 +++++--- package/package.nix | 4 +--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index e3534b2..1146f58 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ path = ./hello; description = "Template including hello in shell packages"; }; + package = { + path = ./package; + description = "Template for a nix package"; + }; rust = { path = ./rust; description = "Rust template, using oxalica/rust-overlay"; diff --git a/package/flake.nix b/package/flake.nix index 2b20800..31c3ece 100644 --- a/package/flake.nix +++ b/package/flake.nix @@ -1,5 +1,5 @@ { - description = "Flake template for nix package"; + description = "Template for a nix package"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; @@ -11,7 +11,9 @@ let pkgs = import nixpkgs { inherit system; }; in with pkgs; { devShells.default = mkShell { packages = [ ]; }; - packages.default = self.packages."${system}".package; - packages."package" = pkgs.callPackage ./package.nix { }; + packages = { + default = self.packages."${system}".package; + "package" = pkgs.callPackage ./package.nix { }; + }; }); } diff --git a/package/package.nix b/package/package.nix index b642733..7bad0de 100644 --- a/package/package.nix +++ b/package/package.nix @@ -1,6 +1,4 @@ -{ lib -, stdenv -}: +{ lib, stdenv }: stdenv.mkDerivation (finalAttrs: { pname = ""; From 11f49ad0d7b9d43dbd1dd8c2f255531cca10fb3a Mon Sep 17 00:00:00 2001 From: rotterdam Date: Thu, 6 Apr 2023 12:30:44 -0300 Subject: [PATCH 04/10] renamed hello template to shell --- flake.nix | 6 +++--- {hello => shell}/.envrc | 0 {hello => shell}/flake.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename {hello => shell}/.envrc (100%) rename {hello => shell}/flake.nix (85%) diff --git a/flake.nix b/flake.nix index 1146f58..da5e593 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,9 @@ outputs = { self }: { templates = { - hello = { - path = ./hello; - description = "Template including hello in shell packages"; + shell = { + path = ./shell; + description = "Template for a devShell"; }; package = { path = ./package; diff --git a/hello/.envrc b/shell/.envrc similarity index 100% rename from hello/.envrc rename to shell/.envrc diff --git a/hello/flake.nix b/shell/flake.nix similarity index 85% rename from hello/flake.nix rename to shell/flake.nix index ee74b8c..3c3d969 100644 --- a/hello/flake.nix +++ b/shell/flake.nix @@ -1,5 +1,5 @@ { - description = "Flake template for a nix shell with packages"; + description = "Template for a devShell"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; From 5e4fe081d2db8fdd7f879bbe819bf1073c22a4c8 Mon Sep 17 00:00:00 2001 From: rotterdam Date: Thu, 6 Apr 2023 12:31:14 -0300 Subject: [PATCH 05/10] top-level flake edit --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index da5e593..61be80e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,6 @@ outputs = { self }: { templates = { - shell = { - path = ./shell; - description = "Template for a devShell"; - }; package = { path = ./package; description = "Template for a nix package"; @@ -15,6 +11,10 @@ path = ./rust; description = "Rust template, using oxalica/rust-overlay"; }; + shell = { + path = ./shell; + description = "Template for a devShell"; + }; }; }; } From e262642807459180239872f4d59f92b5efd2b5f1 Mon Sep 17 00:00:00 2001 From: baduhai Date: Thu, 20 Jul 2023 12:01:19 -0300 Subject: [PATCH 06/10] Minor mods to shell tmeplate --- shell/flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/flake.nix b/shell/flake.nix index 3c3d969..a093eee 100644 --- a/shell/flake.nix +++ b/shell/flake.nix @@ -1,5 +1,5 @@ { - description = "Template for a devShell"; + description = "Flake template for a devShell"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; @@ -9,5 +9,5 @@ outputs = { self, nixpkgs, flake-utils, ... }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; - in with pkgs; { devShells.default = mkShell { packages = [ typst ]; }; }); + in with pkgs; { devShells.default = mkShell { packages = [ hello ]; }; }); } From 77d5e6651dc7fb24cc839535d4dfd3a2e789fb5e Mon Sep 17 00:00:00 2001 From: baduhai Date: Thu, 20 Jul 2023 12:07:37 -0300 Subject: [PATCH 07/10] Created python environment template --- python/flake.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 python/flake.nix diff --git a/python/flake.nix b/python/flake.nix new file mode 100644 index 0000000..fa0b613 --- /dev/null +++ b/python/flake.nix @@ -0,0 +1,19 @@ +{ + description = "Flake template for a python project"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils, ... }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { inherit system; }; + in with pkgs; { + devShells.default = mkShell { + buildInputs = [ python310 ]; + packages = [ ]; + }; + }); +} From f27420992aab95f529690cfd71127701f40dff0e Mon Sep 17 00:00:00 2001 From: baduhai Date: Thu, 20 Jul 2023 12:23:22 -0300 Subject: [PATCH 08/10] Forgot to add python tmeplate to greater flake --- flake.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/flake.nix b/flake.nix index 61be80e..0c7d96a 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ path = ./package; description = "Template for a nix package"; }; + python = { + path = ./python + description = "Template to python project"; + }; rust = { path = ./rust; description = "Rust template, using oxalica/rust-overlay"; From 3950d3fe20b0e5dd1f4991311def52b384d786d0 Mon Sep 17 00:00:00 2001 From: baduhai Date: Thu, 20 Jul 2023 12:24:43 -0300 Subject: [PATCH 09/10] damn semicolons --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 0c7d96a..9c77ef7 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ description = "Template for a nix package"; }; python = { - path = ./python + path = ./python; description = "Template to python project"; }; rust = { From a634e932f6ee9cfd3dd26b393c91b3372e67ae1b Mon Sep 17 00:00:00 2001 From: William Date: Tue, 15 Aug 2023 10:33:31 -0300 Subject: [PATCH 10/10] Added C template --- c/.envrc | 4 ++++ c/Makefile | 16 ++++++++++++++++ c/flake.nix | 13 +++++++++++++ flake.nix | 8 ++++++-- python/.envrc | 4 ++++ 5 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 c/.envrc create mode 100644 c/Makefile create mode 100644 c/flake.nix create mode 100644 python/.envrc diff --git a/c/.envrc b/c/.envrc new file mode 100644 index 0000000..e31c306 --- /dev/null +++ b/c/.envrc @@ -0,0 +1,4 @@ +if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs=" +fi +use flake diff --git a/c/Makefile b/c/Makefile new file mode 100644 index 0000000..76ba218 --- /dev/null +++ b/c/Makefile @@ -0,0 +1,16 @@ +all: main + +CC = clang +override CFLAGS += -g -Wno-everything -pthread -lm + +SRCS = $(shell find . -name '.ccls-cache' -type d -prune -o -type f -name '*.c' -print) +HEADERS = $(shell find . -name '.ccls-cache' -type d -prune -o -type f -name '*.h' -print) + +main: $(SRCS) $(HEADERS) + $(CC) $(CFLAGS) $(SRCS) -o "$@" + +main-debug: $(SRCS) $(HEADERS) + $(CC) $(CFLAGS) -O0 $(SRCS) -o "$@" + +clean: + rm -f main main-debug \ No newline at end of file diff --git a/c/flake.nix b/c/flake.nix new file mode 100644 index 0000000..0d416ec --- /dev/null +++ b/c/flake.nix @@ -0,0 +1,13 @@ +{ + description = "Flake template for a devShell"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils, ... }: + flake-utils.lib.eachDefaultSystem (system: + let pkgs = import nixpkgs { inherit system; }; + in with pkgs; { devShells.default = mkShell { packages = [ clang_12 ccls gdb gnumake ]; }; }); +} diff --git a/flake.nix b/flake.nix index 9c77ef7..5b665fa 100644 --- a/flake.nix +++ b/flake.nix @@ -3,17 +3,21 @@ outputs = { self }: { templates = { + c = { + path = ./c; + description = "Template for a C project"; + }; package = { path = ./package; description = "Template for a nix package"; }; python = { path = ./python; - description = "Template to python project"; + description = "Template for a python project"; }; rust = { path = ./rust; - description = "Rust template, using oxalica/rust-overlay"; + description = "Template for a rust project, using oxalica/rust-overlay"; }; shell = { path = ./shell; diff --git a/python/.envrc b/python/.envrc new file mode 100644 index 0000000..e31c306 --- /dev/null +++ b/python/.envrc @@ -0,0 +1,4 @@ +if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs=" +fi +use flake