feat: adapt home config to current work

dotfiles/niri/config.kdl

@@ -0,0 +1,257 @@
+input {
+    keyboard {
+      repeat-rate 30
+      repeat-delay 250
+        xkb {
+            layout "us_intl,us"
+            options "grp:win_space_toggle"
+        }
+        numlock
+    }
+    touchpad {
+        tap
+    }
+
+    mouse {
+    }
+
+    trackpoint {
+        off
+    }
+    focus-follows-mouse max-scroll-amount="0%"
+}
+
+output "eDP-1" {
+    mode "1920x1080"
+    scale 1
+    transform "normal"
+    position x=0 y=0
+}
+
+output "HDMI-A-1" {
+  mode "1920x1080@60"
+  position x=1920 y=0
+}
+
+output "DP-1" {
+  mode "1920x1080@60"
+  position x=3840 y=0
+}
+
+layout {
+    gaps 12
+    center-focused-column "never"
+    preset-column-widths {
+        proportion 0.33333
+        proportion 0.5
+        proportion 0.66667
+    }
+    default-column-width { proportion 0.5; }
+    focus-ring {
+        width 2
+        active-color "#7fc8ff"
+        inactive-color "#505050"
+    }
+    border {
+        off
+        width 2
+        active-color "#ffc87f"
+        inactive-color "#505050"
+        urgent-color "#9b0000"
+    }
+    shadow {
+        softness 30
+        spread 5
+        offset x=0 y=5
+        color "#0007"
+    }
+    struts {
+    }
+}
+
+spawn-at-startup "waybar"
+spawn-at-startup "slack"
+spawn-at-startup "noctalia-shell"
+spawn-sh-at-startup "dbus-update-activation-environment --systemd --all"
+spawn-sh-at-startup "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
+
+environment {
+    QT_QPA_PLATFORM "wayland"
+    XDG_CURRENT_DESKTOP "Niri"
+    XDG_SESSION_TYPE "wayland"
+    MOZ_ENABLE_WAYLAND "1"
+}
+
+hotkey-overlay {
+    // skip-at-startup
+}
+
+prefer-no-csd
+
+screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
+
+animations {
+}
+window-rule {
+    match app-id=r#"^org\.wezfurlong\.wezterm$"#
+    default-column-width {}
+}
+
+window-rule {
+    match app-id=r#"firefox$"# title="^Picture-in-Picture$"
+    open-floating true
+}
+/-window-rule {
+    match app-id=r#"^org\.keepassxc\.KeePassXC$"#
+    match app-id=r#"^org\.gnome\.World\.Secrets$"#
+
+    block-out-from "screen-capture"
+}
+
+window-rule {
+    geometry-corner-radius 6
+    clip-to-geometry true
+}
+
+binds {
+    Mod+Shift+Slash { show-hotkey-overlay; }
+
+    Mod+Return hotkey-overlay-title="Open a Terminal" { spawn "alacritty"; }
+    Mod+D hotkey-overlay-title="Run an Application" { spawn-sh "noctalia-shell ipc call launcher toggle"; } // rofi -show drun  // fuzzel
+    Mod+Alt+L hotkey-overlay-title="Lock the Screen" { spawn-sh "noctalia-shell ipc call sessionMenu lockAndSuspend"; } // swaylock
+
+    XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+"; }
+    XF86AudioLowerVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-"; }
+    XF86AudioMute        allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; }
+    XF86AudioMicMute     allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; }
+
+    XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "+10%"; }
+    XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "10%-"; }
+
+    Mod+O repeat=false { toggle-overview; }
+    Mod+Q repeat=false { close-window; }
+
+    Mod+Left  { focus-column-left; }
+    Mod+Down  { focus-window-down; }
+    Mod+Up    { focus-window-up; }
+    Mod+Right { focus-column-right; }
+    Mod+H     { focus-column-left; }
+    Mod+J     { focus-window-down; }
+    Mod+K     { focus-window-up; }
+    Mod+L     { focus-column-right; }
+
+    Mod+Ctrl+Left  { move-column-left; }
+    Mod+Ctrl+Down  { move-window-down; }
+    Mod+Ctrl+Up    { move-window-up; }
+    Mod+Ctrl+Right { move-column-right; }
+    Mod+Ctrl+H     { move-column-left; }
+    Mod+Ctrl+J     { move-window-down; }
+    Mod+Ctrl+K     { move-window-up; }
+    Mod+Ctrl+L     { move-column-right; }
+
+    Mod+Home { focus-column-first; }
+    Mod+End  { focus-column-last; }
+    Mod+Ctrl+Home { move-column-to-first; }
+    Mod+Ctrl+End  { move-column-to-last; }
+
+    Mod+Shift+Left  { focus-monitor-left; }
+    Mod+Shift+Down  { focus-monitor-down; }
+    Mod+Shift+Up    { focus-monitor-up; }
+    Mod+Shift+Right { focus-monitor-right; }
+    Mod+Shift+H     { focus-monitor-left; }
+    Mod+Shift+J     { focus-monitor-down; }
+    Mod+Shift+K     { focus-monitor-up; }
+    Mod+Shift+L     { focus-monitor-right; }
+
+    Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
+    Mod+Shift+Ctrl+H     { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+J     { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+K     { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+L     { move-column-to-monitor-right; }
+
+    Mod+Page_Down      { focus-workspace-down; }
+    Mod+Page_Up        { focus-workspace-up; }
+    Mod+U              { focus-workspace-down; }
+    Mod+I              { focus-workspace-up; }
+    Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
+    Mod+Ctrl+Page_Up   { move-column-to-workspace-up; }
+    Mod+Ctrl+U         { move-column-to-workspace-down; }
+    Mod+Ctrl+I         { move-column-to-workspace-up; }
+
+    Mod+Shift+Page_Down { move-workspace-down; }
+    Mod+Shift+Page_Up   { move-workspace-up; }
+    Mod+Shift+U         { move-workspace-down; }
+    Mod+Shift+I         { move-workspace-up; }
+
+    Mod+WheelScrollDown      cooldown-ms=150 { focus-workspace-down; }
+    Mod+WheelScrollUp        cooldown-ms=150 { focus-workspace-up; }
+    Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; }
+    Mod+Ctrl+WheelScrollUp   cooldown-ms=150 { move-column-to-workspace-up; }
+
+    Mod+WheelScrollRight      { focus-column-right; }
+    Mod+WheelScrollLeft       { focus-column-left; }
+    Mod+Ctrl+WheelScrollRight { move-column-right; }
+    Mod+Ctrl+WheelScrollLeft  { move-column-left; }
+
+    Mod+Shift+WheelScrollDown      { focus-column-right; }
+    Mod+Shift+WheelScrollUp        { focus-column-left; }
+    Mod+Ctrl+Shift+WheelScrollDown { move-column-right; }
+    Mod+Ctrl+Shift+WheelScrollUp   { move-column-left; }
+
+    Mod+1 { focus-workspace 1; }
+    Mod+2 { focus-workspace 2; }
+    Mod+3 { focus-workspace 3; }
+    Mod+4 { focus-workspace 4; }
+    Mod+5 { focus-workspace 5; }
+    Mod+6 { focus-workspace 6; }
+    Mod+7 { focus-workspace 7; }
+    Mod+8 { focus-workspace 8; }
+    Mod+9 { focus-workspace 9; }
+    Mod+Shift+1 { move-column-to-workspace 1; }
+    Mod+Shift+2 { move-column-to-workspace 2; }
+    Mod+Shift+3 { move-column-to-workspace 3; }
+    Mod+Shift+4 { move-column-to-workspace 4; }
+    Mod+Shift+5 { move-column-to-workspace 5; }
+    Mod+Shift+6 { move-column-to-workspace 6; }
+    Mod+Shift+7 { move-column-to-workspace 7; }
+    Mod+Shift+8 { move-column-to-workspace 8; }
+    Mod+Shift+9 { move-column-to-workspace 9; }
+
+    Mod+BracketLeft  { consume-or-expel-window-left; }
+    Mod+BracketRight { consume-or-expel-window-right; }
+
+    Mod+Comma  { consume-window-into-column; }
+    Mod+Period { expel-window-from-column; }
+
+    Mod+R { switch-preset-column-width; }
+    Mod+Shift+R { switch-preset-window-height; }
+    Mod+Ctrl+R { reset-window-height; }
+    Mod+F { maximize-column; }
+    Mod+Shift+F { fullscreen-window; }
+
+    Mod+Ctrl+F { expand-column-to-available-width; }
+    Mod+C { center-column; }
+    Mod+Ctrl+C { center-visible-columns; }
+
+    Mod+Minus { set-column-width "-10%"; }
+    Mod+Equal { set-column-width "+10%"; }
+    Mod+Shift+Minus { set-window-height "-10%"; }
+    Mod+Shift+Equal { set-window-height "+10%"; }
+    Mod+V       { toggle-window-floating; }
+    Mod+Shift+V { switch-focus-between-floating-and-tiling; }
+    Mod+W { toggle-column-tabbed-display; }
+
+    Mod+A { screenshot; }
+    Mod+Shift+A { screenshot-screen; }
+    Mod+Ctrl+A { screenshot-window; }
+
+    Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
+
+    Mod+Shift+E { quit; }
+    Ctrl+Alt+Delete { quit; }
+
+    Mod+Shift+P { power-off-monitors; }
+}

flake.lock

@@ -61,11 +61,11 @@
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1752979451,
+        "lastModified": 1760703920,
-        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
         "owner": "tinted-theming",
         "repo": "base16-helix",
-        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
         "type": "github"
       },
       "original": {
@@ -155,11 +155,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763651264,
+        "lastModified": 1764627417,
-        "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=",
+        "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "e86a89079587497174ccab6d0d142a65811a4fd9",
+        "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3",
         "type": "github"
       },
       "original": {
@@ -171,11 +171,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1758112371,
+        "lastModified": 1764724327,
-        "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
+        "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
+        "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
         "type": "github"
       },
       "original": {
@@ -229,11 +229,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756770412,
+        "lastModified": 1763759067,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
         "type": "github"
       },
       "original": {
@@ -306,11 +306,11 @@
       "flake": false,
       "locked": {
         "host": "gitlab.gnome.org",
-        "lastModified": 1762869044,
+        "lastModified": 1764524476,
-        "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
+        "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
+        "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
         "type": "gitlab"
       },
       "original": {
@@ -349,11 +349,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1763992752,
+        "lastModified": 1764865999,
-        "narHash": "sha256-iinKiBTAx7F9EkMqKFSqaWTCaay463toAPtQiA8RRyc=",
+        "narHash": "sha256-NqCzP0XJQqMih88AUQK215URHdTHktmi/P2dKXYfn1c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "55af952c5612190c3e7862f4e2504048c50841aa",
+        "rev": "9379fbf4f53f04cd9f8cae9b5f4a25ce5aa29b5f",
         "type": "github"
       },
       "original": {
@@ -445,11 +445,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1763835633,
+        "lastModified": 1764667669,
-        "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=",
+        "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "050e09e091117c3d7328c7b2b7b577492c43c134",
+        "rev": "418468ac9527e799809c900eda37cbff999199b6",
         "type": "github"
       },
       "original": {
@@ -466,11 +466,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764014382,
+        "lastModified": 1764858564,
-        "narHash": "sha256-yR8z0fgCxru7JWBNq8j3jC+LPxz6IqZuYqboSyaH2Lg=",
+        "narHash": "sha256-RsczfrFdLI49umnF0G8wYoCDo5YEzCKCnTrOOr48mXM=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "3cf4e1f95b6628d2985e3b890bd7cc1f9f1baa5b",
+        "rev": "cf5fed24b2fda1b088a54147afe66246ffa7427e",
         "type": "github"
       },
       "original": {
@@ -491,11 +491,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758998580,
+        "lastModified": 1764773531,
-        "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
+        "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
+        "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
         "type": "github"
       },
       "original": {
@@ -537,11 +537,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1763845141,
+        "lastModified": 1764860352,
-        "narHash": "sha256-o8TKdZluj/yC8qPIVNe2g4qopyFmQglH52+lvQx82kE=",
+        "narHash": "sha256-bWrh2T6EPiiZC7jY0jK5cWRwkG0hltnPT1etfHIHiXM=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "adc650610085adbe130b9860d5bdb869f96050af",
+        "rev": "61a01b75f0a7e58dac486ddf022c628a71528399",
         "type": "github"
       },
       "original": {
@@ -631,11 +631,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1757716333,
+        "lastModified": 1763914658,
-        "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
+        "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
+        "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
         "type": "github"
       },
       "original": {
@@ -647,11 +647,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1757811970,
+        "lastModified": 1764465359,
-        "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
+        "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
+        "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
         "type": "github"
       },
       "original": {
@@ -663,11 +663,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1757811247,
+        "lastModified": 1764464512,
-        "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
+        "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
+        "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
         "type": "github"
       },
       "original": {

hosts/home/configuration.nix

@@ -22,6 +22,13 @@
     #   useTmpfs = false;
     #   tmpfsSize = "30%";
     # };
+    initrd.kernelModules = [ "amdgpu" ];
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernelModules = [
+      "coretemp"
+      "cpuid"
+    ];
+    plymouth.enable = true;
   };
 
   fileSystems."/mnt/apps" = {
@@ -102,7 +109,10 @@
 
   hardware = {
     sane.enable = true;
-    graphics.enable = true;
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+    };
     bluetooth.enable = true;
     bluetooth.powerOnBoot = true;
   };
@@ -113,25 +123,25 @@
       DIRENV_LOG_FORMAT = "";
     };
     systemPackages = with pkgs; [
+      pavucontrol
       vial
+      xwayland-satellite
+      clinfo
+      gcc
     ];
   };
 
