updates

nixos/components/gui/xorg/xlock.nix

@@ -4,25 +4,6 @@ let
 
   name = "lock";
 
-  # desktop file
-  # ------------
-  # makes it possible to be used by other programs
-  desktopFile = pkgs.writeTextFile {
-    name = "${name}.desktop";
-    destination = "/share/applications/${name}.desktop";
-    text = ''
-      [Desktop Entry]
-      Categories=Application;Utility;
-      Comment=Screen Saver
-      Encoding=UTF-8
-      Exec=${lockProgram}/bin/${name}
-      Icon=gnome-lockscreen
-      Name=${name}
-      Terminal=false
-      Type=Application
-    '';
-  };
-
   # the lock program
   lockProgram = pkgs.writeShellScriptBin "${name}" ''
     ${pkgs.xlockmore}/bin/xlock -mode life1d -size 1
@@ -31,6 +12,14 @@ let
 in
 {
   config = mkIf config.components.gui.enable {
-    environment.systemPackages = [ lockProgram desktopFile ];
+    environment.systemPackages = [
+      lockProgram
+      (pkgs.makeDesktopItem {
+        name = "lock";
+        desktopName = "lock";
+        exec = "${lockProgram}/bin/lock";
+        terminal = false;
+      })
+    ];
   };
 }

nixos/machines/chungus/configuration.nix

@@ -11,6 +11,7 @@
 
     ./network-wireguard.nix
     ./network-tinc.nix
+    # ./network-tinc-retiolum.nix # make sure no service is open for this vpn!
 
     ./hass.nix
     ./hass-zigbee2mqtt.nix

nixos/machines/chungus/network-tinc-retiolum.nix

@@ -0,0 +1,13 @@
+{ config, ... }:
+{
+  sops.secrets.tinc_retiolum_ed25519_key = { };
+  sops.secrets.tinc_retiolum_rsa_key = { };
+
+  networking.retiolum.port = 720;
+  networking.retiolum.nodename = "centari";
+
+  services.tinc.networks.retiolum = {
+    ed25519PrivateKeyFile = config.sops.secrets.tinc_retiolum_ed25519_key.path;
+    rsaPrivateKeyFile = config.sops.secrets.tinc_retiolum_rsa_key.path;
+  };
+}

nixos/machines/cream/configuration.nix

@@ -8,6 +8,7 @@
 
     ./hardware-configuration.nix
     ./packages.nix
+    ./packages-development.nix
     ./syncthing.nix
     ./cups.nix
     ./tinc.nix

nixos/machines/cream/packages-development.nix

@@ -0,0 +1,57 @@
+{ pkgs, lib, ... }:
+{
+
+  environment.systemPackages = with pkgs; let
+
+    # to make copilot work
+    # jetbrains.pycharm-professional
+    fhsPyCharm = pkgs.buildFHSUserEnv {
+      name = "pycharm";
+      targetPkgs = pkgs: (with pkgs; [
+        black
+        isort
+        jetbrains.pycharm-professional
+        python311
+        pipenv
+        zlib # needed for NumPy
+        nodejs
+      ]);
+      runScript = "pycharm-professional";
+    };
+
+    # jetbrains.datagrip
+    fhsDataGrip = pkgs.buildFHSUserEnv {
+      name = "datagrip";
+      targetPkgs = pkgs: (with pkgs; [
+        jetbrains.datagrip
+      ]);
+      runScript = "datagrip";
+    };
+
+  in
+  [
+
+    # rust development environment
+    rustup
+    jetbrains.clion
+
+    # general
+    jetbrains.idea-ultimate
+    #vscode
+
+    fhsDataGrip
+
+    fhsPyCharm
+    (pkgs.makeDesktopItem {
+      name = "pycharm";
+      desktopName = "Python IDE";
+      exec = "${fhsPyCharm}/bin/pycharm";
+      terminal = false;
+    })
+
+    # python
+    python3Full
+    pipenv
+
+  ];
+}

nixos/machines/cream/packages.nix

@@ -73,19 +73,6 @@ in
                -t "#"
     '')
 
-    # rust development environment
-    rustup
-    jetbrains.clion
-
-    # general
-    jetbrains.idea-ultimate
-    #vscode
-
-    # python
-    python3Full
-    jetbrains.pycharm-professional
-    jetbrains.datagrip
-
     # matrix clients
     # --------------
     #element-desktop
@@ -106,6 +93,7 @@ in
     #  };
     #}))
 
+
     sops
 
     steam-run

nixos/modules/programs/steam.nix

@@ -35,6 +35,7 @@ in
       createHome = true;
       extraGroups = [ "audio" "input" "video" "pipewire" ];
       group = "steam";
+      shell = pkgs.bashInteractive;
     };
     users.groups.steam = { };