From b52b99f405030f6e8574edae3b2f39474f21ce01 Mon Sep 17 00:00:00 2001
From: Harry Hauer <harry.hauer@inria.fr>
Date: Wed, 2 Jul 2025 17:40:33 +0200
Subject: [PATCH 01/11] added work host

---
 hosts/workstation/configuration.nix          | 103 +++++++++++++++++++
 hosts/workstation/hardware-configuration.nix |  42 ++++++++
 2 files changed, 145 insertions(+)
 create mode 100644 hosts/workstation/configuration.nix
 create mode 100644 hosts/workstation/hardware-configuration.nix

diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix
new file mode 100644
index 0000000..8d54cb4
--- /dev/null
+++ b/hosts/workstation/configuration.nix
@@ -0,0 +1,103 @@
+# 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
+    ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  # Use latest kernel.
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  boot.initrd.luks.devices."luks-11a80280-8a8c-44c0-a8be-7ef370eb37ae".device = "/dev/disk/by-uuid/11a80280-8a8c-44c0-a8be-7ef370eb37ae";
+  networking.hostName = "nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Set your time zone.
+  time.timeZone = "Europe/Paris";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "fr_FR.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "fr_FR.UTF-8";
+    LC_IDENTIFICATION = "fr_FR.UTF-8";
+    LC_MEASUREMENT = "fr_FR.UTF-8";
+    LC_MONETARY = "fr_FR.UTF-8";
+    LC_NAME = "fr_FR.UTF-8";
+    LC_NUMERIC = "fr_FR.UTF-8";
+    LC_PAPER = "fr_FR.UTF-8";
+    LC_TELEPHONE = "fr_FR.UTF-8";
+    LC_TIME = "fr_FR.UTF-8";
+  };
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "fr";
+    variant = "azerty";
+  };
+
+  # Configure console keymap
+  console.keyMap = "fr";
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.rouge = {
+    isNormalUser = true;
+    description = "rouge";
+    extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [];
+  };
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #  wget
+  ];
+
+  # 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;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # 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 = "25.05"; # Did you read the comment?
+
+}
diff --git a/hosts/workstation/hardware-configuration.nix b/hosts/workstation/hardware-configuration.nix
new file mode 100644
index 0000000..b497b4f
--- /dev/null
+++ b/hosts/workstation/hardware-configuration.nix
@@ -0,0 +1,42 @@
+# 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" "vmd" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/a9f9a6b3-1a37-4b41-9bc1-2926b91d2313";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."luks-73dfdf0a-a2af-4288-8d8a-dadebb09dbb6".device = "/dev/disk/by-uuid/73dfdf0a-a2af-4288-8d8a-dadebb09dbb6";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/CA07-8097";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/fea61063-24da-4921-86f4-d26c700ae66f"; }
+    ];
+
+  # 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.eno1.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

From 7fa38d9777c81585835c14da4b189b656ad72233 Mon Sep 17 00:00:00 2001
From: harry123 <harryh@ik.me>
Date: Wed, 2 Jul 2025 18:04:48 +0200
Subject: [PATCH 02/11] added workstation config

---
 flake.nix                                     | 24 ++++++++++-
 home-manager/home.nix                         |  4 +-
 .../goober/features/software/workstation.nix  |  1 -
 hosts/workstation/configuration.nix           | 27 +++++++++---
 .../features/software/workstation.nix         | 41 +++++++++++++++++++
 5 files changed, 88 insertions(+), 9 deletions(-)
 create mode 100644 hosts/workstation/features/software/workstation.nix

diff --git a/flake.nix b/flake.nix
index 81b4058..378cf2d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,7 +64,7 @@
       ...
     }@inputs:
     let
-      username = "harry123";
+      username = "misschloe777";
       secrets = builtins.toString inputs.nix-secrets;
 
       specialArgs = {
@@ -116,6 +116,28 @@
           ];
         };
 