+  programs = {
+    niri.enable = true;
+  };
+
   security = {
     rtkit.enable = true;
-    sudo.extraRules = [
+    sudo.wheelNeedsPassword = false;
-      {
-        users = [ "yoru" ];
-        commands = [
-          {
-            command = "ALL";
-            options = [ "NOPASSWD" ];
-          }
-        ];
-      }
-    ];
   };
-
+  systemd.tmpfiles.rules = [
+    "L+    /opt/rocm/hip   -    -    -     -    ${pkgs.rocmPackages.clr}"
+  ];
   services = {
     udev.packages = with pkgs; [
       vial
@@ -149,6 +159,7 @@
       layout = "us";
       variant = "altgr-intl";
     };
+    xserver.videoDrivers = [ "amdgpu" ];
     blueman.enable = true;
     printing.enable = true;
     avahi = {
@@ -162,78 +173,17 @@
       alsa.support32Bit = true;
       pulse.enable = true;
     };
-    firefly-iii-data-importer = {
-      enable = true;
-      enableNginx = true;
-      settings = {
-        FIREFLY_III_URL_FILE = "/home/yoru/.firefly-url.txt";
-        VANITY_URL_FILE = "/home/yoru/.firefly-vanity-url.txt";
-        FIREFLY_III_CLIENT_ID = 2;
-      };
-    };
-    # my modules
-    cli-environment.enable = true;
-    desktop-apps.enable = true;
-    dev-environment.enable = true;
-    gaming.enable = true;
-    fonts.enable = true;
-    window-manager.enable = true;
   };
 
