From a8687e89f1c9a93a147a3eb8fa9e80a708915770 Mon Sep 17 00:00:00 2001
From: Florian Schmitt <mrflos@gmail.com>
Date: Mon, 3 Feb 2025 10:37:06 +0300
Subject: [PATCH 1/2] fix(machines): make sabo work

---
 machines/sabo/configuration.nix | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/machines/sabo/configuration.nix b/machines/sabo/configuration.nix
index c74f85b..ec99d4d 100644
--- a/machines/sabo/configuration.nix
+++ b/machines/sabo/configuration.nix
@@ -1,18 +1,8 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ’nixos-help’).
-
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   hardware.bluetooth.enable = true;
 
-  # Additional configuration from github/jeremiehuchet/nixos-macbookpro
-  boot.kernelParams = [
-    "hid_apple.fnmode=1"
-    "hid_apple.swap_fn_leftctrl=1"
-    "hid_apple.iso_layout=0"
-  ];
   boot.kernel.sysctl = {
     "vm.swappiness" = 10;
   };
@@ -21,9 +11,9 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.systemd-boot.consoleMode = "0";
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+  boot.loader.efi.efiSysMountPoint = "/boot";
 
-  networking.hostName = "luffy"; # Define your hostname.
+  networking.hostName = "sabo";
   networking.extraHosts = ''
     127.0.0.1 yeswiki.test hedgedoc.nixin.local
     192.168.36.206 chmok.net
@@ -93,12 +83,5 @@
     decode = true; # for http access via https://127.0.0.1:8080/uri-res/N2R?urn:eris:...
     package = pkgs.eris-go; # default package
   };
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It's perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.05"; # Did you read the comment?
-
 }

From b63400e00be67434ca824c049644880070d2273d Mon Sep 17 00:00:00 2001
From: Florian Schmitt <mrflos@gmail.com>
Date: Mon, 3 Feb 2025 10:37:51 +0300
Subject: [PATCH 2/2] fix(local-dev): no yeswikidev service

---
 modules/local-dev.nix | 108 +++++++++++++++++++++---------------------
 1 file changed, 53 insertions(+), 55 deletions(-)

diff --git a/modules/local-dev.nix b/modules/local-dev.nix
index ead49f5..35a473f 100644
--- a/modules/local-dev.nix
+++ b/modules/local-dev.nix
@@ -1,8 +1,6 @@
 # Local developpement
 {
   pkgs,
-  config,
-  lib,
   ...
 }:
 {
@@ -17,60 +15,60 @@
     #waydroid.enable = true
   };
   #programs.virt-manager.enable = true;
-  systemd.services.yeswikidev = {
-    enable = true;
-    script = ''
-      ${pkgs.systemd}/bin/systemctl start mysql
-      # etc
-    '';
-    serviceConfig =
-      let
-        startstop =
-          command:
-          (pkgs.writeShellApplication {
-            name = "yeswikidev";
-            runtimeInputs = with pkgs; [ systemd ];
-            text = ''
-              systemctl ${command} mysql.service
-            '';
-          });
-        #startstopFullShell = pkgs.writeShellApplication {
-        #  name = "yeswikidev";
-        #  runtimeInputs = with pkgs; [ systemd ];
-        #  text = ''
-        #    systemctl "$1" mysql.service
-        #  '';
-        #});
-        #commands = [ "start" "stop" ];
-        #scripts = map (command: (pkgs.writeShellApplication {
-        #  name = "yeswikidev";
-        #  runtimeInputs = with pkgs; [ systemd ];
-        #  text = ''
-        #    systemctl ${command} mysql.service
-        #  '';
-        #})) commands;
+  #systemd.services.yeswikidev = {
+  #  enable = true;
+  #  script = ''
+  #    ${pkgs.systemd}/bin/systemctl start mysql
+  #    # etc
+  #  '';
+  #  serviceConfig =
+  #    let
+  #      startstop =
+  #        command:
+  #        (pkgs.writeShellApplication {
+  #          name = "yeswikidev";
+  #          runtimeInputs = with pkgs; [ systemd ];
+  #          text = ''
+  #            systemctl ${command} mysql.service
+  #          '';
+  #        });
+  #startstopFullShell = pkgs.writeShellApplication {
+  #  name = "yeswikidev";
+  #  runtimeInputs = with pkgs; [ systemd ];
+  #  text = ''
+  #    systemctl "$1" mysql.service
+  #  '';
+  #});
+  #commands = [ "start" "stop" ];
+  #scripts = map (command: (pkgs.writeShellApplication {
+  #  name = "yeswikidev";
+  #  runtimeInputs = with pkgs; [ systemd ];
+  #  text = ''
+  #    systemctl ${command} mysql.service
+  #  '';
+  #})) commands;
 
-      in
-      #execs = {
-      #   ExecStart = "start";
-      #   ExecStop = "stop";
-      #};
-      # https://nixos.org/manual/nix/stable/language/builtins
-      # https://nixos.org/manual/nix/stable/language/builtins#builtins-mapAttrs
-      #execAttrs = attrNames execs; # ["Start" "Stop"];
-      #execs2 = mapAttrs (k: v: ()) execs;
-      {
-        # pkgs.writeScript, pkgs.writeScriptBin
-        #ExecStart = startstop "start";
-        #ExecStop = startstop "stop";
-        # OR
-        # ExecStart = "${startstopFullShell} start";
-        # ExecStop  = "${startstopFullShell} stop";
-        # OR
-        # ExecStart = "${scripts[0]}";
-        # ExecStop  = "${scripts[1]}";
-      };
-  };
+  #    in
+  #execs = {
+  #   ExecStart = "start";
+  #   ExecStop = "stop";
+  #};
+  # https://nixos.org/manual/nix/stable/language/builtins
+  # https://nixos.org/manual/nix/stable/language/builtins#builtins-mapAttrs
+  #execAttrs = attrNames execs; # ["Start" "Stop"];
+  #execs2 = mapAttrs (k: v: ()) execs;
+  #    {
+  # pkgs.writeScript, pkgs.writeScriptBin
+  #ExecStart = startstop "start";
+  #ExecStop = startstop "stop";
+  # OR
+  # ExecStart = "${startstopFullShell} start";
+  # ExecStop  = "${startstopFullShell} stop";
+  # OR
+  # ExecStart = "${scripts[0]}";
+  # ExecStop  = "${scripts[1]}";
+  #   };
+  #};
 
   services.mysql = {
     enable = true;