use mixrank as gitlab input

5 files changed, 115 insertions, 35 deletions

diff --git a/flake.lock b/flake.lock
index 8228ee3..7c006ac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1707830867,
-        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
+        "lastModified": 1714136352,
+        "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
+        "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e",
         "type": "github"
       },
       "original": {
@@ -56,11 +56,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1710263223,
-        "narHash": "sha256-Z19hPhLUwF5M8FQdBuSH+/GDCdWzr5FPDHN+Cbk1/0Q=",
+        "lastModified": 1714583193,
+        "narHash": "sha256-RFiwISF+anGhMN3mVMBEOcxP+0zgizZposmBAyhIt94=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "383aeb1bf3e2fdf14e7b1b66a35123228d7a0edb",
+        "rev": "ab32c6d8e3f0a20d448540beb31208894066a6c7",
         "type": "github"
       },
       "original": {
@@ -72,11 +72,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1708965002,
-        "narHash": "sha256-gIBZCPB0sA8Gagrxd8w4+y9uUkWBnXJBmq9Ur5BYTQU=",
+        "lastModified": 1714489658,
+        "narHash": "sha256-yIOEhGHlarbjqWH1+F9eGbq4NTnZa6++H2UQ6ZuBqYc=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "4e966509c180f93ba8665cd73cad8456bf44baab",
+        "rev": "137b57bc0bfc0c2d775af4cd19644d9aadd66a81",
         "type": "github"
       },
       "original": {
@@ -103,6 +103,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1709126324,
+        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "from-elisp": {
       "flake": false,
       "locked": {
@@ -126,11 +144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710164657,
-        "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=",
+        "lastModified": 1714515075,
+        "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2",
+        "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef",
         "type": "github"
       },
       "original": {
@@ -139,13 +157,33 @@
         "type": "github"
       }
     },
+    "mixrank": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs_latest": "nixpkgs_latest",
+        "nixpkgs_old": "nixpkgs_old"
+      },
+      "locked": {
+        "lastModified": 1714601309,
+        "narHash": "sha256-EdDwdYB9pGmQHMgUWN6+DyWGTtm8boyTRUZxYvxdNdY=",
+        "ref": "refs/heads/master",
+        "rev": "dc251a5b397ce1f84ff568249d34ac666df6af39",
+        "revCount": 61856,
+        "type": "git",
+        "url": "ssh://[email protected]/mixrank/mixrank"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://[email protected]/mixrank/mixrank"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1711703276,
-        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
+        "lastModified": 1714253743,
+        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
+        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
         "type": "github"
       },
       "original": {
@@ -157,11 +195,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1710162809,
-        "narHash": "sha256-i2R2bcnQp+85de67yjgZVvJhd6rRnJbSYNpGmB6Leb8=",
+        "lastModified": 1714409183,
+        "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ddcd7598b2184008c97e6c9c6a21c5f37590b8d2",
+        "rev": "576ecd43d3b864966b4423a853412d6177775e8b",
         "type": "github"
       },
       "original": {
@@ -171,6 +209,39 @@
         "type": "github"
       }
     },
+    "nixpkgs_latest": {
+      "locked": {
+        "lastModified": 1677018132,
+        "narHash": "sha256-o1v+S9cn3M5wwBT7+5YdWPDRRkIpe2uAjzNGLnnJPm8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "581e3f902954cbf7b6eec7b04deb41b23fcb6b7a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "581e3f902954cbf7b6eec7b04deb41b23fcb6b7a",
+        "type": "github"
+      }
+    },
+    "nixpkgs_old": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1568853802,
+        "narHash": "sha256-eFyFVDVExwB1aGHVmemgh57EAcTs5rekWhlPnxAowu8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2c906666e54c9f050b4a25142b4ff0e73c9b7dcc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "2c906666e54c9f050b4a25142b4ff0e73c9b7dcc",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -178,6 +249,7 @@
         "firefox-gnome-theme": "firefox-gnome-theme",
         "from-elisp": "from-elisp",
         "home-manager": "home-manager",
+        "mixrank": "mixrank",
         "nixpkgs": "nixpkgs"
       }
     },
@@ -210,6 +282,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_3": {
+      "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",
diff --git a/flake.nix b/flake.nix
index 18a161b..76ba836 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,9 +35,10 @@
       url = "github:rafaelmardojai/firefox-gnome-theme";
       flake = false;
     };
+    mixrank.url = "git+ssh://[email protected]/mixrank/mixrank";
   };
 
-  outputs = { self, nixpkgs, home-manager, agenix, ... } @ inputs :
+  outputs = { self, nixpkgs, home-manager, agenix, mixrank, ... } @ inputs :
     let
       system = "x86_64-linux";
       hosts = [
@@ -52,6 +53,7 @@
           ./users/leonardo.nix
           home-manager.nixosModules.home-manager
           agenix.nixosModules.default
+          mixrank.nixosModules.${system}.dev-machine
         ];
       };
     in {
diff --git a/modules/emacs/README.org b/modules/emacs/README.org
index 9a61d88..be1d22a 100644
--- a/modules/emacs/README.org
+++ b/modules/emacs/README.org
@@ -352,7 +352,13 @@ Try to use the package.
   (org-alert-notify-cutoff 30)
   (org-alert-notification-title "Emacs Agenda")
   (alert-default-style 'notifications))
-#+end_src 
+#+end_src
+*** Ox-hugo
+In order to publish files to hugo from org.
+#+begin_src emacs-lisp :tangle yes
+(use-package ox-hugo
+  :after ox)
+#+end_src
 ** Calendar
 try out emacs calfw
 #+begin_src emacs-lisp :tangle yes
diff --git a/modules/s3nixcache-mixrank.nix b/modules/s3nixcache-mixrank.nix
deleted file mode 100644
index 0e80bdd..0000000
--- a/modules/s3nixcache-mixrank.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  nix = {
-    settings = {
-      substituters = [
-        "s3://mr-nixcache-icenyeamyubu?profile=mixrank"
-      ];
-      trusted-public-keys = [
-        "mr-nixcache-icenyeamyubu:q2ulb+bD5NCbp9nvvHod39/1qNqnYX0ACb8eQckb7pI="
-      ];
-    };
-  };
-  networking.extraHosts = builtins.readFile /var/hosts.mixrank;
-}
diff --git a/users/leonardo.nix b/users/leonardo.nix
index 36307eb..064fcb1 100644
--- a/users/leonardo.nix
+++ b/users/leonardo.nix
@@ -3,11 +3,9 @@
   imports = [
     ../modules/gnome.nix
     ../modules/emacs/emacs.nix
-    ../modules/s3nixcache-mixrank.nix
   ];
   config = {
     nix = {
-      package = pkgs.nixVersions.nix_2_20;
       settings = {
         trusted-users = [ "root" "leonardo" ];
         experimental-features = "nix-command flakes";