+        workstation = nixpkgsUnstable.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = specialArgs;
+          modules = [
+            ./hosts/workstation/configuration.nix
+            nix-flatpak.nixosModules.nix-flatpak
+            catppuccin.nixosModules.catppuccin
+            home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.users.${username} = {
+                imports = [
+                  ./home-manager/home.nix
+                  catppuccin.homeModules.catppuccin
+                ];
+              };
+              home-manager.extraSpecialArgs = { inherit inputs; };
+            }
+          ];
+        };
+
         dionysos = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = {
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 42c5995..e32d7a6 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -7,8 +7,8 @@
 {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
-  home.username = "harry123";
-  home.homeDirectory = "/home/harry123";
+  home.username = "misschloe777";
+  home.homeDirectory = "/home/misschloe777";
 
   # This value determines the Home Manager release that your configuration is
   # compatible with. This helps avoid breakage when a new Home Manager release
diff --git a/hosts/goober/features/software/workstation.nix b/hosts/goober/features/software/workstation.nix
index e0d9640..c32d645 100644
--- a/hosts/goober/features/software/workstation.nix
+++ b/hosts/goober/features/software/workstation.nix
@@ -57,7 +57,6 @@
     revolt-desktop
   ];
 
-  programs.kdeconnect.enable = true;
   virtualisation.containers.enable = true;
   virtualisation = {
     podman = {
diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix
index 8d54cb4..d61b438 100644
--- a/hosts/workstation/configuration.nix
+++ b/hosts/workstation/configuration.nix
@@ -7,6 +7,7 @@
 {
   imports =
     [ # Include the results of the hardware scan.
+      ../../shared/client/tailscale.nix
       ./hardware-configuration.nix
     ];
 
@@ -18,7 +19,7 @@
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
   boot.initrd.luks.devices."luks-11a80280-8a8c-44c0-a8be-7ef370eb37ae".device = "/dev/disk/by-uuid/11a80280-8a8c-44c0-a8be-7ef370eb37ae";
-  networking.hostName = "nixos"; # Define your hostname.
+  networking.hostName = "workstation"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Configure network proxy if necessary
@@ -56,13 +57,20 @@
   console.keyMap = "fr";
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.rouge = {
+  users.users.misschloe777 = {
     isNormalUser = true;
-    description = "rouge";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [];
+    description = "misschloe777";
+    extraGroups = [ "networkmanager" "wheel" "audio" "video" "podman" ];
+    packages = with pkgs; [
+      inputs.zen-browser.packages."${system}".default
+    ];
   };
 
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
@@ -71,6 +79,15 @@
   environment.systemPackages = with pkgs; [
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
   #  wget
+    wget
+    dwl
+    git
+    tmux
+    mako
+    grim
+    slurp
+    wl-clipboard
+    udiskie
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/hosts/workstation/features/software/workstation.nix b/hosts/workstation/features/software/workstation.nix
new file mode 100644
index 0000000..9a6e73f
--- /dev/null
+++ b/hosts/workstation/features/software/workstation.nix
@@ -0,0 +1,41 @@
+{ pkgs, lib, ... }:
+{
+  # for java development on vscode
+  programs.nix-ld.enable = true;
+
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
+      "davinci-resolve"
+      "vscode"
+      "tetrio-desktop"
+      "beeper"
+    ];
+
+  environment.systemPackages = with pkgs; [
+    zathura
+    libreoffice-qt
+    hunspell
+    hunspellDicts.fr-any
+    hunspellDicts.en-gb-large
+
+    # recording software
+    obs-studio
+
+    gvfs
+
+    nil
+    bitwarden
+  ];
+
+  virtualisation.containers.enable = true;
+  virtualisation = {
+    podman = {
+      enable = true;
+      # Create a `docker` alias for podman, to use it as a drop-in replacement
+      dockerCompat = true;
+      # Required for containers under podman-compose to be able to talk to each other.
+      defaultNetwork.settings.dns_enabled = true;
+    };
+  };
+}

From 3d6286340fc3436ffbe3d33233887977359af082 Mon Sep 17 00:00:00 2001
From: harry123 <harryh@ik.me>
Date: Wed, 2 Jul 2025 18:28:00 +0200
Subject: [PATCH 03/11] fixed niri path

---
 hosts/workstation/configuration.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix
index d61b438..0cc612b 100644
--- a/hosts/workstation/configuration.nix
+++ b/hosts/workstation/configuration.nix
@@ -2,12 +2,12 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
+{inputs, config, pkgs, ... }:
 
 {
   imports =
     [ # Include the results of the hardware scan.
-      ../../shared/client/tailscale.nix
+      ../../shared/client/niri.nix
       ./hardware-configuration.nix
     ];
 

From 1605ba39516d6af9c0a9c2ea41a4b032bf44aa54 Mon Sep 17 00:00:00 2001
From: harry123 <harryh@ik.me>
Date: Wed, 2 Jul 2025 19:10:17 +0200
Subject: [PATCH 04/11] more silly utils

---
 hosts/goober/features/software/workstation.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hosts/goober/features/software/workstation.nix b/hosts/goober/features/software/workstation.nix
index c32d645..92f4859 100644
--- a/hosts/goober/features/software/workstation.nix
+++ b/hosts/goober/features/software/workstation.nix
@@ -10,6 +10,7 @@
       "vscode"
       "tetrio-desktop"
       "beeper"
+      "exact-audio-copy"
     ];
 
   environment.systemPackages = with pkgs; [
@@ -55,6 +56,10 @@
     ente-web
     jetbrains.rider
     revolt-desktop
+    exactaudiocopy
+    picard
+    dysk
+    rsync
   ];
 
   virtualisation.containers.enable = true;

From 93147b37a6b0e9c1978fdeeb26809506cbfb574d Mon Sep 17 00:00:00 2001
From: harry123 <harryh@ik.me>
Date: Wed, 2 Jul 2025 19:10:21 +0200
Subject: [PATCH 05/11] fixed port

---
 hosts/sisyphe/features/services/akkoma.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix
index 5f18279..8267fd2 100644
--- a/hosts/sisyphe/features/services/akkoma.nix
+++ b/hosts/sisyphe/features/services/akkoma.nix
@@ -23,7 +23,7 @@
 
     encode gzip
 
-    reverse_proxy :4004
+    reverse_proxy :4000
   '';
 
   services.caddy.virtualHosts."http://eepy.rougebordeaux.xyz".extraConfig = ''

From f1604be82971bb96166061c3cbf3771e32f694de Mon Sep 17 00:00:00 2001
From: harry123 <harryh@ik.me>
Date: Wed, 2 Jul 2025 19:10:30 +0200
Subject: [PATCH 06/11] added silly script

---
 home-manager/dotfiles/eepy_count.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 home-manager/dotfiles/eepy_count.sh

diff --git a/home-manager/dotfiles/eepy_count.sh b/home-manager/dotfiles/eepy_count.sh
new file mode 100644
index 0000000..f1f641a
--- /dev/null
+++ b/home-manager/dotfiles/eepy_count.sh
@@ -0,0 +1 @@
+#!/usr/bin/env bash

From fdee7b7cf367ea43c3c4501f251eb7532787d368 Mon Sep 17 00:00:00 2001
From: harry123 <harryh@ik.me>
Date: Wed, 2 Jul 2025 21:21:29 +0200
Subject: [PATCH 07/11] workstation client should have the default set of
 needed software

---
 hosts/workstation/configuration.nix           | 47 ++++++++++++-------
 .../workstation/features/hardware/default.nix |  3 ++
 .../workstation/features/hardware/nvidia.nix  | 13 +++++
 .../workstation/features/software/default.nix |  6 +++
 .../workstation/features/software/discord.nix | 22 +++++++++
 .../features/software/workstation.nix         |  4 --
 6 files changed, 75 insertions(+), 20 deletions(-)
 create mode 100644 hosts/workstation/features/hardware/default.nix
 create mode 100644 hosts/workstation/features/hardware/nvidia.nix
 create mode 100644 hosts/workstation/features/software/default.nix
 create mode 100644 hosts/workstation/features/software/discord.nix

diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix
index 0cc612b..1fd64c8 100644
--- a/hosts/workstation/configuration.nix
+++ b/hosts/workstation/configuration.nix
@@ -2,14 +2,20 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{inputs, config, pkgs, ... }:
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ../../shared/client/niri.nix
-      ./hardware-configuration.nix
-    ];
+  imports = [
+    # Include the results of the hardware scan.
+    ../../shared/client/niri.nix
+    ./hardware-configuration.nix
+    ./software
+  ];
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -18,7 +24,8 @@
   # Use latest kernel.
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  boot.initrd.luks.devices."luks-11a80280-8a8c-44c0-a8be-7ef370eb37ae".device = "/dev/disk/by-uuid/11a80280-8a8c-44c0-a8be-7ef370eb37ae";
+  boot.initrd.luks.devices."luks-11a80280-8a8c-44c0-a8be-7ef370eb37ae".device =
+    "/dev/disk/by-uuid/11a80280-8a8c-44c0-a8be-7ef370eb37ae";
   networking.hostName = "workstation"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
@@ -60,7 +67,13 @@
   users.users.misschloe777 = {
     isNormalUser = true;
     description = "misschloe777";
-    extraGroups = [ "networkmanager" "wheel" "audio" "video" "podman" ];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+      "audio"
+      "video"
+      "podman"
+    ];
     packages = with pkgs; [
       inputs.zen-browser.packages."${system}".default
     ];
@@ -77,8 +90,8 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #  wget
+    #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    #  wget
     wget
     dwl
     git
@@ -90,13 +103,16 @@
     udiskie
   ];
 
+  programs.zsh.enable = true;
+  environment.pathsToLink = [ "/share/zsh" ];
+
   # 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;
-  # };
+  programs.mtr.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
 
   # List services that you want to enable:
 
@@ -116,5 +132,4 @@
   # 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 = "25.05"; # Did you read the comment?
-
 }
diff --git a/hosts/workstation/features/hardware/default.nix b/hosts/workstation/features/hardware/default.nix
new file mode 100644
index 0000000..5f095c8
--- /dev/null
+++ b/hosts/workstation/features/hardware/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ./nvidia.nix ];
+}
diff --git a/hosts/workstation/features/hardware/nvidia.nix b/hosts/workstation/features/hardware/nvidia.nix
new file mode 100644
index 0000000..ade3976
--- /dev/null
+++ b/hosts/workstation/features/hardware/nvidia.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  boot.blacklistedKernelModules = [ "nouveau" ];
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [ nvidia-vaapi-driver ];
+  };
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.nvidia = {
+    open = false;
+  };
+}
diff --git a/hosts/workstation/features/software/default.nix b/hosts/workstation/features/software/default.nix
new file mode 100644
index 0000000..79b1345
--- /dev/null
+++ b/hosts/workstation/features/software/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./workstation.nix
+    ./discord.nix
+  ];
+}
diff --git a/hosts/workstation/features/software/discord.nix b/hosts/workstation/features/software/discord.nix
new file mode 100644
index 0000000..98b093b
--- /dev/null
+++ b/hosts/workstation/features/software/discord.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    (discord.override {
+      withVencord = true;
+    })
+    vesktop
+  ];
+  # screen record support
+  xdg = {
+    autostart.enable = true;
+    icons.enable = true;
+    portal = {
+      enable = true;
+      extraPortals = with pkgs; [
+        xdg-desktop-portal-wlr
+        xdg-desktop-portal-gtk
+      ];
+      wlr.enable = true;
+    };
+  };
+}
diff --git a/hosts/workstation/features/software/workstation.nix b/hosts/workstation/features/software/workstation.nix
index 9a6e73f..e079a7e 100644
--- a/hosts/workstation/features/software/workstation.nix
+++ b/hosts/workstation/features/software/workstation.nix
@@ -1,8 +1,5 @@
 { pkgs, lib, ... }:
 {
-  # for java development on vscode
-  programs.nix-ld.enable = true;
-
   nixpkgs.config.allowUnfreePredicate =
     pkg:
     builtins.elem (lib.getName pkg) [
@@ -23,7 +20,6 @@
     obs-studio
 
     gvfs
-
     nil
     bitwarden
   ];

From 64a306d83cb1791028f1c5c2adba4833d6e096e7 Mon Sep 17 00:00:00 2001
From: harry123 <harryh@ik.me>
Date: Wed, 2 Jul 2025 21:21:47 +0200
Subject: [PATCH 08/11] moved some useful options used by niri

---
 shared/client/niri.nix | 2 ++
 shared/zsh.nix         | 0
 2 files changed, 2 insertions(+)
 create mode 100644 shared/zsh.nix

diff --git a/shared/client/niri.nix b/shared/client/niri.nix
index 3612a03..01cadf4 100644
--- a/shared/client/niri.nix
+++ b/shared/client/niri.nix
@@ -36,7 +36,9 @@
   };
 
   services.displayManager.gdm.enable = true;
