telnet through inetutils

flake.nix

@@ -40,9 +40,11 @@
     nix-vscode-extensions = {
       url = "github:nix-community/nix-vscode-extensions";
     };
-    mac-app-util = {
+
-      url = "github:hraban/mac-app-util";
+   # mac-app-util doesn't work with OCLP installed on X86 
-    };
+   # mac-app-util = {
+   #   url = "github:hraban/mac-app-util";
+   # };
   };
   outputs =
     {
@@ -58,7 +60,7 @@
       nixd,
       sops-nix,
       nix-vscode-extensions,
-      mac-app-util,
+   #   mac-app-util,
     }@inputs:
     let
       user = "olaf";
@@ -137,7 +139,7 @@
             #    sops-nix.nixosModules.sops
             home-manager.darwinModules.home-manager
             nix-homebrew.darwinModules.nix-homebrew
-            mac-app-util.darwinModules.default
+            # mac-app-util.darwinModules.default
             {
               nix-homebrew = {
                 inherit user;
@@ -151,7 +153,7 @@
                 autoMigrate = true;
               };
               home-manager.sharedModules = [
-                mac-app-util.homeManagerModules.default
+#                mac-app-util.homeManagerModules.default
               ];
             }
             ./hosts/darwin

hosts/darwin/default.nix

@@ -57,6 +57,17 @@ in
     '';
   };
 
+
+  users.groups= {
+    gidevelopert={
+      description="Git Common Rights";
+      gid=500;
+      name= "gitdeveloper";
+      members = [ "olaf" ] ;
+    };
+  };
+
+  users.knownGroups=["gitdeveloper"];
   # Turn off NIX_PATH warnings now that we're using flakes
   system.checks.verifyNixPath = false;
 

modules/darwin/casks.nix

@@ -9,7 +9,6 @@ _:
   "visual-studio-code"
 
   # Creatative tools
-  "spotify"
   "blender"
   "gimp"
   "inkscape"
@@ -47,7 +46,7 @@ _:
 
   # Productivity Tools
   "1Password"
-  "zotero"
+  #"zotero"
   "gpg-suite"
   #"home-assistant"
   #"Fantastical"
@@ -56,11 +55,12 @@ _:
   "spamsieve"
   "macdown"
   "calibre"
-  "superslicer"
+  # "superslicer" # Removed in favor of OrcaSlicer
+  "orcaslicer"
   "element"
   #  "mqtt-explorer"
   "virtualbox"
-  "autodesk-fusion"
+ # "autodesk-fusion" #fails to install
   "qmk-toolbox"
   "dbeaver-community"
   "sqlitestudio"
@@ -69,4 +69,6 @@ _:
   # Browsers
   "google-chrome"
   "firefox"
+
+
 ]

modules/darwin/home-manager.nix

@@ -47,7 +47,7 @@ in
 
     masApps = {
       "wireguard" = 1451685025;
-      "private-internet-access" = 955626407;
+      
       "LibreOffice" = 1630474372;
       "Affinity Designer 2" = 1616831348;
       "Affinity Photo 2: Image Editor" = 1616822987;
@@ -136,6 +136,7 @@ in
         { path = "/Applications/Microsoft Teams.app/"; }
         { path = "/System/Applications/Utilities/Screen Sharing.app/"; }
         { path = "/run/current-system/Applications/Emacs.app/"; }
+        { path = "/run/current-system/Applications/Zotero.app/"; }
         {
           path = "/Applications/";
           section = "others";

modules/nixos/packages.nix

@@ -10,6 +10,7 @@ shared-packages
   # Security and authentication
   yubikey-agent
   keepassxc
+  private-internet-access
 
   # App and package management
   appimage-run
@@ -37,6 +38,9 @@ shared-packages
   postgresql
   libtool # for Emacs vterm
 
+  # System
+  istat-menus
+  
   # Screenshot and recording tools
   flameshot
 

modules/shared/default.nix

@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 let
-  emacsOverlaySha256 = "06413w510jmld20i4lik9b36cfafm501864yq8k4vxl5r4hn0j0h";
+  emacsOverlaySha256 = "11p1c1l04zrn8dd5w8zyzlv172z05dwi9avbckav4d5fk043m754";
 in
 {
   home-manager.backupFileExtension = "nix-backup";

modules/shared/packages.nix

@@ -5,6 +5,8 @@ with pkgs;
   # Nix
   nixd
   mas
+
+
   # General packages for development and system management
   #alacritty
   aspell
@@ -36,6 +38,7 @@ with pkgs;
   llvm
   clang-tools
   dfu-util
+  go
   # Encryption and security tools
   age
   sops
@@ -73,7 +76,8 @@ with pkgs;
   tmux
   unrar
   unzip
-  rmapi
+  inetutils # includes Telnet
+  
   #  zsh-powerlevel10k
 
   # Python packages
@@ -130,10 +134,15 @@ with pkgs;
   mdbook
   xml2rfc
   rubyPackages_3_4.kramdown-rfc2629
+  zotero
+
 
   (texlive.combine {
     inherit (texlive)
       apa6
+      biber
+      biblatex-apa6
+      biblatex
       bibunits
       draftwatermark
       enumitem
@@ -148,6 +157,7 @@ with pkgs;
       selnolig
       sourcesanspro
       tcolorbox
+      texcount
       threeparttable
       tikzfill
       titling