feat(deploy): first integration of krops

.gitignore

@@ -1,2 +1,4 @@
 .DS_Store
+deploy/result
 configuration.nix
+darwin-configuration.nix

darwin-configuration.nix

@@ -1,8 +0,0 @@
-# NixOS config entry point
-# import the hardware and configuration files specific to your machine
-{
-  imports =
-    [
-      ./machines/MacMiniM2-darwin-configuration.nix
-    ];
-}

deploy/krops.nix

@@ -0,0 +1,57 @@
+let
+  krops = builtins.fetchGit {
+    url = "https://cgit.krebsco.de/krops/";
+  };
+  lib = import "${krops}/lib";
+  pkgs = import "${krops}/pkgs" {};
+
+  source = name: lib.evalSource [
+    {
+      dotfiles.file  = toString ../dotfiles;
+      machines.file = toString ../machines;
+      modules.file = toString ../modules;
+      nixos-config.symlink = "machines/${name}/configuration.nix";
+      nixpkgs.git = {
+        clean.exclude = ["/.version-suffix"];
+        ref = "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1";
+        url = https://github.com/NixOS/nixpkgs;
+        shallow = true;
+      };
+      #secrets.pass = {
+      #  dir  = toString ./secrets";
+      #  name = "${name}";
+      #};
+    }
+  ];
+
+  zoro = pkgs.krops.writeDeploy "deploy-zoro" {
+    source = source "zoro";
+    target = lib.mkTarget "optisseur@10.42.0.3:4222" // {
+      extraOptions = [
+        #"-o"
+        #"ControlMaster=auto"
+        #"-o"
+        #"ControlPath=~/.ssh/master-%r@%h:%p"
+        #"-o"
+        #"ControlPersist=480m"
+      ];
+      sudo = true;
+    };
+  };
+
+  sanji = pkgs.krops.writeDeploy "deploy-sanji" {
+    source = source "sanji";
+    target = "root@server02.mydomain.org";
+  };
+
+in {
+  zoro = zoro;
+  sanji = sanji;
+  all = pkgs.writeScript "deploy-all-servers"
+    (lib.concatStringsSep "\n" [ zoro sanji ]);
+}
+
+# ssh-add -t 4h ~/.ssh/id_ed25519
+# nix-build ./krops.nix -A zoro && ./result
+# nix-build ./krops.nix -A sanji && ./result
+# nix-build ./krops.nix -A all && ./result

dotfiles/init_yeswiki_repos.sh

@@ -14,7 +14,7 @@
 
 corebranch="doryphore-dev"
 curdir="$HOME/Developpements" #${PWD}
-repos=$(curl --request GET --url "https://api.github.com/orgs/yeswiki/repos?per_page=100" | jq '.[].full_name' | tr -d "\"" | sort)
+repos=$(curl --request GET --url "https://api.github.com/orgs/yeswiki/repos" | jq '.[].full_name' | tr -d "\"" | sort)
 
 # core
 printf "\n================ Install YesWiki core ================\n"

dotfiles/kitty/kitty.conf

@@ -89,7 +89,5 @@ background_opacity 1
 #background_image ~/Nextcloud/Images/Wallpapers/kitty-bg.png
 #background_image_layout cscaled
 #background_tint 0.99
-modify_font cell_height 130%
+#modify_font cell_height 130%
 startup_session ~/.config/kitty/session.conf
-hide_window_decorations titlebar-only
-

dotfiles/lazygit/config.yml

@@ -0,0 +1 @@
+quitOnTopLevelReturn: true

dotfiles/nvim/lua/plugins/markdownpreview.lua

@@ -1,21 +0,0 @@
-return {
-  {
-    -- Install markdown preview, use npx if available.
-    "iamcco/markdown-preview.nvim",
-    cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
-    ft = { "markdown" },
-    build = function(plugin)
-      if vim.fn.executable("npx") then
-        vim.cmd("!cd " .. plugin.dir .. " && cd app && npx --yes yarn install")
-      else
-        vim.cmd([[Lazy load markdown-preview.nvim]])
-        vim.fn["mkdp#util#install"]()
-      end
-    end,
-    init = function()
-      if vim.fn.executable("npx") then
-        vim.g.mkdp_filetypes = { "markdown" }
-      end
-    end,
-  },
-}

dotfiles/starship/starship.toml

@@ -1,9 +1,9 @@
 "$schema" = 'https://starship.rs/config-schema.json'
 
-#format = '${custom.tztime}$all$directory$character'
 format = '$directory$character'
 right_format = '$all'
-add_newline = true              # Inserts a blank line between shell prompts
+add_newline = true
+command_timeout	= 2000
 
 [character]
 success_symbol = '[➜ ](bold green)'

machines/MacBookPro12.1-configuration.nix

@@ -1,4 +1,3 @@
-
 # 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’).