+  services.udisks2.enable = true;
 
+  security.pam.services.swaylock = { };
   security.pam.loginLimits = [
     {
       domain = "@users";
diff --git a/shared/zsh.nix b/shared/zsh.nix
new file mode 100644
index 0000000..e69de29

From 48c2b6f2076b1e8d3d92aff44980aa9d68c45e46 Mon Sep 17 00:00:00 2001
From: harry123 <harryh@ik.me>
Date: Wed, 2 Jul 2025 21:22:26 +0200
Subject: [PATCH 09/11] better software repartition

---
 flake.nix                                      | 10 +++++++++-
 home-manager/home.nix                          | 16 +++-------------
 hosts/goober/configuration.nix                 |  3 ++-
 hosts/goober/features/software/discord.nix     |  1 +
 hosts/goober/features/software/workstation.nix | 17 +++++++++++------
 5 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/flake.nix b/flake.nix
index 378cf2d..e6db417 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,9 +27,9 @@
           url = "git+https://git.rougebordeaux.xyz/harry123/nix-secrets-next.git";
           flake = false;
         };
-      miovim.url = "git+https://git.rougebordeaux.xyz/harry123/miovim.git";
     */
 
+    miovim.url = "git+https://git.rougebordeaux.xyz/harry123/miovim.git";
     nixos-generators = {
       url = "github:nix-community/nixos-generators";
       inputs.nixpkgs.follows = "nixpkgsUnstable";
@@ -110,6 +110,10 @@
                   ./home-manager/home.nix
                   catppuccin.homeModules.catppuccin
                 ];
+
+                home.packages = [
+                  inputs.miovim.packages.${system}.default
+                ];
               };
               home-manager.extraSpecialArgs = { inherit inputs; };
             }
