fixes and new apps

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689178160,
+        "lastModified": 1689281837,
-        "narHash": "sha256-TVR0hn/JWo1qmtvgzqjfNerLPsIxfdFR3hf3QrnEj7U=",
+        "narHash": "sha256-msgwgot2/hxXzlpYltIZ7boAqBkN8XejNOhBJ07q3FY=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "795492c9a895762f36f6c1ff43d6e0de66fdffa8",
+        "rev": "c806a73609e77f0c446fdad5d3ea6ca3b7ae6e5f",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1689134369,
+        "lastModified": 1689362769,
-        "narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=",
+        "narHash": "sha256-5V7Z7T9019pGsFnYH6va5h6Wveq8FKmXa/xLfj0DhNI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c",
+        "rev": "c1cdce3d89741d402d8fd2c93e3d2643ff85b053",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1689138773,
+        "lastModified": 1689352711,
-        "narHash": "sha256-NEcJPQfwc1jNDI/ITvieJW2Y+IWdGIYCFHLJl5PGx3o=",
+        "narHash": "sha256-xWYFt8vWnstDIVsZ26y9mf6h3714lVmXd6l+hTQz6tw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bf57c599729771cd23054a18c0f3a391ae85e193",
+        "rev": "2047c642ce0f75307e8a0f2ec94715218c481184",
         "type": "github"
       },
       "original": {

maddie/common/code.nix

@@ -2,7 +2,6 @@
 
 {
   home.packages = with pkgs; [
-    python3Full # Python
     go # Go
   ];
 }

maddie/common/kakoune.nix

@@ -1,9 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  home.packages = with pkgs; [
-    python310Packages.python-lsp-server
-  ];
   programs.kakoune = {
     enable = true;
     config = {

maddie/common/python.nix

@@ -0,0 +1,18 @@
+{ config, pkgs, ... }:
+
+let
+  packages = ps: with ps; [
+    tkinter
+    pillow
+    psycopg
+    passlib
+    argon2_cffi
+    python-dotenv
+    python-lsp-server
+  ];
+in
+{
+  home.packages = [
+    (pkgs.python311.withPackages packages)
+  ];
+}

maddie/nixos/jetbrains.nix

@@ -5,6 +5,7 @@
     jetbrains.clion
     jetbrains.goland
     jetbrains.webstorm
+    jetbrains.datagrip
     jetbrains.pycharm-professional
   ];
 }

systems/mdesktop/syncthing.nix

@@ -10,7 +10,6 @@
     guiAddress = "0.0.0.0:8384";
     overrideFolders = true;
     overrideDevices = true;
-    settings = {
     devices = {
       "M.Phone.Pixel" = { id = "WMGWVOU-DFZQSZO-46XQJQA-Q5XD5ZB-NDXK5SP-LXNAADH-Z2KJN4P-4P4UXA5"; };
       "M.MacBookPro" = { id = "A5HRCSI-RWYZ6GG-SCBZ2OJ-PG6T7VP-WKDN2VP-CNXIQ3B-VCJ7ZHO-MTV63QP"; };
@@ -44,5 +43,4 @@
       };
     };
   };
-  };
 }

systems/mdesktop/xorg.nix

@@ -9,9 +9,12 @@
     layout = "gb";
     xkbOptions = "eurosign:e";
 
-    # Use startx for starting window managers
     displayManager = {
+      # Use startx for starting window managers
       startx.enable = true;
+
+      # Use KDE Plasma 5
+      # plasma5.enable = true;
     };
   };
 }

systems/mmacbookpro/apps.nix

@@ -53,6 +53,7 @@
       "tower"
       "secretive"
       "visual-studio-code"
+      "sf-symbols"
 
       # Learning
       "anki"
@@ -67,7 +68,7 @@
     ];
     masApps = {
       "Codye" = 1516894961;
-      "Xcode" = 497799835;
+      /* "Xcode" = 497799835; */
     };
   };
 }