nixos: add packages and so on

5 files changed, 17 insertions, 8 deletions

diff --git a/nixos/configurations/errol.nix b/nixos/configurations/errol.nix
index e9b0599..0ece262 100644
--- a/nixos/configurations/errol.nix
+++ b/nixos/configurations/errol.nix
@@ -6,6 +6,7 @@
 }: let
   inherit (lib) mkDefault;
 in {
+  system.stateVersion = "24.05";
   nixpkgs.hostPlatform.system = "x86_64-linux";
   deploy.enable = true;
 
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index fa8be79..56d3fd1 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -72,9 +72,6 @@ in {
             astroid
             dodo
             taskwarrior3
-            vdirsyncer
-            khal
-            khard
             gnupg
             pinentry-gnome3
             pinentry-curses
@@ -124,7 +121,6 @@ in {
 
             tigervnc
             freerdp
-            plasma5Packages.kdeconnect-kde
 
             gnome-firmware
             hdparm
@@ -144,7 +140,7 @@ in {
             gimp
             inkscape
             blender
-            kdenlive
+            kdePackages.kdenlive
 
             # GStreamer
             gst_all_1.gstreamer
@@ -158,9 +154,9 @@ in {
 
             # Writing
             typst
-            typst-fmt
+            typstfmt
             typst-live
-            typst-lsp
+            tinymist
             vale
 
             # CAD
@@ -202,6 +198,8 @@ in {
         enableSSHSupport = true;
         enableBrowserSocket = true;
       };
+
+      kdeconnect.enable = true;
     };
 
     xdg = {
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 03b7b91..2936b79 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -43,6 +43,7 @@ in {
       cachix
       nurl
       nil
+      nixfmt-rfc-style
       alejandra
       statix
       deadnix
@@ -82,6 +83,7 @@ in {
 
           pygraphviz
           matplotlib
+          seaborn
           plotly
           pygal
 
@@ -105,6 +107,9 @@ in {
 
           pyserial
           pylibftdi
+          pyusb
+          usbtmc
+
           pylxd
           selenium
         ]))
@@ -176,6 +181,7 @@ in {
       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"
     '';
 
     virtualisation = {
diff --git a/nixos/modules/gaming.nix b/nixos/modules/gaming.nix
index 76b2b94..3a9d8e7 100644
--- a/nixos/modules/gaming.nix
+++ b/nixos/modules/gaming.nix
@@ -20,6 +20,10 @@ in {
 
     environment.systemPackages = [pkgs.heroic];
 
+    nixpkgs.config.permittedInsecurePackages = [
+      "SDL_ttf-2.0.11" # TODO
+    ];
+
     programs.steam = {
       enable = true;
       remotePlay.openFirewall = true;
diff --git a/nixos/modules/users.nix b/nixos/modules/users.nix
index 0956c93..7d0dc77 100644
--- a/nixos/modules/users.nix
+++ b/nixos/modules/users.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   isNative = config.nixpkgs.hostPlatform == config.nixpkgs.buildPlatform;
-  isArm = config.nixpkgs.hostPlatform.isAarch;
+  isArm = pkgs.hostPlatform.isAarch;
 in {
   users = {
     mutableUsers = false;