diff options
Diffstat (limited to 'org/config_nix.org')
| -rw-r--r-- | org/config_nix.org | 154 |
1 files changed, 98 insertions, 56 deletions
diff --git a/org/config_nix.org b/org/config_nix.org index 4cc10b4..ddc0122 100644 --- a/org/config_nix.org +++ b/org/config_nix.org @@ -15,19 +15,8 @@ #+PROPERTY: header-args+ :mkdirp yes #+OPTIONS: H:3 num:nil toc:t \n:t ::t |:t ^:nil -:t f:t *:t -* nix :nix: - -#+NAME: nixpkgs_local -#+BEGIN_SRC sh -/srv/nix/nixpkgs -#+END_SRC - * sisu - -- default.nix -- shell.nix - -** flake.nix +** flake.nix :flake: #+HEADER: :tangle ../flake.nix #+HEADER: :noweb yes @@ -44,12 +33,12 @@ nixpkgs, sisu } @ inputs: let - version = "<<sisu_version_set>>"; + version = "<<sisu_project_version>>"; shell = ./shell.nix; # ./default.nix; devEnv = ./.envrc; # ./.envrc; # ./shell.nix; # ./default.nix; supportedSystems = [ "x86_64-linux" ]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; forAllSystems = nixpkgs.lib.genAttrs supportedSystems; - nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); # nixpkgs instantiated for supported system types. + nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); # nixpkgs instantiated for supported system types in { packages = forAllSystems (system: let pkgs = nixpkgsFor.${system}; @@ -216,23 +205,6 @@ } #+END_SRC -*** flake :flake: -**** flake parts -***** ruby version - -#+NAME: ruby_current -#+BEGIN_SRC shell -ruby<<ruby_version>> -rubyPackages<<ruby_version>>.rake -rubyPackages<<ruby_version>>.sqlite3 -rubyPackages<<ruby_version>>.thor -#+END_SRC - -#+NAME: ruby_version -#+BEGIN_SRC shell -_3_4 -#+END_SRC - ** shell.nix :shell: *** tangle @@ -248,10 +220,6 @@ in pkgs.mkShell { nix bundler bundix - #ruby - #rubyPackages.rake - #rubyPackages.sqlite3 - #rubyPackages.thor <<ruby_current>> sqlite graphicsmagick @@ -260,32 +228,97 @@ in pkgs.mkShell { zip #texliveFull # texliveTeTeX ]; + shellHook = '' + ''; } #+END_SRC -**** shell parts (packages) -***** packages nix related +** shared parts +*** nixpkgs url -#+NAME: shell_packages_nix_related +#+NAME: nixpkgs_url #+BEGIN_SRC nix -### nix_related -direnv -nixVersions.unstable #nixFlakes -nix-prefetch-git -validatePkgConfig -jq -git -ps +github:NixOS/nixpkgs/nixpkgs-unstable #+END_SRC -** variables -*** sisu version SET VERSION :version:set:project: +*** ruby versions +**** ruby package selection +***** ruby next -#+NAME: sisu_version_set -#+BEGIN_SRC sh -0.7.3 +#+NAME: ruby_next +#+BEGIN_SRC nix +ruby<<ruby_version_next>> +rubyPackages<<ruby_version_next>>.rake +rubyPackages<<ruby_version_next>>.sqlite3 +rubyPackages<<ruby_version_next>>.thor +#+END_SRC + +***** ruby current + +#+NAME: ruby_current +#+BEGIN_SRC nix +ruby<<ruby_version_current>> +rubyPackages<<ruby_version_current>>.rake +rubyPackages<<ruby_version_current>>.sqlite3 +rubyPackages<<ruby_version_current>>.thor +#+END_SRC + +***** ruby legacy + +#+NAME: ruby_legacy +#+BEGIN_SRC nix +ruby<<ruby_version_legacy>> +rubyPackages<<ruby_version_legacy>>.rake +rubyPackages<<ruby_version_legacy>>.sqlite3 +rubyPackages<<ruby_version_legacy>>.thor +#+END_SRC + +**** SET ruby nix package versions (current, next) +***** SET ruby version next + +#+NAME: ruby_version_next +#+BEGIN_SRC nix +_3_4 +#+END_SRC + +***** SET ruby version current + +- default to current nix version, which is ruby 3.3 but not provided as a fixed lable/tag, so leave blank and will + follow nix current nix + +#+NAME: ruby_version_current +#+BEGIN_SRC nix +#+END_SRC + +***** SET ruby version legacy + +#+NAME: ruby_version_legacy +#+BEGIN_SRC nix +_3_2 #+END_SRC +**** ruby fixed versions +***** ruby 3.4 - ruby_version_3_4 + +#+NAME: ruby_version_3_4 +#+BEGIN_SRC nix +ruby_3_4 +rubyPackages_3_4.rake +rubyPackages_3_4.sqlite3 +rubyPackages_3_4.thor +#+END_SRC + +***** ruby 3.2 - ruby_version_3_2 + +#+NAME: ruby_version_3_2 +#+BEGIN_SRC nix +ruby_3_2 +rubyPackages_3_2.rake +rubyPackages_3_2.sqlite3 +rubyPackages_3_2.thor +#+END_SRC + +*** packages.nix *** set names SET #+NAME: sisu_search_db @@ -378,11 +411,6 @@ nixpkgs=<<nixpkgs_path_local>> /var/www/sqlite #+END_SRC -#+NAME: nixpkgs_url -#+BEGIN_SRC nix -github:NixOS/nixpkgs/nixpkgs-unstable -#+END_SRC - #+BEGIN_SRC nix github:nixos/nixpkgs #+END_SRC @@ -438,3 +466,17 @@ pkgs.mkShell { ''; } #+END_SRC + +*** sisu version SET VERSION :version:set:project: + +#+NAME: sisu_project_version +#+BEGIN_SRC emacs-lisp +<<./sisu_version_info_and_doc_header_including_copyright_and_license.org:sisu_project_version()>> +#+END_SRC + +* nix :nix: + +#+NAME: nixpkgs_local +#+BEGIN_SRC sh +/srv/nix/nixpkgs +#+END_SRC |