Unify things and rename things

68 files changed, 94 insertions, 315 deletions

diff --git a/kusanagi/nixos/Makefile b/kusanagi/nixos/Makefile
deleted file mode 100644
index 2ae1ef5..0000000
--- a/kusanagi/nixos/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all:
-	sudo nixos-rebuild switch -I nixos-config=configuration.nix
-
-up:
-	sudo nixos-rebuild switch --upgrade -I nixos-config=configuration.nix
diff --git a/lindy/nixos/Makefile b/lindy/nixos/Makefile
deleted file mode 100644
index 2ae1ef5..0000000
--- a/lindy/nixos/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all:
-	sudo nixos-rebuild switch -I nixos-config=configuration.nix
-
-up:
-	sudo nixos-rebuild switch --upgrade -I nixos-config=configuration.nix
diff --git a/lindy/nixos/configuration.nix b/lindy/nixos/configuration.nix
deleted file mode 100644
index 78f8efb..0000000
--- a/lindy/nixos/configuration.nix
+++ /dev/null
@@ -1,185 +0,0 @@
-# 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, ... }:
-
-{
-  imports = [ # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-    ./kde.nix
-    #./gnome.nix
-  ];
-
-  # Use Grub
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "nodev";
-  boot.loader.grub.extraGrubInstallArgs = [ "--bootloader-id=NixOS" ];
-  boot.loader.efi.efiSysMountPoint = "/boot/efi";
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.plymouth.enable = true;
-
-  networking.hostName = "lindy";
-  networking.networkmanager.enable = true;
-
-  # networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
-
-  time.timeZone = "Europe/Paris";
-
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "fr_FR.utf8";
-    LC_IDENTIFICATION = "fr_FR.utf8";
-    LC_MEASUREMENT = "fr_FR.utf8";
-    LC_MONETARY = "fr_FR.utf8";
-    LC_NAME = "fr_FR.utf8";
-    LC_NUMERIC = "fr_FR.utf8";
-    LC_PAPER = "fr_FR.utf8";
-    LC_TELEPHONE = "fr_FR.utf8";
-    LC_TIME = "fr_FR.utf8";
-  };
-
-  console = {
-    font = "sun12x22";
-    #keyMap = "fr";
-    useXkbConfig = true; # use xkbOptions in tty.
-  };
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-  services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.opengl.enable = true;
-
-  # Configure keymap in X11
-  services.xserver.layout = "fr";
-  services.xserver.xkbOptions = "caps:escape";
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable sound.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.lx = {
-    isNormalUser = true;
-    description = "Alex";
-    home = "/home/lx.nix";
-    extraGroups =
-      [ "networkmanager" "wheel" "yggdrasil" ]; # Enable ‘sudo’ for the user.
-  };
-
-  nixpkgs.config.allowUnfree = true;
-  nix.gc.automatic = true;
-  nix.gc.options = "--delete-older-than 30d";
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  environment.systemPackages = with pkgs; [
-    home-manager
-
-    profont
-    symbola
-
-    vim
-    vimPlugins.vim-nix
-    vimPlugins.fzf-vim
-    vimPlugins.nerdtree
-    tmux
-    git
-    git-lfs
-    pass
-    openssl
-    htop
-    powertop
-    iotop
-    jnettop
-    socat
-    nethogs
-    speedtest-cli
-    ncdu
-    dfc
-    wget
-    gcc
-    gnumake
-    rclone
-    restic
-    borgbackup
-    nomad
-    consul
-    nixfmt
-
-    alacritty
-    firefox
-    qutebrowser
-    (tor-browser-bundle-bin.override { useHardenedMalloc = false; })
-    lagrange
-    thunderbird
-    keepassxc
-    vlc
-    mpv
-    spotify
-    jellyfin-media-player
-    nheko
-  ];
-
-  programs.vim.defaultEditor = true;
-
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall =
-      true; # Open ports in the firewall for Steam Remote Play
-    dedicatedServer.openFirewall =
-      true; # Open ports in the firewall for Source Dedicated Server
-  };
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  programs.mtr.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  services.yggdrasil = {
-    enable = true;
-    persistentKeys = true;
-    settings = { Peers = [ "tls://37.187.118.206:53103" ]; };
-  };
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  system.copySystemConfiguration = true;
-
-  # 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 = "22.11"; # Did you read the comment?
-}
-
diff --git a/lindy/nixos/gnome.nix b/lindy/nixos/gnome.nix
deleted file mode 100644
index 9d02459..0000000
--- a/lindy/nixos/gnome.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ config, pkgs, ... }: {
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-  environment.gnome.excludePackages = [
-    pkgs.gnome.cheese
-    pkgs.gnome-photos
-    pkgs.gnome.gnome-music
-    #pkgs.gnome.gnome-terminal
-    pkgs.gnome.gedit
-    pkgs.epiphany
-    pkgs.gnome.geary
-    #pkgs.evince
-    #pkgs.gnome.gnome-characters
-    pkgs.gnome.totem
-    pkgs.gnome.tali
-    pkgs.gnome.iagno
-    pkgs.gnome.hitori
-    pkgs.gnome.atomix
-    pkgs.gnome-tour
-    pkgs.gnome-console
-  ];
-
-  environment.systemPackages = with pkgs; [
-    qgnomeplatform
-
-    gnome.gnome-tweaks
-    gnomeExtensions.appindicator
-    gnomeExtensions.dash-to-panel
-    gnome.gnome-terminal
-  ];
-}
diff --git a/lindy/nixos/hardware-configuration.nix b/lindy/nixos/hardware-configuration.nix
deleted file mode 100644
index a834491..0000000
--- a/lindy/nixos/hardware-configuration.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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" "nvme" "usb_storage" "usbhid" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-intel" "wl" ];
-  boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
-
-  boot.initrd.luks.devices = {
-      cryptssd = {
-         device = "/dev/disk/by-uuid/1b074a78-9116-420e-b872-7bf49ca10ce1";
-         allowDiscards = true;
-      };
-  };
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/2e64e6fc-ab7c-4620-b56b-faee641bd2a6";
-      fsType = "ext4";
-    };
-
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/1ef4b6f4-975d-4e04-9d88-0640e83ed0b4";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/0728e7e5-8e21-44bd-9287-eb066d489a0e";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot/efi" =
-    { device = "/dev/disk/by-uuid/02D0-F1C6";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/5950785a-9793-4d04-b791-8f4dbc497ec3"; }
-    ];
-
-  # 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.br-1ab2b811ce21.useDHCP = lib.mkDefault true;
-  # networking.interfaces.docker0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.virbr0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/lindy/nixos/kde.nix b/lindy/nixos/kde.nix
deleted file mode 100644
index 653a8eb..0000000
--- a/lindy/nixos/kde.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, ... }: {
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-
-  environment.systemPackages = with pkgs.libsForQt5; [ kgpg ark ];
-}
diff --git a/nixos/Makefile b/nixos/Makefile
new file mode 100644
index 0000000..ba8182a
--- /dev/null
+++ b/nixos/Makefile
@@ -0,0 +1,5 @@
+all:
+	sudo nixos-rebuild switch -I nixos-config=`hostname`.nix
+
+up:
+	sudo nixos-rebuild switch --upgrade -I nixos-config=`hostname`.nix
diff --git a/kusanagi/nixos/configuration.nix b/nixos/common.nix
index 5b7e416..c736938 100644
--- a/kusanagi/nixos/configuration.nix
+++ b/nixos/common.nix
@@ -1,27 +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, ... }:
 
 {
-  imports = [ # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-    ./kde.nix
-    #./gnome.nix
-  ];
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.plymouth.enable = true;
-
-  networking.hostName = "kusanagi";
   networking.networkmanager.enable = true;
 
-  # networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
-
   time.timeZone = "Europe/Paris";
 
   i18n.defaultLocale = "en_US.UTF-8";
diff --git a/kusanagi/nixos/gnome.nix b/nixos/gnome.nix
index 9d02459..9d02459 100644
--- a/kusanagi/nixos/gnome.nix
+++ b/nixos/gnome.nix
diff --git a/kusanagi/nixos/kde.nix b/nixos/kde.nix
index 653a8eb..653a8eb 100644
--- a/kusanagi/nixos/kde.nix
+++ b/nixos/kde.nix
diff --git a/kusanagi/nixos/hardware-configuration.nix b/nixos/kusanagi.nix
index e7fa542..eea3f9e 100644
--- a/kusanagi/nixos/hardware-configuration.nix
+++ b/nixos/kusanagi.nix
@@ -4,7 +4,19 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+    ./common.nix
+    ./kde.nix
+    #./gnome.nix
+  ];
+
+  networking.hostName = "kusanagi";
+
+  # Use systemd-boot
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.plymouth.enable = true;
 
   boot.initrd.availableKernelModules =
     [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
@@ -12,8 +24,12 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  boot.initrd.luks.devices.crypted.device =
-    "/dev/disk/by-uuid/e3271725-effb-4b00-a5d4-8a7a64f55420";
+  boot.initrd.luks.devices = {
+    crypted = {
+      device = "/dev/disk/by-uuid/e3271725-effb-4b00-a5d4-8a7a64f55420";
+      allowDiscards = true;
+    };
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/2f606c6b-8009-4158-b367-2e0cf1a57ade";
diff --git a/nixos/lindy.nix b/nixos/lindy.nix
new file mode 100644
index 0000000..04ba248
--- /dev/null
+++ b/nixos/lindy.nix
@@ -0,0 +1,70 @@
+# 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")
+    ./common.nix
+    ./kde.nix
+    #./gnome.nix
+  ];
+
+  networking.hostName = "lindy";
+
+  # Use Grub
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "nodev";
+  boot.loader.grub.extraGrubInstallArgs = [ "--bootloader-id=NixOS" ];
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.plymouth.enable = true;
+
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
+  boot.kernelModules = [ "kvm-intel" "wl" ];
+  boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
+
+  boot.initrd.luks.devices = {
+    cryptssd = {
+      device = "/dev/disk/by-uuid/1b074a78-9116-420e-b872-7bf49ca10ce1";
+      allowDiscards = true;
+    };
+  };
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/2e64e6fc-ab7c-4620-b56b-faee641bd2a6";
+    fsType = "ext4";
+  };
+
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/1ef4b6f4-975d-4e04-9d88-0640e83ed0b4";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/0728e7e5-8e21-44bd-9287-eb066d489a0e";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot/efi" = {
+    device = "/dev/disk/by-uuid/02D0-F1C6";
+    fsType = "vfat";
+  };
+
+  swapDevices =
+    [{ device = "/dev/disk/by-uuid/5950785a-9793-4d04-b791-8f4dbc497ec3"; }];
+
+  users.users.lx.home = "/home/lx.nix";
+
+  # Nvidia graphics
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.opengl.enable = true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/kusanagi/nixpkgs/Makefile b/nixpkgs/Makefile
index e99f6c2..e99f6c2 100644
--- a/kusanagi/nixpkgs/Makefile
+++ b/nixpkgs/Makefile
diff --git a/kusanagi/nixpkgs/home.nix b/nixpkgs/home.nix
index ae8bc5d..ae8bc5d 100644
--- a/kusanagi/nixpkgs/home.nix
+++ b/nixpkgs/home.nix
diff --git a/chitanda/dot_bashrc b/old/chitanda/dot_bashrc
index 84c5f25..84c5f25 100644
--- a/chitanda/dot_bashrc
+++ b/old/chitanda/dot_bashrc
diff --git a/chitanda/dot_i3/config b/old/chitanda/dot_i3/config
index 4b48ace..4b48ace 100644
--- a/chitanda/dot_i3/config
+++ b/old/chitanda/dot_i3/config
diff --git a/chitanda/dot_i3/i3status.conf b/old/chitanda/dot_i3/i3status.conf
index a59d837..a59d837 100644
--- a/chitanda/dot_i3/i3status.conf
+++ b/old/chitanda/dot_i3/i3status.conf
diff --git a/kusanagi/old/alacritty/alacritty.yml b/old/kusanagi/alacritty/alacritty.yml
index 500b95e..500b95e 100644
--- a/kusanagi/old/alacritty/alacritty.yml
+++ b/old/kusanagi/alacritty/alacritty.yml
diff --git a/kusanagi/old/dot_Xdefaults b/old/kusanagi/dot_Xdefaults
index 12658f1..12658f1 100644
--- a/kusanagi/old/dot_Xdefaults
+++ b/old/kusanagi/dot_Xdefaults
diff --git a/kusanagi/old/dot_bashrc b/old/kusanagi/dot_bashrc
index fc2b6c4..fc2b6c4 100644
--- a/kusanagi/old/dot_bashrc
+++ b/old/kusanagi/dot_bashrc
diff --git a/kusanagi/old/dot_i3/config b/old/kusanagi/dot_i3/config
index b7fa3e9..b7fa3e9 100644
--- a/kusanagi/old/dot_i3/config
+++ b/old/kusanagi/dot_i3/config
diff --git a/kusanagi/old/dot_i3/i3lock-dpms b/old/kusanagi/dot_i3/i3lock-dpms
index fa97182..fa97182 100755
--- a/kusanagi/old/dot_i3/i3lock-dpms
+++ b/old/kusanagi/dot_i3/i3lock-dpms
diff --git a/kusanagi/old/dot_i3/i3status.conf b/old/kusanagi/dot_i3/i3status.conf
index e31e6fc..e31e6fc 100644
--- a/kusanagi/old/dot_i3/i3status.conf
+++ b/old/kusanagi/dot_i3/i3status.conf
diff --git a/kusanagi/old/dot_i3/mpdscribble.sh b/old/kusanagi/dot_i3/mpdscribble.sh
index 6297ee7..6297ee7 100755
--- a/kusanagi/old/dot_i3/mpdscribble.sh
+++ b/old/kusanagi/dot_i3/mpdscribble.sh
diff --git a/kusanagi/old/dot_inputrc b/old/kusanagi/dot_inputrc
index 96d68ba..96d68ba 100644
--- a/kusanagi/old/dot_inputrc
+++ b/old/kusanagi/dot_inputrc
diff --git a/kusanagi/old/dot_xinitrc b/old/kusanagi/dot_xinitrc
index 57de588..57de588 100755
--- a/kusanagi/old/dot_xinitrc
+++ b/old/kusanagi/dot_xinitrc
diff --git a/kusanagi/old/mako/config b/old/kusanagi/mako/config
index e1b7c1f..e1b7c1f 100644
--- a/kusanagi/old/mako/config
+++ b/old/kusanagi/mako/config
diff --git a/kusanagi/old/mako/nohup.out b/old/kusanagi/mako/nohup.out
index 4677f0b..4677f0b 100644
--- a/kusanagi/old/mako/nohup.out
+++ b/old/kusanagi/mako/nohup.out
diff --git a/kusanagi/old/sway/config b/old/kusanagi/sway/config
index bbd549f..bbd549f 100644
--- a/kusanagi/old/sway/config
+++ b/old/kusanagi/sway/config
diff --git a/kusanagi/old/wayfire.ini b/old/kusanagi/wayfire.ini
index 5da1dc4..5da1dc4 100644
--- a/kusanagi/old/wayfire.ini
+++ b/old/kusanagi/wayfire.ini
diff --git a/kusanagi/old/wf-shell.ini b/old/kusanagi/wf-shell.ini
index a35f55a..a35f55a 100644
--- a/kusanagi/old/wf-shell.ini
+++ b/old/kusanagi/wf-shell.ini
diff --git a/lindy/old/alacritty/alacritty.yml b/old/lindy/alacritty/alacritty.yml
index 0c5785c..0c5785c 100644
--- a/lindy/old/alacritty/alacritty.yml
+++ b/old/lindy/alacritty/alacritty.yml
diff --git a/lindy/old/dot_bashrc b/old/lindy/dot_bashrc
index 5ba4663..5ba4663 100644
--- a/lindy/old/dot_bashrc
+++ b/old/lindy/dot_bashrc
diff --git a/lindy/old/dot_i3/config b/old/lindy/dot_i3/config
index 85a33ab..85a33ab 100644
--- a/lindy/old/dot_i3/config
+++ b/old/lindy/dot_i3/config
diff --git a/lindy/old/dot_i3/i3lock-dpms b/old/lindy/dot_i3/i3lock-dpms
index fa97182..fa97182 100755
--- a/lindy/old/dot_i3/i3lock-dpms
+++ b/old/lindy/dot_i3/i3lock-dpms
diff --git a/lindy/old/dot_i3/i3status.conf b/old/lindy/dot_i3/i3status.conf
index cc11aa8..cc11aa8 100644
--- a/lindy/old/dot_i3/i3status.conf
+++ b/old/lindy/dot_i3/i3status.conf
diff --git a/lindy/old/dot_tmux.conf b/old/lindy/dot_tmux.conf
index dc80775..dc80775 100644
--- a/lindy/old/dot_tmux.conf
+++ b/old/lindy/dot_tmux.conf
diff --git a/lindy/old/dot_vimrc b/old/lindy/dot_vimrc
index 13ecca5..13ecca5 100644
--- a/lindy/old/dot_vimrc
+++ b/old/lindy/dot_vimrc
diff --git a/lindy/old/sway/config b/old/lindy/sway/config
index 1f0f1f1..1f0f1f1 100644
--- a/lindy/old/sway/config
+++ b/old/lindy/sway/config
diff --git a/lindy/old/systemd/alps-inria.service b/old/lindy/systemd/alps-inria.service
index c338b4f..c338b4f 100644
--- a/lindy/old/systemd/alps-inria.service
+++ b/old/lindy/systemd/alps-inria.service
diff --git a/lindy/old/systemd/dino-background.service b/old/lindy/systemd/dino-background.service
index 2ccd4c3..2ccd4c3 100644
--- a/lindy/old/systemd/dino-background.service
+++ b/old/lindy/systemd/dino-background.service
diff --git a/lindy/old/systemd/rclone-mount@.service b/old/lindy/systemd/rclone-mount@.service
index 2f5a454..2f5a454 100644
--- a/lindy/old/systemd/rclone-mount@.service
+++ b/old/lindy/systemd/rclone-mount@.service
diff --git a/lindy/old/systemd/scream-client.service b/old/lindy/systemd/scream-client.service
index 164cf6b..164cf6b 100644
--- a/lindy/old/systemd/scream-client.service
+++ b/old/lindy/systemd/scream-client.service
diff --git a/lindy/old/systemd/secure-tunnel@.service b/old/lindy/systemd/secure-tunnel@.service
index 5054dd2..5054dd2 100644
--- a/lindy/old/systemd/secure-tunnel@.service
+++ b/old/lindy/systemd/secure-tunnel@.service
diff --git a/lindy/old/vm/vmconf.sh b/old/lindy/vm/vmconf.sh
index c5dfd7f..c5dfd7f 100755
--- a/lindy/old/vm/vmconf.sh
+++ b/old/lindy/vm/vmconf.sh
diff --git a/lindy/old/vm/vmunconf.sh b/old/lindy/vm/vmunconf.sh
index 768ebc1..768ebc1 100755
--- a/lindy/old/vm/vmunconf.sh
+++ b/old/lindy/vm/vmunconf.sh
diff --git a/lindy/old/vm/win10_vm_conf_20211123.xml b/old/lindy/vm/win10_vm_conf_20211123.xml
index 25a7b4e..25a7b4e 100644
--- a/lindy/old/vm/win10_vm_conf_20211123.xml
+++ b/old/lindy/vm/win10_vm_conf_20211123.xml
diff --git a/lindy/old/wayfire.ini b/old/lindy/wayfire.ini
index 4f5188a..4f5188a 100644
--- a/lindy/old/wayfire.ini
+++ b/old/lindy/wayfire.ini
diff --git a/lindy/old/wf-shell.ini b/old/lindy/wf-shell.ini
index d8919ea..d8919ea 100644
--- a/lindy/old/wf-shell.ini
+++ b/old/lindy/wf-shell.ini
diff --git a/lindy/old/xkb/symbols/custom-fr b/old/lindy/xkb/symbols/custom-fr
index 795c7ff..795c7ff 100644
--- a/lindy/old/xkb/symbols/custom-fr
+++ b/old/lindy/xkb/symbols/custom-fr
diff --git a/saki/dot_bashrc b/old/saki/dot_bashrc
index fa0d5cc..fa0d5cc 100644
--- a/saki/dot_bashrc
+++ b/old/saki/dot_bashrc
diff --git a/saki/dot_i3/config b/old/saki/dot_i3/config
index b8305f8..b8305f8 100644
--- a/saki/dot_i3/config
+++ b/old/saki/dot_i3/config
diff --git a/saki/dot_i3/i3status.conf b/old/saki/dot_i3/i3status.conf
index 82fb837..82fb837 100644
--- a/saki/dot_i3/i3status.conf
+++ b/old/saki/dot_i3/i3status.conf
diff --git a/solanum/alacritty/alacritty.yml b/old/solanum/alacritty/alacritty.yml
index 204bc76..204bc76 100644
--- a/solanum/alacritty/alacritty.yml
+++ b/old/solanum/alacritty/alacritty.yml
diff --git a/solanum/dot_Xresources b/old/solanum/dot_Xresources
index 622ef68..622ef68 100644
--- a/solanum/dot_Xresources
+++ b/old/solanum/dot_Xresources
diff --git a/solanum/dot_bashrc b/old/solanum/dot_bashrc
index e740a6c..e740a6c 100644
--- a/solanum/dot_bashrc
+++ b/old/solanum/dot_bashrc
diff --git a/solanum/dot_gvimrc b/old/solanum/dot_gvimrc
index 30c2e38..30c2e38 100644
--- a/solanum/dot_gvimrc
+++ b/old/solanum/dot_gvimrc
diff --git a/solanum/dot_tmux.conf b/old/solanum/dot_tmux.conf
index f122ae7..f122ae7 100644
--- a/solanum/dot_tmux.conf
+++ b/old/solanum/dot_tmux.conf
diff --git a/solanum/dot_vimrc b/old/solanum/dot_vimrc
index be17b3b..be17b3b 100644
--- a/solanum/dot_vimrc
+++ b/old/solanum/dot_vimrc
diff --git a/solanum/fzf2.sh b/old/solanum/fzf2.sh
index bf774a5..bf774a5 100755
--- a/solanum/fzf2.sh
+++ b/old/solanum/fzf2.sh
diff --git a/solanum/sway/config b/old/solanum/sway/config
index e9b40b6..e9b40b6 100644
--- a/solanum/sway/config
+++ b/old/solanum/sway/config
diff --git a/solanum/xkb/symbols/custom-fr b/old/solanum/xkb/symbols/custom-fr
index faadbed..faadbed 100644
--- a/solanum/xkb/symbols/custom-fr
+++ b/old/solanum/xkb/symbols/custom-fr
diff --git a/kusanagi/xkb/symbols/xkb.dump b/old/solanum/xkb/symbols/xkb.dump
index 2c0bc8c..2c0bc8c 100644
--- a/kusanagi/xkb/symbols/xkb.dump
+++ b/old/solanum/xkb/symbols/xkb.dump
diff --git a/kusanagi/tmux/tmux.conf b/tmux/tmux.conf
index bd8d4b5..bd8d4b5 100644
--- a/kusanagi/tmux/tmux.conf
+++ b/tmux/tmux.conf
diff --git a/kusanagi/vim/vimrc b/vim/vimrc
index a5f8092..a5f8092 100644
--- a/kusanagi/vim/vimrc
+++ b/vim/vimrc
diff --git a/kusanagi/xkb/symbols/custom-fr b/xkb/symbols/custom-fr
index bb03fbf..bb03fbf 100644
--- a/kusanagi/xkb/symbols/custom-fr
+++ b/xkb/symbols/custom-fr
diff --git a/kusanagi/xkb/symbols/fr-lx b/xkb/symbols/fr-lx
index 1e8fb40..1e8fb40 100644
--- a/kusanagi/xkb/symbols/fr-lx
+++ b/xkb/symbols/fr-lx
diff --git a/solanum/xkb/symbols/xkb.dump b/xkb/symbols/xkb.dump
index 2c0bc8c..2c0bc8c 100644
--- a/solanum/xkb/symbols/xkb.dump
+++ b/xkb/symbols/xkb.dump