-  users.users.yoru = {
+  myNixOS = {
-    shell = pkgs.fish;
+    home-users = {
-    isNormalUser = true;
+      "yoru" = {
-    description = "Yoru";
+        userConfig = ./home.nix;
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-      "scanner"
-      "lp"
-      "docker"
-      "cdrom"
-    ];
-  };
-  home-manager = {
-    extraSpecialArgs = { inherit inputs; };
-    users = {
-      "yoru" = import ./home.nix;
-    };
-  };
-
-  stylix = {
-    enable = true;
-    image = ../../wall.jpg;
-    polarity = "dark";
-    opacity.terminal = 0.9;
-    cursor.package = pkgs.bibata-cursors;
-    cursor.name = "Bibata-Modern-Ice";
-    cursor.size = 24;
-    fonts = {
-      monospace = {
-        package = pkgs.nerd-fonts.jetbrains-mono;
-        name = "JetBrainsMono Nerd Font Mono";
-      };
-      sansSerif = {
-        package = pkgs.montserrat;
-        name = "Montserrat";
-      };
-      serif = {
-        package = pkgs.montserrat;
-        name = "Montserrat";
-      };
-      sizes = {
-        applications = 12;
-        terminal = 12;
-        desktop = 11;
-        popups = 12;
       };
     };
-  };
+    archetype.general.enable = true;
-  virtualisation.podman = {
+    feature.fonts.enable = true;
-    enable = true;
+    feature.virtualisation.enable = true;
-    autoPrune.enable = true;
-    dockerCompat = true;
-    dockerSocket.enable = true;
   };
 
   system.stateVersion = "24.05";

hosts/home/home.nix

@@ -1,47 +1,64 @@
 {
-  config,
+  inputs,
   pkgs,
-  lib,
-  nixpkgs,
-  outputs,
   ...
 }:
-
 {
-  home.username = "yoru";
-  home.homeDirectory = "/home/yoru";
-
   imports = [
-    ../../modules/home-manager/dotfiles.nix
+    inputs.noctalia.homeModules.default
-    ../../modules/home-manager/helix.nix
-    ../../modules/home-manager/waybar.nix
-    ../../modules/home-manager/shell.nix
-    ../../modules/home-manager/kitty.nix
   ];
 
-  myHome.dotfiles.enable = true;
+  myHome = {
-  myHome.helix.enable = true;
+    services.nix.enable = true;
-  myHome.waybar.enable = true;
+    bundle.work-apps.enable = false;
-  myHome.kitty.enable = true;
+    bundle.myhypr.enable = false;
-  myHome.shell.enable = true;
+    bundle.desktop-apps.enable = true;
+    bundle.shell.enable = true;
+    programs.creativity = {
+      drawing.enable = true;
+      printing.enable = true;
+      gamedev.enable = true;
+      sound.enable = true;
+    };
+  };
 
-  home.file.".config/swappy/config".text = ''
+  home = {
-    [Default]
+    username = "yoru";
-    save_dir=/home/yoru/Pictures/Screenshots
+    homeDirectory = "/home/yoru";
-    save_filename_format=swappy-%Y%m%d-%H%M%S.png
+    shell.enableFishIntegration = true;
-    show_panel=false
+  };
-    line_size=5
-    text_size=20
-    text_font=Ubuntu
-    paint_mode=brush
-    early_exit=true
-    fill_shape=false
-  '';
 
-  home.packages = [
+  # imports = [
-    (import ../../scripts/screenshot.nix { inherit pkgs; })
+  #   ../../modules/home-manager/dotfiles.nix
-    (import ../../scripts/rainbow-border.nix { inherit pkgs; })
+  #   ../../modules/home-manager/helix.nix
-  ];
+  #   ../../modules/home-manager/waybar.nix
+  #   ../../modules/home-manager/shell.nix
+  #   ../../modules/home-manager/kitty.nix
+  # ];
+  #
+  # myHome.dotfiles.enable = true;
+  # myHome.helix.enable = true;
+  # myHome.waybar.enable = true;
+  # myHome.kitty.enable = true;
+  # myHome.shell.enable = true;
+
+  # home.file.".config/swappy/config".text = ''
+  #   [Default]
+  #   save_dir=/home/yoru/Pictures/Screenshots
+  #   save_filename_format=swappy-%Y%m%d-%H%M%S.png
+  #   show_panel=false
+  #   line_size=5
+  #   text_size=20
+  #   text_font=Ubuntu
+  #   paint_mode=brush
+  #   early_exit=true
+  #   fill_shape=false
+  # '';
+  #
+  # home.packages = [
+  #   (import ../../scripts/screenshot.nix { inherit pkgs; })
+  #   (import ../../scripts/rainbow-border.nix { inherit pkgs; })
+  # ];
 
   # stylix.targets = {
   #   waybar.enable = false;
@@ -49,44 +66,44 @@
   #   hyprland.enable = false;
   # };
 
-  gtk = {
+  # gtk = {
-    iconTheme = {
+  #   iconTheme = {
-      name = "Papirus-Dark";
+  #     name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
+  #     package = pkgs.papirus-icon-theme;
-    };
+  #   };
-    gtk3.extraConfig = {
+  #   gtk3.extraConfig = {
-      gtk-application-prefer-dark-theme = 1;
+  #     gtk-application-prefer-dark-theme = 1;
-    };
+  #   };
-    gtk4.extraConfig = {
+  #   gtk4.extraConfig = {
-      gtk-application-prefer-dark-theme = 1;
+  #     gtk-application-prefer-dark-theme = 1;
-    };
+  #   };
-  };
+  # };
+  #
+  # services = {
+  #   hypridle = {
+  #     enable = true;
+  #     settings = {
+  #       general = {
+  #         after_sleep_cmd = "hyprctl dispatch dpms on";
+  #         ignore_dbus_inhibit = false;
+  #         lock_cmd = "hyprlock";
+  #       };
+  #       listener = [
+  #         {
+  #           timeout = 900;
+  #           on-timeout = "hyprlock";
+  #         }
+  #         {
+  #           timeout = 1200;
+  #           on-timeout = "hyprctl dispatch dpms off";
+  #           on-resume = "hyprctl dispatch dpms on";
+  #         }
+  #       ];
+  #     };
+  #   };
+  # };
 
-  services = {
+  # nixpkgs.config.allowUnfree = true;
-    hypridle = {
-      enable = true;
-      settings = {
-        general = {
-          after_sleep_cmd = "hyprctl dispatch dpms on";
-          ignore_dbus_inhibit = false;
-          lock_cmd = "hyprlock";
-        };
-        listener = [
-          {
-            timeout = 900;
-            on-timeout = "hyprlock";
-          }
-          {
-            timeout = 1200;
-            on-timeout = "hyprctl dispatch dpms off";
-            on-resume = "hyprctl dispatch dpms on";
-          }
-        ];
-      };
-    };
-  };
-
-  nixpkgs.config.allowUnfree = true;
   programs = {
     gh.enable = true;
     btop = {
@@ -95,18 +112,40 @@
         vim_keys = true;
       };
     };
-    home-manager.enable = true;
+    firefox.enable = true;
-    hyprlock = {
+    git = {
-      enable = true;
+      settings.user = {
-      settings = {
+        name = "Xavier Morel";
-        general = {
+        email = "morelx42@gmail.com";
-          disable_loading_bar = true;
-          grace = 10;
-          hide_cursor = true;
-          no_fade_in = false;
-        };
       };
     };
+    home-manager.enable = true;
+    rofi.enable = true;
+    noctalia-shell.enable = true;
+    quickshell.enable = true;
+    alacritty.enable = true;
+    # hyprlock = {
+    #   enable = true;
+    #   settings = {
+    #     general = {
+    #       disable_loading_bar = true;
+    #       grace = 10;
+    #       hide_cursor = true;
+    #       no_fade_in = false;
+    #     };
+    #   };
+    # };
+  };
+  xdg.portal = {
+    enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-gtk
+      pkgs.xdg-desktop-portal
+    ];
+    configPackages = [
+      pkgs.xdg-desktop-portal-gtk
+      pkgs.xdg-desktop-portal
+    ];
   };
   home.stateVersion = "23.11";
 }

hosts/work/configuration.nix

@@ -41,12 +41,12 @@
     initrd.kernelModules = [ "amdgpu" ];
     plymouth.enable = true;
   };
-  programs.obs-studio = {
-    enable = true;
-    plugins = [ pkgs.obs-studio-plugins.wlrobs ];
-  };
   programs = {
     niri.enable = true; # test...
+    obs-studio = {
+      enable = true;
+      plugins = [ pkgs.obs-studio-plugins.wlrobs ];
+    };
     # xwayland.enable = true;
   };
   hardware = {
@@ -72,6 +72,7 @@
     tailscale.useRoutingFeatures = "client";
   };
   environment.systemPackages = [
+    pkgs.cachix
     pkgs.pavucontrol
     pkgs.swaylock
     pkgs.xwayland-satellite

hosts/work/home.nix

@@ -26,15 +26,16 @@
     homeDirectory = "/home/xmorel";
     shell.enableFishIntegration = true;
     stateVersion = "23.11";
+    file.".config/niri/config.kdl".source = ../../dotfiles/niri/config.kdl;
   };
-  programs.git = {
-    settings.user = {
-      name = "Xavier Morel";
-      email = "morelx42@gmail.com";
-    };
-  };
-  programs.home-manager.enable = true;
   programs = {
+    git = {
+      settings.user = {
+        name = "Xavier Morel";
+        email = "morelx42@gmail.com";
+      };
+    };
+    home-manager.enable = true;
     rofi.enable = true;
     noctalia-shell.enable = true;
     quickshell.enable = true;
@@ -48,7 +49,6 @@
     ];
     configPackages = [
       pkgs.xdg-desktop-portal-gtk
-      pkgs.xdg-desktop-portal-hyprland
       pkgs.xdg-desktop-portal
     ];
   };

modules/home-manager/bundles/shell.nix

@@ -38,7 +38,11 @@
         enable = true;
         settings.vim_keys = true;
       };
-      direnv.enable = true;
+      direnv = {
+        enable = true;
+        nix-direnv.enable = true;
+        silent = true;
+      };
       eza = {
         enable = true;
         extraOptions = [ "--group-directories-first" ];

modules/nixos/home-manager.nix

@@ -61,6 +61,8 @@ in
           "lp"
           "wireshark"
           "dialout" # serial port access
+          "scanner"
+          "cdrom"
         ];
       }
       // user.userNixosSettings