push

modules/core/desktop/niri.nix

@@ -112,7 +112,7 @@
           ];
 
           binds = {
-            "Mod+T".action.spawn = "cosmic-term";
+            "Mod+T".action.spawn = "ghostty";
             "Mod+E".action.spawn = "cosmic-files";
             "Mod+B".action.spawn = "librewolf";
 

modules/hosts/box.nix

@@ -23,12 +23,14 @@
       catppuccin
 
       janitor
+
+      mpd
     ];
 
     nixos = { pkgs, ...}: {
       networking.hostName = "box";
 
-      # den.tunnels = [ "tvtun" ];
+      den.tunnels = [ "mpd" ];
 
       environment.systemPackages = [ pkgs.python3 ];
 

modules/hosts/defaults.nix

@@ -12,6 +12,8 @@
       tailscale
       openvpn
 
+      #beszel
+
       fish
 
       fetch

modules/services/beszel.nix

@@ -0,0 +1,29 @@
+{ ... }: {
+  den.aspects.beszel = { host, ... }: {
+    den.tunnels =
+      if host.name == "box"
+      then [ "fleet" ]
+      else [];
+
+    nixos = { lib, ... }: {
+      services.beszel.agent = {
+        enable = true;
+
+        environment = {
+          KEY = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMlX8zdofzg+vV0H6H5U54YIbTY/z0iPfD9LXupBY2jX";
+          TOKEN = "30949ab5-3ed3-46c1-b606-4e4e66b847f9";
+          HUB_URL = "https://fleet.bug.tools";
+          SYSTEM_NAME = host.name;
+        };
+
+        environmentFile = "/var/lib/beszel-agent/environment";
+      };
+
+      services.beszel.hub = lib.mkIf (host.name == "box") {
+        enable = true;
+        host = "0.0.0.0";
+        port = 8090;
+      };
+    };
+  };
+}

modules/services/copyparty.nix

@@ -49,7 +49,7 @@
             path = "/home/bug/slskd/complete/";
 
             access = {
-              rd = "*";
+              r = "*";
               rwdma = [ "bug" ];
             };
 
@@ -72,20 +72,12 @@
             };
           };
 
-          "/box" = {
-            path = "/";
-
-            access = {
-              rwda = [ "bug" ];
-            };
-          };
-
           "/Music" = {
             path = "/home/bug/Music/";
 
             access = {
               r = "*";
-              rwda = [ "bug" ];
+              rwdma = [ "bug" ];
             };
 
             flags = {

modules/services/mailserver.nix

@@ -53,6 +53,7 @@
               "tailscale@bug.tools"
               "firefox@bug.tools"
               "keldurn@bug.tools"
+              "brax@bug.tools"
             ];
           };
 

modules/services/ports.nix

@@ -21,6 +21,8 @@
       llama = 8080;
       api-tv = 8789;
       seek = 8089;
+      fleet = 8090;
+      mpd = 6600;
     };
   };
 }

modules/software/compatibility/nix-ld.nix