@@ -132,6 +136,10 @@
                   ./home-manager/home.nix
                   catppuccin.homeModules.catppuccin
                 ];
+
+                home.packages = [
+                  inputs.miovim.packages.${system}.default
+                ];
               };
               home-manager.extraSpecialArgs = { inherit inputs; };
             }
diff --git a/home-manager/home.nix b/home-manager/home.nix
index e32d7a6..e0cdf77 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -22,11 +22,6 @@
   # The home.packages option allows you to install Nix packages into your
   # environment.
   home.packages = with pkgs; [
-    # # Adds the 'hello' command to your environment. It prints a friendly
-    # # "Hello, world!" when run.
-    # pkgs.hello
-
-    beeper
     nerd-fonts.code-new-roman
     ffmpegthumbnailer
     xfce.tumbler
@@ -38,24 +33,21 @@
     cava
     hyfetch
     kittysay
-    nextcloud-client
     thunderbird-bin
     feh
     waybar
     p7zip
+    tealdeer
 
     libreoffice-qt
-    tetrio-desktop
 
     playerctl
     wf-recorder
 
     file
-    osu-lazer-bin
 
     qbittorrent
 
-    i2pd
     ripgrep
     vscode
 
@@ -81,14 +73,12 @@
     unzip
     p7zip
 
-    libsixel
-    unzip
-    p7zip
-
     nixfmt-rfc-style
     fuzzel
     zsh-syntax-highlighting
 
+    dysk
+    rsync
     obsidian
     papirus-icon-theme
     # # You can also create simple shell scripts directly inside your
diff --git a/hosts/goober/configuration.nix b/hosts/goober/configuration.nix
index c3931e8..268c06c 100644
--- a/hosts/goober/configuration.nix
+++ b/hosts/goober/configuration.nix
@@ -5,6 +5,7 @@
 {
   config,
   lib,
+  username,
   pkgs,
   inputs,
   ...
@@ -78,7 +79,7 @@
   environment.pathsToLink = [ "/share/zsh" ];
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.harry123 = {
+  users.users.${username} = {
     isNormalUser = true;
     shell = pkgs.zsh;
     extraGroups = [
diff --git a/hosts/goober/features/software/discord.nix b/hosts/goober/features/software/discord.nix
index d157cfd..98b093b 100644
--- a/hosts/goober/features/software/discord.nix
+++ b/hosts/goober/features/software/discord.nix
@@ -4,6 +4,7 @@
     (discord.override {
       withVencord = true;
     })
+    vesktop
   ];
   # screen record support
   xdg = {
diff --git a/hosts/goober/features/software/workstation.nix b/hosts/goober/features/software/workstation.nix
index 92f4859..d19c321 100644
--- a/hosts/goober/features/software/workstation.nix
+++ b/hosts/goober/features/software/workstation.nix
@@ -35,6 +35,7 @@
     # 3d modeling
     blender
 
+    beeper
     signal-desktop
     gajim
     weechat
@@ -46,10 +47,10 @@
     nil
     jetbrains.idea-ultimate
 
-    why3
-    alt-ergo
-    cvc4
-    z3
+    # why3
+    # alt-ergo
+    # cvc4
+    # z3
     bitwarden
     kicad
     ente-auth
@@ -58,8 +59,12 @@
     revolt-desktop
     exactaudiocopy
     picard
-    dysk
-    rsync
+    nextcloud-client
+    i2pd
+
+    # games
+    tetrio-desktop
+    osu-lazer-bin
   ];
 
   virtualisation.containers.enable = true;

From 4908e6cf526d4822b728bf9f0873af0dee1e76e6 Mon Sep 17 00:00:00 2001
From: harry123 <harryh@ik.me>
Date: Wed, 2 Jul 2025 22:48:03 +0200
Subject: [PATCH 10/11] moved config around

- moved fuzzel config to the nix file rather than editing it in a
specific file
- added fzf zsh support
---
 home-manager/home.nix               | 30 ++++++++++++++++++++++++++++-
 hosts/workstation/configuration.nix |  3 ++-
 shared/default.nix                  |  4 ++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index e0cdf77..b34c5a9 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -70,6 +70,7 @@
     audacious-plugins
 
     libsixel
+    libnotify
     unzip
     p7zip
 
@@ -103,7 +104,6 @@
     ".bashrc".source = dotfiles/bash/.bashrc;
     ".config/hyfetch.json".source = dotfiles/hyfetch/hyfetch.json;
     ".config/niri".source = dotfiles/niri;
-    ".config/fuzzel/fuzzel.ini".source = dotfiles/fuzzel/fuzzel.ini;
     ".config/mako".source = dotfiles/mako;
 
     # # You can also set the file content immediately.
@@ -127,6 +127,34 @@
     "--cmd cd"
   ];
 
+  programs.fuzzel = {
+    enable = true;
+    settings = {
+      main = {
+        match-mode = "fzf";
+      };
+      colors = {
+        background = "eff1f5dd";
+        text = "4c4f69ff";
+        prompt = "5c5f77ff";
+        placeholder = "8c8fa1ff";
+        input = "4c4f69ff";
+        match = "d20f39ff";
+        selection = "acb0beff";
+        selection-text = "4c4f69ff";
+        selection-match = "d20f39ff";
+        counter = "8c8fa1ff";
+        border = "d20f39ff";
+      };
+      border.radius = 0;
+    };
+  };
+
+  programs.fzf = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+
   services.mpris-proxy.enable = true;
 
   services.udiskie = {
diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix
index 1fd64c8..4ed093d 100644
--- a/hosts/workstation/configuration.nix
+++ b/hosts/workstation/configuration.nix
@@ -12,8 +12,9 @@
 {
   imports = [
     # Include the results of the hardware scan.
-    ../../shared/client/niri.nix
     ./hardware-configuration.nix
+    ../../shared/client/niri.nix
+    ../../shared
     ./software
   ];
 
diff --git a/shared/default.nix b/shared/default.nix
index cf77c51..3ec08ae 100644
--- a/shared/default.nix
+++ b/shared/default.nix
@@ -17,9 +17,11 @@
     pkgs.foot.terminfo
     pkgs.kittysay
     pkgs.tmux
+    pkgs.fzf
   ];
 
   environment.variables.EDITOR = "nvim";
+  programs.fzf.fuzzyCompletion = true;
 
   nix.settings.experimental-features = [
     "nix-command"
@@ -31,8 +33,6 @@
     keyMap = "fr";
   };
 
-  services.tailscale.enable = true;
-
   # Set your time zone.
   time.timeZone = lib.mkDefault "Europe/Paris";
   i18n.defaultLocale = "fr_FR.UTF-8";

From 92841387afc1710295e73084a1e8faa69ed170fd Mon Sep 17 00:00:00 2001
From: harry123 <harryh@ik.me>
Date: Wed, 2 Jul 2025 22:48:13 +0200
Subject: [PATCH 11/11] removed default comments

---
 hosts/goober/configuration.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/hosts/goober/configuration.nix b/hosts/goober/configuration.nix
index 268c06c..4197396 100644
--- a/hosts/goober/configuration.nix
+++ b/hosts/goober/configuration.nix
@@ -131,17 +131,6 @@
     options = "--delete-older-than 10d";
   };
 
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
   # This option defines the first version of NixOS you have installed on this particular machine,
   # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
   #