From 42d1d06cf6f31eb813d394670393a204eb2d2fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 16 Nov 2023 10:11:07 +0100
Subject: nixos: reenable some previously disabled packages

---
 flake.lock                | 24 ++++++++++++------------
 flake.nix                 |  2 +-
 nixos/modules/desktop.nix |  6 +++---
 nixos/modules/develop.nix |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 25a48ec..9af3272 100644
--- a/flake.lock
+++ b/flake.lock
@@ -212,19 +212,19 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1699633158,
-        "narHash": "sha256-8AQVHT8SpiScPSpCtu0GV7Is6tcaYHzG9xMRfOreiQA=",
+        "lastModified": 1700054720,
+        "narHash": "sha256-guW9g07cbxhXKAPb0FpvhhSDnUbCSlDJ3oKkBK3V0VE=",
         "ref": "refs/heads/master",
-        "rev": "51c018d36a73312e406c5009a0eaf8a2976bb734",
-        "revCount": 3296,
+        "rev": "5222ee18c00d4bae49f63d46281f4f6c1dc12d84",
+        "revCount": 3317,
         "submodules": true,
         "type": "git",
-        "url": "http://jessie.elektroline.cz/elektroline/flatlineng.git"
+        "url": "http://gitlab.elektroline.cz/elektroline/flatlineng.git"
       },
       "original": {
         "submodules": true,
         "type": "git",
-        "url": "http://jessie.elektroline.cz/elektroline/flatlineng.git"
+        "url": "http://gitlab.elektroline.cz/elektroline/flatlineng.git"
       }
     },
     "home-manager": {
@@ -377,11 +377,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1699686971,
-        "narHash": "sha256-fttf55Uo88Ei57sxTuDOwKXg8izdR365lFjI13+XfwE=",
+        "lastModified": 1700083842,
+        "narHash": "sha256-uC5v4VyUPgC5L3zv7e9q6+TRCm+eiA+Ow5vcH67ef/I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d638da8b6a17041483d90ba9af6c3b5e30b4fbcc",
+        "rev": "9008bc4eb62c878d0812105ea1b34255d651df88",
         "type": "github"
       },
       "original": {
@@ -752,11 +752,11 @@
     },
     "vpsadminos": {
       "locked": {
-        "lastModified": 1699376038,
-        "narHash": "sha256-uk7pWEwTVC408Ft7ASFc9rvRTFtrXan/aNMQbKx6P9k=",
+        "lastModified": 1699919832,
+        "narHash": "sha256-K+tXV9t3lp3uYJ08J4kngRaYxaGn04Sz1C90lg5RDjo=",
         "owner": "vpsfreecz",
         "repo": "vpsadminos",
-        "rev": "0b7107015de85e6c4f5bca966674e2edcda40ae9",
+        "rev": "7c4b905481c91ea66c59916884cbe91fb216e038",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 0854194..d08de23 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,7 @@
     sterm.url = "github:wentasah/sterm";
     agenix.url = "github:ryantm/agenix";
     shvspy.url = "git+https://github.com/silicon-heaven/shvspy.git?submodules=1";
-    flatline.url = "git+http://jessie.elektroline.cz/elektroline/flatlineng.git?submodules=1";
+    flatline.url = "git+http://gitlab.elektroline.cz/elektroline/flatlineng.git?submodules=1";
     shvcli.url = "git+https://gitlab.com/elektroline-predator/shvcli.git";
 
     #nixturris.url = "github:cynerd/nixturris";
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 87d6a4d..0fe18ef 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -67,8 +67,8 @@ in {
             pinentry-gnome
             pinentry-curses
             (pass.withExtensions (exts: [
-              #exts.pass-otp
-              #exts.pass-audit
+              exts.pass-otp
+              exts.pass-audit
             ]))
 
             chromium
@@ -152,7 +152,7 @@ in {
             gaphor
 
             # CAD
-            #freecad
+            freecad
             kicad
             sweethome3d.application
             qelectrotech
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 79f69a6..ac2d70c 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -111,7 +111,7 @@ with lib; {
 
       # SHV
       shvspy
-      #flatline
+      flatline
       shvcli
 
       # Images
-- 
cgit v1.2.3