nixos: multiple package updates

4 files changed, 37 insertions, 23 deletions

diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 05a7b7b..2d15a9f 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -78,6 +78,7 @@ in {
               exts.pass-otp
               exts.pass-audit
             ]))
+            ranger
 
             chromium
             tangram
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 4973a92..fd7bdbf 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -29,7 +29,7 @@ in {
       cloc
       openssl
       tio
-      vim-vint
+      #vim-vint
       nodePackages.vim-language-server
       vale
 
@@ -63,7 +63,7 @@ in {
       # C
       clang-tools
       massif-visualizer
-      qcachegrind
+      #qcachegrind
 
       # Python
       (python3.withPackages (pypkgs:
@@ -182,13 +182,17 @@ in {
       doc.enable = true;
     };
 
-    services.udev.extraRules = ''
-      SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0660", GROUP="develop", SYMLINK+="stlinkv2_%n"
-      SUBSYSTEMS=="usb", ATTRS{idVendor}=="a600", ATTRS{idProduct}=="a003", MODE:="0660", GROUP="develop", SYMLINK+="aix_forte_%n"
-      SUBSYSTEMS=="usb", ATTRS{idVendor}=="1366", ATTRS{idProduct}=="0105", MODE:="0660", GROUP="develop", SYMLINK+="jlink_%n"
-      SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2111", MODE:="0660", GROUP="develop", SYMLINK+="cmsip_dap_%n"
-      SUBSYSTEMS=="usb", ATTRS{idVendor}=="1ab1", ATTRS{idProduct}=="0e11", MODE:="0660", GROUP="develop"
-    '';
+    services = {
+      udev.extraRules = ''
+        SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0660", GROUP="develop", SYMLINK+="stlinkv2_%n"
+        SUBSYSTEMS=="usb", ATTRS{idVendor}=="a600", ATTRS{idProduct}=="a003", MODE:="0660", GROUP="develop", SYMLINK+="aix_forte_%n"
+        SUBSYSTEMS=="usb", ATTRS{idVendor}=="1366", ATTRS{idProduct}=="0105", MODE:="0660", GROUP="develop", SYMLINK+="jlink_%n"
+        SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2111", MODE:="0660", GROUP="develop", SYMLINK+="cmsip_dap_%n"
+        SUBSYSTEMS=="usb", ATTRS{idVendor}=="1ab1", ATTRS{idProduct}=="0e11", MODE:="0660", GROUP="develop"
+      '';
+
+      guix.enable = true;
+    };
 
     virtualisation = {
       containers.enable = true;
@@ -197,10 +201,10 @@ in {
         autoPrune.enable = true;
         storageDriver = "btrfs";
       };
-      lxd = {
-        enable = true;
-        recommendedSysctlSettings = true;
-      };
+      #lxd = {
+      #  enable = true;
+      #  recommendedSysctlSettings = true;
+      #};
       lxc.enable = true;
       libvirtd.enable = true;
       spiceUSBRedirection.enable = true;
diff --git a/nixos/modules/packages.nix b/nixos/modules/packages.nix
index c41e491..96e9a2e 100644
--- a/nixos/modules/packages.nix
+++ b/nixos/modules/packages.nix
@@ -41,7 +41,6 @@ in {
       btop
       iotop
       mc
-      tmux
 
       # ls tools
       tree
@@ -69,9 +68,6 @@ in {
 
       lm_sensors
     ]
-    ++ optionals (system != "armv7l-linux") [
-      ranger
-    ]
     ++ optionals (system == "x86_64-linux") [
       nmap
       ltrace
diff --git a/nixos/modules/users.nix b/nixos/modules/users.nix
index 7d0dc77..f3b7fbe 100644
--- a/nixos/modules/users.nix
+++ b/nixos/modules/users.nix
@@ -43,12 +43,25 @@ in {
     };
   };
 
-  security.sudo.extraRules = [
-    {
-      groups = ["wheel"];
-      commands = ["ALL"];
-    }
-  ];
+  security = {
+    doas = {
+      enable = true;
+      extraRules = [
+        {
+          groups = ["wheel"];
+          keepEnv = true;
+          persist = true;
+        }
+      ];
+    };
+
+    sudo.extraRules = [
+      {
+        groups = ["wheel"];
+        commands = ["ALL"];
+      }
+    ];
+  };
 
   services.openssh = {
     enable = true;