@@ -14,7 +13,9 @@
     "hid_apple.swap_fn_leftctrl=1"
     "hid_apple.iso_layout=0"
   ];
-  boot.kernel.sysctl = { "vm.swappiness" = 10;};
+  boot.kernel.sysctl = {
+    "vm.swappiness" = 10;
+  };
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -38,7 +39,10 @@
   networking.networkmanager.enable = true;
   networking.firewall = {
     enable = true;
-    allowedTCPPorts = [ 80 443 ];
+    allowedTCPPorts = [
+      80
+      443
+    ];
   };
 
   # Set your time zone.
@@ -76,7 +80,18 @@
     ../modules/local-dev.nix
     ../modules/nixos.nix
   ];
-
+  services.eris-server = {
+    enable = true;
+    backends = [
+      "badger+file:///var/eris?put&get" # local one on /var/eris
+      # "coap+tcp://eris.example.com:5683?get" # an online one
+    ];
+    mountpoint = "/mnt/media/eris"; # useful to mount eris-fs folders
+    listenHttp = ":8080"; # or "[::1]:8080"
+    listenCoap = ":5683"; # or "[::1]:5683"
+    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

machines/MacBookPro12.1-hardware-configuration.nix

@@ -1,15 +1,27 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [ (modulesPath + "/hardware/network/broadcom-43xx.nix")
+    (modulesPath + "/hardware/network/broadcom-43xx.nix")
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.blacklistedKernelModules = [ ];
@@ -17,39 +29,51 @@
     #rtl8192eu
   ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/d56411cf-7072-48a8-aab7-70fb73695e64";
+    device = "/dev/disk/by-uuid/d56411cf-7072-48a8-aab7-70fb73695e64";
     fsType = "ext4";
   };
 
-  fileSystems."/boot/efi" =
+  fileSystems."/boot/efi" = {
-    { device = "/dev/disk/by-uuid/37E1-D07F";
+    device = "/dev/disk/by-uuid/37E1-D07F";
     fsType = "vfat";
   };
-  fileSystems."/mnt/nas/music" =
+  fileSystems."/mnt/nas/music" = {
-    {
     device = "192.168.1.2:/volume1/music";
-      options = [ "nfsvers=4.2" "x-systemd.automount" "noauto" "rw" "relatime" "user" "acl" "defaults"];
+    options = [
+      "nfsvers=4.2"
+      "x-systemd.automount"
+      "noauto"
+      "rw"
+      "relatime"
+      "user"
+      "acl"
+      "defaults"
+    ];
     fsType = "nfs";
   };
 
   services.rpcbind.enable = true; # needed for NFS
-  systemd.mounts = [{
+  systemd.mounts = [
+    {
       type = "nfs";
       mountConfig = {
         Options = "defaults,acl,user,noauto,relatime,rw";
       };
       what = "192.168.1.2:/volume1/music";
       where = "/mnt/nas/music";
-  }];
+    }
+  ];
 
-  systemd.automounts = [{
+  systemd.automounts = [
+    {
       wantedBy = [ "multi-user.target" ];
       automountConfig = {
         TimeoutIdleSec = "600";
       };
       where = "/mnt/nas/music";
-  }];
+    }
+  ];
 
   swapDevices = [ ];
 
@@ -73,8 +97,8 @@
     # brcmfmac being loaded during hibernation would not let a successful resume
     # https://bugzilla.kernel.org/show_bug.cgi?id=101681#c116.
     # Also brcmfmac could randomly crash on resume from sleep.
-    powerUpCommands = lib.mkBefore "${pkgs.kmod}/bin/modprobe brcmfmac";
+    powerUpCommands = lib.mkBefore "${pkgs.kmod}/bin/modprobe brcmfmac && ${pkgs.kmod}/bin/modprobe brcmfmac_wcc";
-    powerDownCommands = lib.mkBefore "${pkgs.kmod}/bin/rmmod brcmfmac";
+    powerDownCommands = lib.mkBefore "${pkgs.kmod}/bin/rmmod brcmfmac_wcc && ${pkgs.kmod}/bin/rmmod brcmfmac";
   };
 
   # USB subsystem wakes up MBP right after suspend unless we disable it.

machines/MacMiniM2-darwin-configuration.nix

@@ -1,33 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  imports = [
-    ../modules/console.nix
-    ../modules/local-dev.nix
-    ../modules/home-config.nix
-  ];
-  
-  fonts = {
-    packages = with pkgs; [
-      inter
-      (nerdfonts.override { fonts = [ "Iosevka" ]; })
-    ];
-  };
-
-  # Use a custom configuration.nix location.
-  # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
-  # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
-
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-  nix.package = pkgs.nix;
-
-  networking.hostName = "ace";
-
-  # Create /etc/zshrc that loads the nix-darwin environment.
-  programs.zsh.enable = true;  # default shell on catalina
-
-  # Used for backwards compatibility, please read the changelog before changing.
-  # $ darwin-rebuild changelog
-  system.stateVersion = 4;
-}

machines/zoro/hardware-configuration.nix

@@ -0,0 +1,40 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "uas" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/f2ac5701-a169-4053-bca8-acdfa2227cfc";
+      fsType = "btrfs";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/0682-2C9F";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/372c281f-7970-40a6-824d-97dd5d2d6043"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

modules/console.nix

@@ -1,17 +1,18 @@
 # cli programs should be available on servers and desktop
 { config, pkgs, ... }:
 let
-  unstable = import
+  unstable =
-    (builtins.fetchTarball https://github.com/nixos/nixpkgs/tarball/7afa2c97ebb0585d00c64c112344483e89e00545)
+    import
+      (builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/7afa2c97ebb0585d00c64c112344483e89e00545")
       # reuse the current configuration
       { config = config.nixpkgs.config; };
 in
 {
   programs.zsh.enable = true;
-  # programs.fzf = {
+  programs.fzf = {
-  #   fuzzyCompletion = true;
+    fuzzyCompletion = true;
-  #   keybindings = true;
+    keybindings = true;
-  # };
+  };
 
   # programs.neovim = {
   #   enable = true;
@@ -48,18 +49,20 @@ in
     htop
     lazygit
     lsd
+    magic-wormhole
     mc
     micro
     mosh
     mpc-cli
     mpd
+    mpv
     neofetch
     unstable.neovim
     ollama
     pandoc
     pass
     pciutils
-    #pinentry
+    pinentry
     ripgrep
     rustc
     slides
@@ -69,12 +72,12 @@ in
     tokei
     tree
     unzip
-    #usbutils
+    usbutils
     wget
     whois
     wl-clipboard
+    wirelesstools
     yazi
-    #wirelesstools
     yt-dlp
     zellij
     zoxide

modules/desktop.nix

@@ -63,7 +63,7 @@
     droidcam.enable = true;
     firefox.enable = true;
     firefox.languagePacks = [ "fr" ];
-    hyprland.enable = true;
+    #hyprland.enable = true;
 
     ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass"; # conflict between kde and gnome cf. https://github.com/NixOS/nixpkgs/issues/75867
     ssh.startAgent = true;
@@ -96,7 +96,9 @@
     (callPackage ./sddm-rose-pine.nix { })
     (vscode-with-extensions.override {
       vscode = vscodium;
-      vscodeExtensions = with vscode-extensions; [
+      vscodeExtensions =
+        with vscode-extensions;
+        [
           #bmewburn.vscode-intelephense-client
           #dracula-theme.theme-dracula
           mvllow.rose-pine
@@ -117,8 +119,7 @@
             version = "0.9.2";
             sha256 = "113w2iis4zi4z3sqc3vd2apyrh52hbh2gvmxjr5yvjpmrsksclbd";
           }
-      ]
+        ];
-      ;
     })
     (chromium.override {
       enableWideVine = true; # DRM support
@@ -127,34 +128,33 @@
     audacious
     calibre
     digikam
-    #rose-pine-gtk-theme
+    eaglemode
-    #rose-pine-icon-theme
-    #element-desktop
     filezilla
     gimp-with-plugins
     hunspell
     hunspellDicts.fr-moderne
-    #hyprpaper
     inkscape-with-extensions
-    #kde-rounded-corners
     kitty
     latte-dock
     libreoffice-qt
     libsForQt5.ark
-    #libsForQt5.krohnkite
-    #libsForQt5.bismuth
     mixxx
     mumble
-    neochat
     nextcloud-client
     obsidian
     signal-desktop
     thunderbird
     tigervnc
-    #tor-browser-bundle-bin
     transmission-qt
     unetbootin
     vlc
+
+    ## niri scroll window manager
+    niri
+    waybar
+    fuzzel
+    alacritty
+
   ];
 
   # Do not restart the display manager automatically

modules/home-config.nix

@@ -1,39 +1,55 @@
-{ config, pkgs, lib, ... }:
+# Inject the right home-manager config for the machine.
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
-  # unstable = import
+  plasma-manager = pkgs.fetchFromGitHub {
-  #   (builtins.fetchTarball https://github.com/nixos/nixpkgs/tarball/7afa2c97ebb0585d00c64c112344483e89e00545)
+    owner = "pjones";
-  #   # reuse the current configuration
+    repo = "plasma-manager";
-  #   { config = config.nixpkgs.config; };
+    rev = "4e56cfeb95081a43cb49487d0996dc936d6201e5";
-  #
+    sha256 = "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw=";
-  #startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" ''
+  };
-  #    ${pkgs.waybar}/bin/waybar &
+  startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" ''
-  #    ${pkgs.swww}/bin/swww init &
+    ${pkgs.waybar}/bin/waybar &
- # 
+    ${pkgs.swww}/bin/swww init &
- #     sleep 1
 
- #     ${pkgs.swww}/bin/swww img /home/mrflos/Nextcloud/Images/Wallpapers/chihiro014.jpg &
+    sleep 1
- #   '';
+
-in {
+    ${pkgs.swww}/bin/swww img /home/mrflos/Nextcloud/Images/Wallpapers/chihiro014.jpg &
+  '';
+in
+{
   # TODO can we automate the installation of home-manager ?
   # sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
-  imports = [ 
+  imports = [ <home-manager/nixos> ];
-    #<home-manager/nixos>
+
-    <home-manager/nix-darwin>
+  # Let Home Manager install and manage itself.
-  ];
+  #programs.home-manager.enable = true;
   home-manager.useGlobalPkgs = true;
   users.users.mrflos = {
-    #isNormalUser = true;
+    isNormalUser = true;
     description = "mrflos";
     createHome = true;
-    #extraGroups = ["users" "docker" "libvirtd" "lxd" "networkmanager" "wheel" ];
+    extraGroups = [
+      "users"
+      "docker"
+      "libvirtd"
+      "lxd"
+      "networkmanager"
+      "wheel"
+    ];
     uid = 1000;
     shell = pkgs.zsh;
-    home = "/Users/mrflos";
   };
 
   nix.settings.trusted-users = [ "mrflos" ];
   home-manager.backupFileExtension = "backup";
-  home-manager.users.mrflos = { pkgs, ... }: {
+  home-manager.users.mrflos =
+    { pkgs, ... }:
+    {
       home.stateVersion = "23.05";
       home.packages = with pkgs; [
         gcc
@@ -44,17 +60,17 @@ in {
         rust-analyzer-unwrapped
         php83Packages.composer
         nodejs_20
-     # swww
+        swww
-     # grimblast
+        grimblast
-      #swaylock
+        swaylock
-      #waybar
+        waybar
         yarn
       ];
 
-    #imports = [  
+      imports = [
-    #  (plasma-manager + "/modules")
+        (plasma-manager + "/modules")
-    #  ./home-plasma.nix
+        ./home-plasma.nix
-    #];
+      ];
       home.file = {
         "./.config/kitty/" = {
           source = ../dotfiles/kitty;
@@ -66,6 +82,11 @@ in {
           recursive = true;
         };
 
+        "./.config/lazygit/" = {
+          source = ../dotfiles/lazygit;
+          recursive = true;
+        };
+
         "./.config/tmux/" = {
           source = ../dotfiles/tmux;
           recursive = true;
@@ -85,7 +106,9 @@ in {
           address = "mrflos@chmok.net";
 
           primary = true;
-        thunderbird = { enable = true; };
+          thunderbird = {
+            enable = true;
+          };
           imap = {
             host = "mail.infomaniak.com";
             port = 993;
@@ -101,7 +124,9 @@ in {
           userName = "mrflos@yeswiki.pro";
           address = "mrflos@yeswiki.pro";
 
-        thunderbird = { enable = true; };
+          thunderbird = {
+            enable = true;
+          };
           imap = {
             host = "mail.infomaniak.com";
             port = 993;
@@ -118,7 +143,9 @@ in {
           address = "mrflos@mrflos.pw";
 
           primary = false;
-        thunderbird = { enable = true; };
+          thunderbird = {
+            enable = true;
+          };
           imap = {
             host = "mrflos.pw";
             port = 993;
@@ -138,7 +165,9 @@ in {
           address = "contact@yeswiki.pro";
 
           primary = false;
-        thunderbird = { enable = true; };
+          thunderbird = {
+            enable = true;
+          };
           imap = {
             host = "mail.infomaniak.com";
             port = 993;
@@ -155,7 +184,9 @@ in {
           address = "contact@yeswiki.net";
 
           primary = false;
-        thunderbird = { enable = true; };
+          thunderbird = {
+            enable = true;
+          };
           imap = {
             host = "mail.infomaniak.com";
             port = 993;
@@ -233,111 +264,118 @@ in {
               zstyle :omz:plugins:ssh-agent agent-forwarding yes
               zstyle :omz:plugins:ssh-agent lazy yes
             '';
-          plugins = [ "git" "ssh-agent" ];
+            plugins = [
+              "git"
+              "ssh-agent"
+            ];
             #  theme = "robbyrussell";
           };
         };
       };
 
-    #services.ssh-agent.enable = true;
+      services.ssh-agent.enable = true;
-    #wayland.windowManager.hyprland.enable = true;
+      wayland.windowManager.hyprland.enable = true;
-    #wayland.windowManager.hyprland.settings = {
+      wayland.windowManager.hyprland.settings = {
-    #  exec-once = ''${startupScript}/bin/hyprland-start'';
+        exec-once = ''${startupScript}/bin/hyprland-start'';
-    #  "$mod" = "SUPER";
+        "$mod" = "SUPER";
 
         # assign apps
-   #   "$term" = "kitty";
+        "$term" = "kitty";
-   #   "$editor" = "nvim";
+        "$editor" = "nvim";
-   #   "$file" = "dolphin";
+        "$file" = "dolphin";
-   #   "$browser" = "firefox";
+        "$browser" = "firefox";
 
-   #   bind = [
+        bind =
-   #     ", Print, exec, grimblast copy area"
+          [
+            ", Print, exec, grimblast copy area"
             # Window/Session actions
-  #      "$mod, Q, killactive"
+            "$mod, Q, killactive"
-  #      "ALT, F4, killactive"
+            "ALT, F4, killactive"
-  #      "$mod, delete, exit" # kill hyperland session
+            "$mod, delete, exit" # kill hyperland session
-  #      "$mod, W, togglefloating" # toggle the window on focus to float
+            "$mod, W, togglefloating" # toggle the window on focus to float
-  #      "$mod, G, togglegroup" # toggle the window on focus to float
+            "$mod, G, togglegroup" # toggle the window on focus to float
-  #      "ALT, return, fullscreen" # toggle the window on focus to fullscreen
+            "ALT, return, fullscreen" # toggle the window on focus to fullscreen
-  #      "$mod, L, exec, swaylock" # lock screen
+            "$mod, L, exec, swaylock" # lock screen
             #  "$mod, backspace, exec, wlogout-launcher-hyprland 1" # logout menu
- #       "$CONTROL, ESCAPE, exec, systemctl-toggle --user waybar.service"
+            "$CONTROL, ESCAPE, exec, systemctl-toggle --user waybar.service"
 
             # Application shortcuts
-#        "$mod, T, exec, $term"  # open terminal
+            "$mod, T, exec, $term" # open terminal
-#        "$mod, E, exec, $file" # open file manager
+            "$mod, E, exec, $file" # open file manager
-#        "$mod, C, exec, $editor" # open vscode
+            "$mod, C, exec, $editor" # open vscode
-#        "$mod, F, exec, $browser" # open browser
+            "$mod, F, exec, $browser" # open browser
 
             # Move focus with mainMod + arrow keys
-#        "$mod, left, movefocus, l"
+            "$mod, left, movefocus, l"
-#        "$mod, right, movefocus, r"
+            "$mod, right, movefocus, r"
- #       "$mod, up, movefocus, u"
+            "$mod, up, movefocus, u"
- #       "$mod, down, movefocus, d"
+            "$mod, down, movefocus, d"
- #       "ALT, Tab, movefocus, d"
+            "ALT, Tab, movefocus, d"
-
 
             # Switch workspaces relative to the active workspace with mainMod + CTRL + [←→]
-  #      "$mod CTRL, right, workspace, r+1"
+            "$mod CTRL, right, workspace, r+1"
-  #      "$mod CTRL, left, workspace, r-1"
+            "$mod CTRL, left, workspace, r-1"
 
             # move to the first empty workspace instantly with mainMod + CTRL + [↓]
-  #      "$mod CTRL, down, workspace, empty"
+            "$mod CTRL, down, workspace, empty"
 
             # Move active window to a relative workspace with mainMod + CTRL + ALT + [←→]
-   #     "$mod CTRL ALT, right, movetoworkspace, r+1"
+            "$mod CTRL ALT, right, movetoworkspace, r+1"
-   #     "$mod CTRL ALT, left, movetoworkspace, r-1"
+            "$mod CTRL ALT, left, movetoworkspace, r-1"
 
             # Move active window around current workspace with mainMod + SHIFT + CTRL [←→↑↓]
-   #     "$mod SHIFT $CONTROL, left, movewindow, l"
+            "$mod SHIFT $CONTROL, left, movewindow, l"
-   #     "$mod SHIFT $CONTROL, right, movewindow, r"
+            "$mod SHIFT $CONTROL, right, movewindow, r"
-   #     "$mod SHIFT $CONTROL, up, movewindow, u"
+            "$mod SHIFT $CONTROL, up, movewindow, u"
-   #     "$mod SHIFT $CONTROL, down, movewindow, d"
+            "$mod SHIFT $CONTROL, down, movewindow, d"
 
             # Scroll through existing workspaces with mainMod + scroll
-    #    "$mod, mouse_down, workspace, e+1"
+            "$mod, mouse_down, workspace, e+1"
-    #    "$mod, mouse_up, workspace, e-1"
+            "$mod, mouse_up, workspace, e-1"
 
             # Special workspaces (scratchpad)
-     #   "$mod ALT, S, movetoworkspacesilent, special"
+            "$mod ALT, S, movetoworkspacesilent, special"
-     #   "$mod, S, togglespecialworkspace,"
+            "$mod, S, togglespecialworkspace,"
 
             # Toggle Layout
-      #  "$mod, J, togglesplit," # dwindle 
+            "$mod, J, togglesplit," # dwindle
-  #    ]
+          ]
-  #    ++ (
+          ++ (
             # workspaces
             # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
-  #      builtins.concatLists (builtins.genList (
+            builtins.concatLists (
-  #          x: let
+              builtins.genList (
-  #            ws = let
+                x:
-  #              c = (x + 1) / 10;
+                let
-  #            in
+                  ws =
-  #              builtins.toString (x + 1 - (c * 10));
+                    let
-  #          in [
+                      c = (x + 1) / 10;
-  #            "$mod, ${ws}, workspace, ${toString (x + 1)}"
+                    in
-  #            "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
+                    builtins.toString (x + 1 - (c * 10));
-  #            "$mod ALT, ${ws}, movetoworkspacesilent, ${toString (x + 1)}" # Move window silently to workspace Super + Alt + [0-9]
+                in
-  #          ]
+                [
-  #        )
+                  "$mod, ${ws}, workspace, ${toString (x + 1)}"
-  #        10)
+                  "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
-  #    );
+                  "$mod ALT, ${ws}, movetoworkspacesilent, ${toString (x + 1)}" # Move window silently to workspace Super + Alt + [0-9]
-#
+                ]
-#      # Move/Resize windows with mainMod + LMB/RMB and dragging
+              ) 10
-#      bindm = [
+            )
-#        "$mod, mouse:272, movewindow"
+          );
-#        "$mod, mouse:273, resizewindow"
-#      ];
 
- #     # Resize windows
+        # Move/Resize windows with mainMod + LMB/RMB and dragging
- #     binde = [
+        bindm = [
- #       "$mod SHIFT, right, resizeactive, 30 0"
+          "$mod, mouse:272, movewindow"
- #       "$mod SHIFT, left, resizeactive, -30 0"
+          "$mod, mouse:273, resizewindow"
- #       "$mod SHIFT, up, resizeactive, 0 -30"
+        ];
- #       "$mod SHIFT, down, resizeactive, 0 30"
+
- #     ];
+        # Resize windows
- #   };
+        binde = [
+          "$mod SHIFT, right, resizeactive, 30 0"
+          "$mod SHIFT, left, resizeactive, -30 0"
+          "$mod SHIFT, up, resizeactive, 0 -30"
+          "$mod SHIFT, down, resizeactive, 0 30"
+        ];
+      };
 
     };
 }

modules/home-plasma.nix

@@ -1,12 +1,4 @@
-{ config, pkgs, lib, ... }:
+{
-let
-  plasma-manager = pkgs.fetchFromGitHub {
-    owner = "pjones";
-    repo = "plasma-manager";
-    rev = "4e56cfeb95081a43cb49487d0996dc936d6201e5";
-    sha256 = "sha256-LJ/lFEupLSi7xtUps234hhMk7ZdVLRoYeU7KiCFaoGw=";
-  };
-in {
   programs.plasma = {
     enable = true;
     shortcuts = {
@@ -53,21 +45,35 @@ in {
       "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S";
       "kcm_touchpad"."Disable Touchpad" = "Touchpad Off";
       "kcm_touchpad"."Enable Touchpad" = "Touchpad On";
-      "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle,Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku"];
+      "kcm_touchpad"."Toggle Touchpad" = [
+        "Touchpad Toggle,Touchpad Toggle"
+        "Meta+Ctrl+Zenkaku Hankaku"
+      ];
       "kded5"."Show System Activity" = "Ctrl+Esc";
-      "kded5"."display" = ["Display" "Meta+P,Display" "Meta+P,Changer d'affichage"];
+      "kded5"."display" = [
+        "Display"
+        "Meta+P,Display"
+        "Meta+P,Changer d'affichage"
+      ];
       "khotkeys"."{d03619b6-9b3c-48cc-9d9c-a2aadb485550}" = [ ];
       "kitty.desktop"."_launch" = "Meta+T,none";
       "kmix"."decrease_microphone_volume" = "Microphone Volume Down";
       "kmix"."decrease_volume" = "Volume Down";
       "kmix"."increase_microphone_volume" = "Microphone Volume Up";
       "kmix"."increase_volume" = "Volume Up";
-      "kmix"."mic_mute" = ["Microphone Mute" "Meta+Volume Mute,Microphone Mute" "Meta+Volume Mute,Couper le son du microphone"];
+      "kmix"."mic_mute" = [
+        "Microphone Mute"
+        "Meta+Volume Mute,Microphone Mute"
+        "Meta+Volume Mute,Couper le son du microphone"
+      ];
       "kmix"."mute" = "Volume Mute";
       "konversation"."next_active_tab" = [ ];
       "konversation"."toggle_mainwindow_visibility" = [ ];
       "ksmserver"."Halt Without Confirmation" = "none,,Éteindre sans confirmation";
-      "ksmserver"."Lock Session" = ["Screensaver,Meta+L" "Screensaver,Verrouiller la session"];
+      "ksmserver"."Lock Session" = [
+        "Screensaver,Meta+L"
+        "Screensaver,Verrouiller la session"
+      ];
       "ksmserver"."Log Out" = "Ctrl+Alt+Del";
       "ksmserver"."Log Out Without Confirmation" = "none,,Déconnexion sans confirmation";
       "ksmserver"."Reboot Without Confirmation" = "none,,Redémarrer sans confirmation";
@@ -75,7 +81,11 @@ in {
       "kwin"."Decrease Opacity" = "none,,Diminuer l'opacité de la fenêtre active de 5 %";
       "kwin"."Edit Tiles" = "none,Meta+T,Basculer ou sortir de l'éditeur de recouvrement";
       "kwin"."Expose" = "Ctrl+F9";
-      "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Activer / désactiver la présentation des fenêtres (tous les bureaux)"];
+      "kwin"."ExposeAll" = [
+        "Ctrl+F10"
+        "Launch (C),Ctrl+F10"
+        "Launch (C),Activer / désactiver la présentation des fenêtres (tous les bureaux)"
+      ];
       "kwin"."ExposeClass" = "Ctrl+F7";
       "kwin"."ExposeClassCurrentDesktop" = [ ];
       "kwin"."Grid-Tiling: Close Desktop" = [ ];
@@ -206,7 +216,10 @@ in {
       "kwin"."Walk Through Windows of Current Application Alternative (Reverse)" = "none,,Naviguer parmi les fenêtres de l'application alternative courante (en ordre inverse)";
       "kwin"."Window Above Other Windows" = "none,,Conserver une fenêtre au-dessus des autres";
       "kwin"."Window Below Other Windows" = "none,,Conserver une fenêtre au-dessous des autres";
-      "kwin"."Window Close" = ["Alt+F4" "Meta+Q,Alt+F4,Fermer une fenêtre"];
+      "kwin"."Window Close" = [
+        "Alt+F4"
+        "Meta+Q,Alt+F4,Fermer une fenêtre"
+      ];
       "kwin"."Window Fullscreen" = "none,,Mettre une fenêtre en plein écran";
       "kwin"."Window Grow Horizontal" = "none,,Maximiser horizontalement une fenêtre";
       "kwin"."Window Grow Vertical" = "none,,Maximiser verticalement une fenêtre";
@@ -214,7 +227,10 @@ in {
       "kwin"."Window Maximize" = "Meta+PgUp";
       "kwin"."Window Maximize Horizontal" = "none,,Maximiser horizontalement une fenêtre";
       "kwin"."Window Maximize Vertical" = "none,,Maximiser verticalement une fenêtre";
-      "kwin"."Window Minimize" = ["Meta+PgDown" "Meta+M,Meta+PgDown,Réduire une fenêtre"];
+      "kwin"."Window Minimize" = [
+        "Meta+PgDown"
+        "Meta+M,Meta+PgDown,Réduire une fenêtre"
+      ];
       "kwin"."Window Move" = "none,,Déplacer une fenêtre";
       "kwin"."Window Move Center" = "none,,Déplacer la fenêtre au centre";
       "kwin"."Window No Border" = "none,,Afficher / Masquer la barre de titre et la bordure";
@@ -278,7 +294,11 @@ in {
       "kwin"."Window to Screen 6" = "none,,Envoyer la fenêtre sur l'écran 6";
       "kwin"."Window to Screen 7" = "none,,Envoyer la fenêtre sur l'écran 7";
       "kwin"."view_actual_size" = "Meta+0";
-      "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom avant"];
+      "kwin"."view_zoom_in" = [
+        "Meta++"
+        "Meta+=,Meta++"
+        "Meta+=,Zoom avant"
+      ];
       "kwin"."view_zoom_out" = "Meta+-";
       "lattedock"."activate entry 1" = "none,Meta+1,Activer l'entrée 1";
       "lattedock"."activate entry 10" = "none,Meta+0,Activer l'entrée 10";
@@ -334,8 +354,15 @@ in {
       "org.kde.konsole.desktop"."NewWindow" = [ ];
       "org.kde.konsole.desktop"."_launch" = "Ctrl+Alt+T,none";
       "org.kde.krunner.desktop"."RunClipboard" = "Alt+Shift+F2,none";
-      "org.kde.krunner.desktop"."_launch" = ["Alt+Space" "Alt+F2" "Search,none"];
+      "org.kde.krunner.desktop"."_launch" = [
-      "org.kde.plasma.emojier.desktop"."_launch" = ["Meta+." "Meta+Ctrl+Alt+Shift+Space,none"];
+        "Alt+Space"
+        "Alt+F2"
+        "Search,none"
+      ];
+      "org.kde.plasma.emojier.desktop"."_launch" = [
+        "Meta+."
+        "Meta+Ctrl+Alt+Shift+Space,none"
+      ];
       "org.kde.spectacle.desktop"."ActiveWindowScreenShot" = "Meta+Print,none";
       "org.kde.spectacle.desktop"."CurrentMonitorScreenShot" = [ ];
       "org.kde.spectacle.desktop"."FullScreenScreenShot" = "Shift+Print,none";
@@ -1098,7 +1125,7 @@ in {
       "kwinrc"."Tiling/ed6da6d2-dc03-5e69-aae5-b2fee83fe2cd"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}";
       "kwinrc"."Windows"."AutoRaise" = true;
       "kwinrc"."Windows"."AutoRaiseInterval" = 300;
-      "kwinrc"."Windows"."ElectricBorderCornerRatio" = 0.01;
+      "kwinrc"."Windows"."ElectricBorderCornerRatio" = 1.0e-2;
       "kwinrc"."Windows"."Placement" = "Maximizing";
       "kwinrc"."Windows"."RollOverDesktops" = true;
       "kwinrc"."Xwayland"."Scale" = 1.75;

modules/local-dev.nix

@@ -1,34 +1,95 @@
 # Local developpement
-{ pkgs, config, lib, ... }: {
-  homebrew.enable = true;
-  homebrew.brews = [
-    # `brew install`
-    #"imagemagick"
-
-    # `brew install`, always `brew services restart`, `brew link`, `brew unlink mysql` (if it is installed)
 {
-      name = "mariadb";
+  pkgs,
-      #restart_service = true;
+  config,
-      link = true;
+  lib,
-      conflicts_with = [ "mysql" ];
+  ...
-    }
+}:
-  ];
+{
+  virtualisation = {
+    docker.enable = true;
+    #docker.rootless = {
+    #  enable = true;
+    #  setSocketVariable = true;
+    #};
+    #libvirtd.enable = true;
+    #lxd.enable = true;
+    #waydroid.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;
+
+      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;
+    package = pkgs.mariadb;
+  };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
-  environment.systemPackages = with pkgs;
+  environment.systemPackages =
+    with pkgs;
     let
-    php83 = pkgs.php83.buildEnv { extraConfig = ''
+      php83 = pkgs.php83.buildEnv { extraConfig = "memory_limit = 2G"; };
-        memory_limit = 2G
+    in
-        max_upload_size = 2G
+    [
-    ''; };
+      #clang
-  in [
-    dart-sass
-    cmake
       dart-sass
+      dbeaver-bin
       docker-compose
-    fd
+      eris-go
-    fzf
       gcc
       go
       nixfmt-rfc-style
@@ -44,8 +105,7 @@
       php83Packages.php-cs-fixer
       python3
       python311Packages.virtualenv
-    ripgrep
+      rpi-imager
-    rust-analyzer-unwrapped
       ruff-lsp
       stylelint
       symfony-cli

modules/minimal-server.nix

@@ -0,0 +1,35 @@
+# cli basic programs and configs that should be available on every server
+{ config, pkgs, ... }:
+{
+  programs.neovim = {
+    enable = true;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+  };
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+    bat
+    btop
+    findutils
+    fzf
+    gnugrep
+    git
+    glances
+    htop
+    lazygit
+    lsd
+    magic-wormhole
+    mc
+    micro
+    mosh
+    neovim
+    ripgrep
+    tmux
+    tree
+    unzip
+    wget
+  ];
+}

modules/nixos.nix

@@ -14,7 +14,5 @@
   };
 
   # TODO : find what is installing this, probably obsidian?
-  nixpkgs.config.permittedInsecurePackages = [
+  nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ];
-    "electron-25.9.0"
-  ];
 }

modules/sddm-rose-pine.nix

@@ -1,6 +1,7 @@
-{ stdenvNoCC
+{
-, fetchFromGitHub
+  stdenvNoCC,
-, libsForQt5
+  fetchFromGitHub,
+  libsForQt5,
 }:
 
 stdenvNoCC.mkDerivation rec {
@@ -8,9 +9,7 @@ stdenvNoCC.mkDerivation rec {
   version = "1.2";
   dontBuild = true;
 
-  propagatedUserEnvPkgs = [
+  propagatedUserEnvPkgs = [ libsForQt5.qt5.qtgraphicaleffects ];
-    libsForQt5.qt5.qtgraphicaleffects
-  ];
 
   src = fetchFromGitHub {
     owner = "lwndhrst";