Merge branch 'nix-shell' into 'main'

Nix shell

See merge request bde/nk20!201

.gitignore

@@ -48,7 +48,6 @@ backups/
 env/
 venv/
 db.sqlite3
-shell.nix
 
 # ansibles customs host
 ansible/host_vars/*.yaml

note_kfet/static/css/custom.css

@@ -61,6 +61,11 @@ mark {
 /* Make navbar more readable */
 .navbar-dark .navbar-nav .nav-link {
     color: rgba(255, 255, 255, .75);
+    text-shadow: 2px 2px 15px #ffeb40;
+}
+
+.navbar-brand {
+    text-shadow: 2px 2px 15px #ffeb40;
 }
 
 /* Last BDE colors */
@@ -68,7 +73,8 @@ mark {
 /*    background-color: rgb(18, 67, 4) !important; */
 /* MODE VIEUXCON=ON */
 /*    background-color: rgb(166, 0, 2) !important; */
-    background-color: rgb(100, 30, 100) !important;
+    background-color: rgb(0, 0, 0);
+    background-image: url('/static/wrapped/img/1/bg.png');
 }
 
 html {
@@ -83,81 +89,95 @@ body {
 .btn-outline-primary:hover,
 .btn-outline-primary:not(:disabled):not(.disabled).active,
 .btn-outline-primary:not(:disabled):not(.disabled):active {
-   color:  rgb(240, 200, 240);
+    color:  rgb(0, 0, 0);
-    background-color: rgb(30, 120, 150);
+    background-color: rgb(255, 0, 101);
-    border-color: rgb(190, 150, 190);
+    border-color: rgb(255, 203, 32);
 }
 
 .btn-outline-primary {
-    color: #a2a;
+    color: #000;
-    background-color: #6bc;
+    background-color: #ffcb20;
-    border-color: #719;
+    border-color: #000;
 }
 
 .turbolinks-progress-bar {
-    background-color: #12342E;
+    background-color: #ffffff;
 }
 
 .btn-primary:hover,
 .btn-primary:not(:disabled):not(.disabled).active,
 .btn-primary:not(:disabled):not(.disabled):active {
-    color:  rgb(150, 200, 240);
+    color:  rgb(0, 0, 0);
-    background-color: rgb(50, 100, 140);
+    background-color: rgb(255, 0, 101);
-    border-color: rgb(0, 0, 0);
+    border-color: rgb(255, 203, 32);
 }
 
 .btn-primary {
-    color:  #eae; 
+    color:  #ffcb20; 
-    background-color: #616;
+    background-color: #000000;
-    border-color: #000000;
+    border-color: #ffcd20;
 }
 
 .border-primary {
-    border-color: rgb(222, 180, 222) !important; 
+    border-color: rgb(255, 255, 255) !important; 
 }
 
 .btn-secondary {
-    color:  #eae;
+    color:  #ff0065;
-    background-color: #616;
+    background-color: #000000;
-    border-color: #000000;
+    border-color: #ff0065;
 }
 
 .btn-secondary:hover,
 .btn-secondary:not(:disabled):not(.disabled).active,
 .btn-secondary:not(:disabled):not(.disabled):active {
-    color:  rgb(150, 200, 240);
+    color:  rgb(0, 0, 0);
-    background-color: rgb(50, 100, 140);
+    background-color: rgb(255, 203, 32);
-    border-color: rgb(0, 0, 0);
+    border-color: rgb(255, 0, 101);
 }
 
+.btn-outline-dark:nth-child(even) {
+    color: rgba(255, 203, 32, 75%);
+}
+
+.btn-outline-dark:nth-child(odd) {
+    color: rgba(255, 0, 101, 75%);
+}
 
 .btn-outline-dark {
-    color: #000000;
+    background-color: #222;
-    border-color: #000000;
+    border-color: #61605b;
 }
 
-.btn-outline-dark:hover,
+.btn-outline-dark:hover:nth-child(even),
 .btn-outline-dark:not(:disabled):not(.disabled).active,
 .btn-outline-dark:not(:disabled):not(.disabled):active {
-    color:  rgb(50, 100, 160);
+    color:  rgb(0, 0, 0);
-    background-color: rgb(240, 150, 240);
+    background-color: rgb(255, 203, 32);
-    border-color: rgb(50, 100, 160);
+    border-color: rgb(255, 0, 101);
 }
 
+.btn-outline-dark:hover:nth-child(odd),
+.btn-outline-dark:not(:disabled):not(.disabled).active,
+.btn-outline-dark:not(:disabled):not(.disabled):active {
+    color: rgb(0, 0, 0);
+    background-color: rgb(255, 203, 32);
+    border-color: rgb(255, 0, 101);
+}
 
 a {
-    color: rgb(0, 150, 150);
+    color: rgb(255, 0, 101);
 }
 
 a:hover {
-    color: rgb(200, 0, 200);
+    color: rgb(255, 203, 32);
 }
 
 .form-control:focus {
-    box-shadow: 0 0 0 0.25rem rgb(0 150 150 / 50%);
+    box-shadow: 0 0 0 0.25rem rgb(255 0 101 / 50%);
-    border-color: rgb(0, 200, 200);
+    border-color: rgb(255, 0, 101);
 }
 
 .btn-outline-primary.focus {
-  box-shadow: 0 0 0 0.25rem rgb(0 150 150 / 22%);
+  box-shadow: 0 0 0 0.25rem rgb(255 203 32 / 22%);
 }

shell-static.nix

@@ -0,0 +1,34 @@
+# This is a workaround meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
+# 
+# The nk20 javascript static location are hardcoded for imperative system.
+# This make ./manage.py collectstatic hard to use with nixos.
+# 
+# A workaround is to enter a FHSUserEnv with the static placed under /share/javascript/<static>.
+# This emulate a debian like system and enable collecting static normally with ./manage.py collectstatics.
+# The regular shell.nix should be enough for other configurations.
+#
+# Warning, you are still supposed to use pip package with a venv !
+{ pkgs ? import <nixpkgs> {} }:
+(pkgs.buildFHSUserEnv {
+  name = "pipzone";
+  targetPkgs = pkgs: (with pkgs;
+  let
+    fhs-static = stdenv.mkDerivation {
+      name = "fhs-static";
+      buildCommand = ''
+      mkdir -p $out/share/javascript/bootstrap4
+      mkdir -p $out/share/javascript/jquery
+      ln -s ${python39Packages.xstatic-bootstrap}/lib/python3.9/site-packages/xstatic/pkg/bootstrap/data/* $out/share/javascript/bootstrap4
+      ln -s ${python39Packages.xstatic-jquery}/lib/python3.9/site-packages/xstatic/pkg/jquery/data/* $out/share/javascript/jquery
+    '';
+    };
+  in [
+    fhs-static
+    python39
+    gettext
+    python39Packages.pip
+    python39Packages.virtualenv
+    python39Packages.setuptools
+  ]);
+  runScript = "bash";
+}).env

shell.nix

@@ -0,0 +1,23 @@
+# This is meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
+#
+# This shell.nix contains all dependencies require to create a venv and pip install -r requirements.txt.
+#
+# Please check shell-static.nix for running ./manage.py collectstatics.
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    python39
+    python39Packages.pip
+    python39Packages.setuptools
+    gettext
+
+  ];
+  shellHook = ''
+    # Tells pip to put packages into $PIP_PREFIX instead of the usual locations.
+    # See https://pip.pypa.io/en/stable/user_guide/#environment-variables.
+    export PIP_PREFIX=$(pwd)/_build/pip_packages
+    export PYTHONPATH="$PIP_PREFIX/${pkgs.python39.sitePackages}:$PYTHONPATH"
+    export PATH="$PIP_PREFIX/bin:$PATH"
+    unset SOURCE_DATE_EPOCH
+  '';
+}