@@ -4,13 +4,19 @@
     nixos =
       { pkgs, options, ... }:
       {
-        programs.nix-ld = {
+        programs.nix-ld = let
+          libxml2-so2-compat = pkgs.runCommand "libxml2-so2-compat" { } ''
+            mkdir -p $out/lib
+            ln -s ${pkgs.libxml2.out}/lib/libxml2.so.16 $out/lib/libxml2.so.2
+          '';
+        in {
           enable = true;
 
           libraries =
             options.programs.nix-ld.libraries.default
             ++ (with pkgs; [
-              libxml2
+              libxml2-so2-compat
+
               udev
               gcc
               egl-wayland
@@ -31,7 +37,25 @@
               libz
               libGL
 
-              glib
+              xcbutil
+              xcbutilimage
+              xcbutilkeysyms
+              xcbutilrenderutil
+              xcbutilwm
+
+              libXrender
+              libXext
+              libXfixes
+              libSM
+              libICE
+              systemd
+              stdenv.cc.cc.lib
+              zlib
+              fontconfig.lib
+              freetype
+              libxkbcommon
+              dbus.lib
+              libidn2
             ]);
         };
       };

modules/software/music/player.nix

@@ -4,6 +4,7 @@
       users.users.bug.packages = with pkgs; [
         euphonica
         rhythmbox
+        kew
       ];
 
       services.flatpak.packages = [

modules/software/utilities/addons/quad_remesher_1_4/QuadRemesher_Version.txt

@@ -0,0 +1 @@
+1.4.1.3852

modules/software/utilities/addons/quad_remesher_1_4/__init__.py

@@ -0,0 +1,324 @@
+# "Quad-Remesher Bridge for Blender"
+# Author : Maxime Rouca
+#
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+
+__QR_plugin_version__ = "1.4"
+
+bl_info = {
+    "name": "Quad Remesher 1.4 Bridge",
+    "author": "Maxime",
+    "version": (1, 4, 1),
+    "blender": (2, 80, 0),
+    "description": "Quad Remesher 1.4 Bridge",
+    "location": "",
+    "warning": "",
+    "wiki_url": "",
+    "tracker_url": "",
+    "category": "Mesh"
+}
+
+import bpy
+import bpy.props
+from rna_keymap_ui import draw_kmi
+from bl_operators.presets import AddPresetBase
+
+from .qr_operators import (QREMESHER_OT_remesh, QREMESHER_OT_reset_settings, QREMESHER_OT_license_manager, QREMESHER_OT_facemap_to_materials, QREMESHER_OT_faceset_to_materials, QREMESHER_OT_online_help, QREMESHER_OT_News_LatestVer)
+
+addon_name = __name__.split(".")[0]
+
+#def addon_prefs():
+#    return bpy.context.preferences.addons[addon_name].preferences
+
+def paintDensityPropertyCB(self, context):
+    #try:
+    props = bpy.context.scene.qremesher
+    vertexColorSliderValue = getattr(props, 'painted_quad_density')
+    
+    #print("vertexColorSliderValue = " + str(vertexColorSliderValue) + "\n")
+
+    #Mapping: Slider in [0.25, 4]
+    maxSliderValue = 4
+    minSliderValue = 0.25
+    normalizedValue = 0.0
+    if vertexColorSliderValue > 1.0:
+        normalizedValue = (vertexColorSliderValue - 1.0) / (maxSliderValue - 1.0)
+    elif vertexColorSliderValue < 1.0:
+        normalizedValue =  - ((1.0/vertexColorSliderValue) - 1.0) / ((1.0/minSliderValue) - 1.0)
+
+    if (normalizedValue > 1):
+        normalizedValue = 1
+    if (normalizedValue < -1):
+        normalizedValue = -1
+
+    # -- normalizedValue to color
+    r = 1.0
+    g = 1.0
+    b = 1.0
+    if normalizedValue > 0.0:
+        r = 1
+        g = 1-normalizedValue
+        b = 1-normalizedValue
+    elif normalizedValue < 0.0:
+        r = 1+normalizedValue
+        g = 1
+        b = 1
+        
+    # set the color
+    mycolor=(r, g, b)
+    # from Blender 4.3
+    if bpy.app.version >= (4,3,0):
+        bpy.context.tool_settings.unified_paint_settings.color = mycolor
+    else:
+        bpy.data.brushes["Draw"].color = mycolor
+
+    #except Exception:
+    #    print("Exception: in paintDensityPropertyCB..\n")
+    return
+    
+
+
+# ----- Properties container ------
+class QRSettingsPropertyGroup(bpy.types.PropertyGroup):
+    # Target Quad Count
+    target_count: bpy.props.IntProperty(name="Quad Count", description="Set the desired number of Quads",
+                                        default=5000, soft_min=100, soft_max=10000, step=20, min = 1)
+
+    curvatureAdaptivness_Tooltip = "Allows to control how quad's size locally adapts to curvatures.\nThe higher it is, the smaller the quads will be on high curvature areas.\nSet it at 0, to get uniform quads size"
+    adaptQuadCount_Tooltip = "Adaptive Quad-Count :\nOn: Creates more polygons than asked to fit high curvatures area. \nOff(default): Respect the Target-Quad-Count more exactly.\nIt's advised to let it 'Off' to better respect the Target-Quad-Count. see the doc for more explanations. "
+    useVertexColors_Tooltip = "Use 'Vertex Colors' to control Quads size density."
+    vertexColorWidget_Tooltip = "Defines the Color to paint to control locally the desired Quad Density variations (using 'Draw' Tool, in 'Vertex Paint' mode) \n . from 0.25 => 'divide density by 4'  =  Big Quads  =  Cyan color \n . to 4  => 'multiply density by 4'  =  Small Quads  =  Red color."
+    useMaterials_Tooltip="If On, QuadRemesher will use existing 'Materials' to guide the quad remeshing on Materials borders.\nMaterialIds will be maintained after remeshing."
+    useNormals_Tooltip="TAKE CARE: this option is usefull in specific cases, BUT should be 'Off' by default (facetted mesh). Read the doc for more informations..."
+    useNormals_Tooltip+="\nIf On, QuadRemesher will use the existing 'Normals' to guide the remeshing on edge loops where the normals are split/creased.\nBy default Blenders creates mesh with normals split everywhere.\nIt usefull to enable this option only with SmoothShade + AutoSmooth enabled...\nOn smooth organic shapes, it's advised to disable it."
+    detectHardEdges_Tooltip="If On, QuadRemesher will detect/compute Hard-Edges automatically based on the geometry (using a mix of edge's angles and other geometrical considerations).\nIf 'Use Normals Splitting' is checked, it's often better to uncheck 'Detect Hard Edges by angle'.\nOn smooth organic shapes, it's advised to disable it."
+    symToolTip = "These options allows to perform symmetrical quad remeshing. It's possible to combine all 3 symmetry axis."
+    #symToolTip += "\nTAKE CARE: The axis are Local Coordinates axis! It's advised to set the Gizmo in 'Object' mode to better see the Local Coordinates axis."
+    hideInputTip = "If On (default), the input object will be hidden after remeshing."
+    
+    # Quads size settings
+    adaptive_size: bpy.props.FloatProperty(name="Adaptive size", 
+                                         description=curvatureAdaptivness_Tooltip,
+                                         default=50, min=0, max=100, step=0.5, precision=0, subtype = 'PERCENTAGE')
+
+    adapt_quad_count: bpy.props.BoolProperty(name="Adapt Quad Count", default=True, 
+                                            description=adaptQuadCount_Tooltip)
+    
+    use_vertex_color: bpy.props.BoolProperty(name="Use Vertex Color", 
+                                            description=useVertexColors_Tooltip,
+                                            default=False)
+
+    painted_quad_density: bpy.props.FloatProperty(name="Quads density (paint)", 
+                                            description=vertexColorWidget_Tooltip,
+                                           default=1.0, min=0.25, max=4.0, step=0.4,
+                                           update=paintDensityPropertyCB)
+
+    # Edge loops control
+    use_materials: bpy.props.BoolProperty(name="Use Materials", default=False, 
+                                            description = useMaterials_Tooltip)
+    use_normals: bpy.props.BoolProperty(name="Use Normals Splitting", 
+                                        default=False,                    #because when I create a sphere, all edges are 'creased', not a good idea to enable this by default...
+                                        description=useNormals_Tooltip)
+    autodetect_hard_edges: bpy.props.BoolProperty(name="Detect Hard Edges by angle", 
+                                                    default=True, 
+                                                    description=detectHardEdges_Tooltip)
+
+    # Misc category
+    symmetry_x: bpy.props.BoolProperty(name="X", default=False, description=symToolTip)
+    symmetry_y: bpy.props.BoolProperty(name="Y", default=False, description=symToolTip)
+    symmetry_z: bpy.props.BoolProperty(name="Z", default=False, description=symToolTip)
+    
+    hide_input: bpy.props.BoolProperty(name="Hide Input Object", default=True, description=hideInputTip)
+    
+    # progress bar value
+    progress_value: bpy.props.FloatProperty(default=0, subtype='PERCENTAGE', precision=1, min=0, soft_min=0, soft_max=100, max=100)
+
+
+
+def draw_panel_content(context, layout):
+    #print("draw_panel_content called")
+    # NB: this function is called very often (example, quite at each mouse move in the panel...)
+    
+    props = bpy.context.scene.qremesher
+    #props = addon_prefs().props
+
+    wm = context.window_manager
+
+    # "REMESH IT" button
+#    if QREMESHER_OT_remesh.IsRemeshing:
+#        myrow = layout.row(align=True)
+#        myrow.label(text="(ESC)")
+#        myrow.prop(props, 'progress_value')
+#        #layout.prop(props, 'progress_value')
+    layout.operator(QREMESHER_OT_remesh.bl_idname)
+    layout.separator()
+        
+    # Settings
+    col = layout.column(align=True)
+    # row = col.row(align=True)
+    col.prop(props, 'target_count')
+
+    col.separator()
+
+    # --- Quad Size settings ---
+    box = col.box()
+    box.label(text="  Quad Size Settings")
+
+    box.prop(props, 'adaptive_size')
+    box.prop(props, 'adapt_quad_count')
+    box.prop(props, 'use_vertex_color')
+
+    #box.separator()
+    box.prop(props, 'painted_quad_density')
+
+    col.separator()
+
+    # --- Quad Size settings ---
+    box = col.box()
+    box.label(text="  Edge Loops Control")
+
+    box.prop(props, 'use_materials')
+    box.prop(props, 'use_normals')
+    box.prop(props, 'autodetect_hard_edges')
+
+    col.separator()
+
+    # --- Misc.... ---
+    box = col.box()
+    box.label(text="  Misc")
+    box.label(text="Symmetry:")
+    myrow = box.row(align=True)
+    myrow.prop(props, 'symmetry_x')
+    myrow.prop(props, 'symmetry_y')
+    myrow.prop(props, 'symmetry_z')
+    box.prop(props, 'hide_input')
+    box.operator(QREMESHER_OT_reset_settings.bl_idname)
+    box.operator(QREMESHER_OT_license_manager.bl_idname)
+    if bpy.app.version[0] >= 4:
+        box.operator(QREMESHER_OT_faceset_to_materials.bl_idname)
+    else:
+        box.operator(QREMESHER_OT_facemap_to_materials.bl_idname)
+    box.operator(QREMESHER_OT_online_help.bl_idname)
+  
+    box.operator(QREMESHER_OT_News_LatestVer.bl_idname, text=QREMESHER_OT_News_LatestVer.getNewsButtonLabel())
+
+
+
+# Side panel ui
+class QREMESHER_PT_qremesher(bpy.types.Panel):
+    bl_space_type = 'VIEW_3D'
+    bl_region_type = 'UI'
+    bl_category = 'Quad Remesh'        # name of the VerticalTab
+    bl_label = "Quad Remesher "+__QR_plugin_version__
+
+    bl_idname = "QREMESHER_PT_qremesher"
+
+    # bl_options = {'DEFAULT_CLOSED'}
+
+    @classmethod
+    def poll(cls, context):
+        return True
+
+    def draw(self, context):
+        draw_panel_content(context, self.layout)
+
+
+# Scene settings subpanel
+'''
+class QREMESHER_PT_qremesher_setting_panel(bpy.types.Panel):
+    bl_space_type = 'VIEW_3D'
+    bl_region_type = 'UI'
+    bl_category = 'QRemesher'
+    bl_label = "Settings"
+
+    bl_idname = "QREMESHER_PT_qremesher_setting_panel"
+    bl_parent_id = "QREMESHER_PT_qremesher"   # NB: ca suffit a ajouter ce sub panel dans le panel QREMESHER_PT_qremesher
+
+    # bl_options = {'DEFAULT_CLOSED'}
+
+    @classmethod
+    def poll(cls, context):
+        return True
+
+    def draw(self, context):
+
+        self.layout.operator(QREMESHER_OT_reset_settings.bl_idname)
+
+        self.layout.separator()
+
+        #draw_panel_content(context, self.layout)
+'''
+
+
+classes = [QRSettingsPropertyGroup,
+
+           QREMESHER_PT_qremesher,
+           #QREMESHER_PT_qremesher_setting_panel,
+
+           QREMESHER_OT_remesh,
+           QREMESHER_OT_reset_settings,
+           QREMESHER_OT_license_manager,
+           QREMESHER_OT_facemap_to_materials, # Blender 3.x
+           QREMESHER_OT_faceset_to_materials, # Blender 4.x
+           QREMESHER_OT_online_help,
+           QREMESHER_OT_News_LatestVer,
+           ]
+addon_keymaps = []
+
+
+def hotkeys():
+    wm = bpy.context.window_manager
+    kc = wm.keyconfigs.addon
+
+    if kc:
+        if '3D View' not in kc.keymaps:
+            km_view3d = kc.keymaps.new('3D View', space_type='VIEW_3D', region_type='WINDOW')
+        else:
+            km_view3d = kc.keymaps['3D View']
+
+        kmi = km_view3d.keymap_items.new(QREMESHER_OT_remesh.bl_idname, head=True, type='R', value='PRESS',
+                                         ctrl=True, alt=True)
+
+        addon_keymaps.append((km_view3d, kmi))
+
+
+def register():
+    for cls in classes:
+        bpy.utils.register_class(cls)
+
+    bpy.types.Scene.qremesher = bpy.props.PointerProperty(type=QRSettingsPropertyGroup)
+    QREMESHER_OT_News_LatestVer.readNews()
+
+    hotkeys()
+
+
+def unregister():
+    for cls in classes:
+        bpy.utils.unregister_class(cls)
+
+    del bpy.types.Scene.qremesher
+
+    wm = bpy.context.window_manager
+    kc = wm.keyconfigs.addon
+
+    if kc:
+        for km, kmi in addon_keymaps:
+            km.keymap_items.remove(kmi)
+    addon_keymaps.clear()

modules/software/utilities/addons/quad_remesher_1_4/qr_exe.py

@@ -0,0 +1,79 @@
+# "Quad-Remesher Bridge for Blender"
+# Author : Maxime Rouca
+#
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+import bpy
+
+import os
+import subprocess
+import sys
+import platform
+import shutil
+import tempfile
+import time
+
+
+def qr_launch_prefix():
+    launcher = os.environ.get("QUADREMESHER_LAUNCHER", "").strip()
+    return launcher.split() if launcher else []
+
+
+def writeSettingsFile(settingsFilename, inputFilename, theOp, enableTiming):
+    props = bpy.context.scene.qremesher
+
+    settings_file = open(settingsFilename, "w")
+    settings_file.write('HostApp=Blender\n')
+    settings_file.write('HostAppVer=%s\n' % bpy.app.version_string)
+    settings_file.write('FileIn="%s"\n' % inputFilename)
+    settings_file.write('FileOut="%s"\n' % theOp.retopoFilename)
+    settings_file.write('ProgressFile="%s"\n' % theOp.progressData.ProgressFilename)
+
+    settings_file.write("TargetQuadCount=%s\n" % str(getattr(props, 'target_count')))
+    settings_file.write("CurvatureAdaptivness=%s\n" % str(getattr(props, 'adaptive_size')))
+    settings_file.write("ExactQuadCount=%d\n" % (not getattr(props, 'adapt_quad_count')))
+
+    settings_file.write("UseVertexColorMap=%s\n" % str(getattr(props, 'use_vertex_color')))
+    
+    settings_file.write("UseMaterialIds=%d\n" % getattr(props, 'use_materials'))
+    settings_file.write("UseIndexedNormals=%d\n" % getattr(props, 'use_normals'))
+    settings_file.write("AutoDetectHardEdges=%d\n" % getattr(props, 'autodetect_hard_edges'))
+
+    symAxisText = ''
+    if getattr(props, 'symmetry_x') : symAxisText = symAxisText + 'X'
+    if getattr(props, 'symmetry_y') : symAxisText = symAxisText + 'Y'
+    if getattr(props, 'symmetry_z') : symAxisText = symAxisText + 'Z'
+    if symAxisText != '':
+        settings_file.write('SymAxis=%s\n' % symAxisText) 
+        settings_file.write("SymLocal=1\n")
+    
+    if enableTiming:
+        settings_file.write("Timing_StartRemesh_Time=%f\n" % chrono_startRemeshingTime)
+        settings_file.write("Timing_InputMeshExported_Time=%f\n" % time.time()) # this time must include (partially) the txt settings writing.
+
+    settings_file.close()
+
+def exe_launchRemeshing(enginePath, settingsFilename, theOp, verboseDebug):
+    if (verboseDebug): 
+        print("Launch : path=" + enginePath + "\n    settings_path=" + settingsFilename + "\n")
+
+    theOp.progressData.RemeshingProcess = subprocess.Popen([*qr_launch_prefix(), enginePath, "-s", settingsFilename])
+
+    if (verboseDebug): 
+        print("  -> theOp.progressData.RemeshingProcess = " + str(theOp.progressData.RemeshingProcess) + "\n")
+    #NB: theOp.progressData.RemeshingProcess.poll()!=None can be done just after subprocess.Popen(...), no need to wait for something... (checked)

modules/software/utilities/cad.nix

@@ -2,10 +2,37 @@
   den.aspects.cad = {
     nixos = { pkgs, ... }: {
       users.users.bug.packages = with pkgs; [
-        blender
+        #blender
         plasticity
         #orca-slicer
       ];
     };
+
+    homeManager = { pkgs , ... }: {
+      home.packages = let
+        blenderScripts = pkgs.runCommand "blender-user-scripts" { } ''
+          mkdir -p $out/addons
+          cp -r ${./addons}/. $out/addons/
+        '';
+
+        quadRemesherLauncher = pkgs.writeShellScript "quadremesher-launcher" ''
+          engineDir="$(dirname "$1")"
+          export NIX_LD_LIBRARY_PATH="$engineDir:/run/current-system/sw/share/nix-ld/lib''${NIX_LD_LIBRARY_PATH:+:$NIX_LD_LIBRARY_PATH}"
+          export LD_PRELOAD="${pkgs.zlib}/lib/libz.so.1''${LD_PRELOAD:+:$LD_PRELOAD}"
+          exec "$@"
+        '';
+
+        blender-quadremesher = pkgs.symlinkJoin {
+          name = "blender-quadremesher";
+          paths = [ pkgs.blender ];
+          nativeBuildInputs = [ pkgs.makeWrapper ];
+          postBuild = ''
+            wrapProgram $out/bin/blender \
+              --set BLENDER_USER_SCRIPTS ${blenderScripts} \
+              --set QUADREMESHER_LAUNCHER ${quadRemesherLauncher}
+          '';
+        };
+      in [ blender-quadremesher ];
+    };
   };
 }

modules/software/utilities/ghostty.nix

@@ -0,0 +1,15 @@
+{ inputs, ... }: {
+  den.aspects.ghostty = {
+    nixos = { pkgs, ... }: {
+      environment.systemPackages = with pkgs; [
+        ghostty
+      ];
+    };
+
+    homeManager = { ... }: {
+      programs.ghostty.settings = {
+        window-decoration = "none";
+      };
+    };
+  };
+}

modules/software/utilities/utilities.nix

@@ -1,5 +1,5 @@
 { den, ... }: {
   den.aspects.utilities = {
-    includes = with den.aspects; [ system-utils desktop-utils fonts sshuttle torrent cad ];
+    includes = with den.aspects; [ system-utils desktop-utils fonts sshuttle torrent cad ghostty ];
   };
 }