diff --git a/dotfiles/hypr/.luarc.json b/dotfiles/hypr/.luarc.json index 90b46ec..16541f8 120000 --- a/dotfiles/hypr/.luarc.json +++ b/dotfiles/hypr/.luarc.json @@ -1 +1 @@ -/nix/store/m7baqiydal7zmd55ki3lbh7qqc8xr0ms-home-manager-files/.config/hypr/.luarc.json \ No newline at end of file +/nix/store/yaksysd8kvxqwyv04sd4g97la1sh762c-home-manager-files/.config/hypr/.luarc.json \ No newline at end of file diff --git a/dotfiles/hypr/conf/binding.lua b/dotfiles/hypr/conf/binding.lua index 267aaba..ad4063f 100644 --- a/dotfiles/hypr/conf/binding.lua +++ b/dotfiles/hypr/conf/binding.lua @@ -1,8 +1,7 @@ -- shutdown hyprland and lock hl.bind( "CTRL + ALT + M", - hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch exit"), - { description = "hyprland shutdown" } + hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'") ) hl.bind("CTRL + ALT + L", hl.dsp.exec_cmd(lockscreen)) -- launchers diff --git a/dotfiles/hypr/hyprland.lua b/dotfiles/hypr/hyprland.lua index 99f0bf8..afe63b4 120000 --- a/dotfiles/hypr/hyprland.lua +++ b/dotfiles/hypr/hyprland.lua @@ -1 +1 @@ -/nix/store/m7baqiydal7zmd55ki3lbh7qqc8xr0ms-home-manager-files/.config/hypr/hyprland.lua \ No newline at end of file +/nix/store/yaksysd8kvxqwyv04sd4g97la1sh762c-home-manager-files/.config/hypr/hyprland.lua \ No newline at end of file diff --git a/dotfiles/inkscape/palettes b/dotfiles/inkscape/palettes index f43950b..ce3edd8 120000 --- a/dotfiles/inkscape/palettes +++ b/dotfiles/inkscape/palettes @@ -1 +1 @@ -/nix/store/m7baqiydal7zmd55ki3lbh7qqc8xr0ms-home-manager-files/.config/inkscape/palettes \ No newline at end of file +/nix/store/yaksysd8kvxqwyv04sd4g97la1sh762c-home-manager-files/.config/inkscape/palettes \ No newline at end of file diff --git a/dotfiles/inkscape/templates b/dotfiles/inkscape/templates index 51c44f1..24055d5 120000 --- a/dotfiles/inkscape/templates +++ b/dotfiles/inkscape/templates @@ -1 +1 @@ -/nix/store/m7baqiydal7zmd55ki3lbh7qqc8xr0ms-home-manager-files/.config/inkscape/templates \ No newline at end of file +/nix/store/yaksysd8kvxqwyv04sd4g97la1sh762c-home-manager-files/.config/inkscape/templates \ No newline at end of file diff --git a/dotfiles/kitty/kitty.conf b/dotfiles/kitty/kitty.conf index 0ab59d4..46dc004 120000 --- a/dotfiles/kitty/kitty.conf +++ b/dotfiles/kitty/kitty.conf @@ -1 +1 @@ -/nix/store/m7baqiydal7zmd55ki3lbh7qqc8xr0ms-home-manager-files/.config/kitty/kitty.conf \ No newline at end of file +/nix/store/yaksysd8kvxqwyv04sd4g97la1sh762c-home-manager-files/.config/kitty/kitty.conf \ No newline at end of file diff --git a/flake.lock b/flake.lock index ad96d33..3c6c14b 100644 --- a/flake.lock +++ b/flake.lock @@ -336,11 +336,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1786128941, - "narHash": "sha256-xjrN7ziovhkScO/neQAg8g7Wkl1wmf9YcL6+wMlDYPw=", + "lastModified": 1786144742, + "narHash": "sha256-ROqWcNC1qYU2p0EY1d9BHnZbcl0ZDaCmXtojENSqL18=", "owner": "danth", "repo": "stylix", - "rev": "ce31340522e54e072cb3504ba082f1ecdde47639", + "rev": "d18ba6834c7f1141429b6d4cf148fff6c8c41139", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1786118193, - "narHash": "sha256-RhkiElXANPrHOXTncgUmKHVw8FHuRZjAXmtUPQfB91c=", + "lastModified": 1786171986, + "narHash": "sha256-kvmCZLYbByuE+zskqtf5+UPGrFI8e8KspB8jVey0nj0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "43272965c62be2c512630bc80deeb6792b2f285b", + "rev": "f3a721857afb4c34f687390213e0bc034d8e4999", "type": "github" }, "original": { diff --git a/home/afoucaultc/home-laptop.nix b/home/afoucaultc/home-laptop.nix index 63f4697..c2b10ff 100644 --- a/home/afoucaultc/home-laptop.nix +++ b/home/afoucaultc/home-laptop.nix @@ -6,25 +6,8 @@ imports = [ # fichier individuel dans packages = programs.xyz existant # sinon, dans other_apps* - ./packages/btop.nix - ./packages/firefox.nix - ./packages/git.nix - ./packages/security.nix - ./packages/hyprland.nix - ./packages/kitty.nix - ./packages/mpv.nix - ./packages/neovim.nix - ./packages/niri/niri.nix - ./packages/nextcloud.nix ./packages/other_apps_light.nix - ./packages/mako.nix - ./packages/python.nix - ./packages/texlive.nix - ./packages/thunderbird.nix - ./packages/tmux.nix - ./packages/zathura.nix - ./packages/zen.nix - ./packages/zsh.nix + ./shared.nix # dotfiles links ./dotfiles_apps.nix ]; diff --git a/home/afoucaultc/home.nix b/home/afoucaultc/home.nix index 1cc991c..c2bd0be 100644 --- a/home/afoucaultc/home.nix +++ b/home/afoucaultc/home.nix @@ -6,27 +6,9 @@ imports = [ # fichier individuel dans packages = programs.xyz existant # sinon, dans other_apps* - ./packages/btop.nix - ./packages/firefox.nix - ./packages/git.nix - ./packages/security.nix - ./packages/hyprland.nix - ./packages/kitty.nix - ./packages/mpv.nix - #./packages/music.nix - ./packages/neovim.nix - ./packages/niri/niri.nix - ./packages/nextcloud.nix ./packages/obs.nix ./packages/other_apps.nix - ./packages/mako.nix - ./packages/python.nix - ./packages/texlive.nix - ./packages/thunderbird.nix - ./packages/tmux.nix - ./packages/zathura.nix - ./packages/zen.nix - ./packages/zsh.nix + ./shared.nix # dotfiles links ./dotfiles_apps.nix ]; diff --git a/home/afoucaultc/packages/niri/conf/keybind.nix b/home/afoucaultc/packages/niri/conf/keybind.nix index 1745001..ba33e87 100644 --- a/home/afoucaultc/packages/niri/conf/keybind.nix +++ b/home/afoucaultc/packages/niri/conf/keybind.nix @@ -131,5 +131,8 @@ "Alt+Tab".action.toggle-overview = { }; # Quitter niri "Ctrl+Alt+M".action.quit = { }; + + # workspaces + }; } diff --git a/home/afoucaultc/packages/niri/conf/workspaces.nix b/home/afoucaultc/packages/niri/conf/workspaces.nix index 946cbe5..acfe2a9 100644 --- a/home/afoucaultc/packages/niri/conf/workspaces.nix +++ b/home/afoucaultc/packages/niri/conf/workspaces.nix @@ -1,15 +1,80 @@ -{ ... }: +{ config, ... }: { - programs.niri.settings.workspaces = { - "1" = { - name = "web"; - open-on-output = "eDP-1"; + programs.niri.settings = { + workspaces = { + "1" = { + name = "web"; + open-on-output = "eDP-1"; + }; + "2" = { + name = "latex"; + }; + "3" = { + name = "games"; + }; + "4" = { + name = "discord"; + }; }; - "2" = { - name = "code"; - }; - "3" = { - name = "chat"; + + window-rules = [ + # Kitty lancé spécifiquement pour la session LaTeX -> 0.7, sans bordure/gaps + { + matches = [ { app-id = "^kitty-latex$"; } ]; + open-on-workspace = "latex"; + open-maximized = true; # <- corrigé + default-column-width.proportion = 0.7; + border.enable = false; + focus-ring.enable = false; + } + # Zathura -> 0.3, sans bordure/gaps + { + matches = [ + { app-id = "^org\\.pwmt\\.zathura$"; } + { app-id = "^zathura$"; } + ]; + open-on-workspace = "latex"; + open-maximized = true; # <- corrigé + default-column-width.proportion = 0.3; + border.enable = false; + focus-ring.enable = false; + } + # Steam -> workspace games + { + matches = [ + { app-id = "^steam$"; } + { app-id = "^steam_app.*"; } + ]; + open-on-workspace = "games"; + } + # Vesktop -> workspace discord + { + matches = [ { app-id = "^[Vv]esktop$"; } ]; + open-on-workspace = "discord"; + } + ]; + + binds = { + "Alt+1".action.spawn = [ + "sh" + "-c" + ''niri msg action focus-workspace "web"; notify-send -a niri -u low -t 900 "web" || true'' + ]; + "Alt+2".action.spawn = [ + "sh" + "-c" + ''niri msg action focus-workspace "latex"; notify-send -a niri -u low -t 900 "latex" || true'' + ]; + "Alt+3".action.spawn = [ + "sh" + "-c" + ''niri msg action focus-workspace "games"; notify-send -a niri -u low -t 900 "games" || true'' + ]; + "Alt+4".action.spawn = [ + "sh" + "-c" + ''niri msg action focus-workspace "discord"; notify-send -a niri -u low -t 900 "discord" || true'' + ]; }; }; } diff --git a/home/afoucaultc/packages/niri/niri.nix b/home/afoucaultc/packages/niri/niri.nix index 379ad31..79d32c7 100644 --- a/home/afoucaultc/packages/niri/niri.nix +++ b/home/afoucaultc/packages/niri/niri.nix @@ -13,5 +13,6 @@ brightnessctl xwayland-satellite wl-clipboard + libnotify ]; } diff --git a/home/afoucaultc/shared.nix b/home/afoucaultc/shared.nix new file mode 100644 index 0000000..0680cd2 --- /dev/null +++ b/home/afoucaultc/shared.nix @@ -0,0 +1,23 @@ +{ ... }: +{ + imports = [ + ./packages/btop.nix + ./packages/firefox.nix + ./packages/git.nix + ./packages/security.nix + ./packages/hyprland.nix + ./packages/kitty.nix + ./packages/mpv.nix + ./packages/neovim.nix + ./packages/niri/niri.nix + ./packages/nextcloud.nix + ./packages/mako.nix + ./packages/python.nix + ./packages/texlive.nix + ./packages/thunderbird.nix + ./packages/tmux.nix + ./packages/zathura.nix + ./packages/zen.nix + ./packages/zsh.nix + ]; +} diff --git a/hosts/common/niri.nix b/hosts/common/niri.nix index 1b4f4f3..64110b8 100644 --- a/hosts/common/niri.nix +++ b/hosts/common/niri.nix @@ -2,5 +2,8 @@ { programs.niri.enable = true; programs.niri.package = pkgs.niri; - systemd.user.services.niri.enableDefaultPath = false; + systemd.user.services.niri = { + enableDefaultPath = false; + overrideStrategy = "asDropin"; + }; } diff --git a/hosts/common/services/greetd.nix b/hosts/common/services/greetd.nix index 05cf5c5..1dabc13 100644 --- a/hosts/common/services/greetd.nix +++ b/hosts/common/services/greetd.nix @@ -4,7 +4,6 @@ enable = true; settings = { default_session = { - # for niri command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --remember-user-session --cmd ${config.programs.niri.package}/bin/niri"; }; }; diff --git a/hosts/common/services/mullvad.nix b/hosts/common/services/mullvad.nix index f5e9692..23da0de 100644 --- a/hosts/common/services/mullvad.nix +++ b/hosts/common/services/mullvad.nix @@ -1,7 +1,10 @@ { pkgs, ... }: { - services.mullvad-vpn.gui = { + services.mullvad-vpn = { enable = true; - package = pkgs.mullvad-vpn; + gui = { + enable = true; + package = pkgs.mullvad-vpn; + }; }; } diff --git a/hosts/common/services/protonmail.nix b/hosts/common/services/protonmail.nix index c2dcdff..ecbd050 100644 --- a/hosts/common/services/protonmail.nix +++ b/hosts/common/services/protonmail.nix @@ -5,8 +5,12 @@ enable = true; }; - systemd.user.services.protonmail-bridge.serviceConfig = { - ExecStartPre = "${pkgs.bash}/bin/bash -c 'until ${pkgs.systemd}/bin/busctl --user list | grep -q org.freedesktop.secrets; do sleep 1; done'"; - RestartSec = "10s"; + systemd.user.services.protonmail-bridge = { + after = [ "gnome-keyring.service" ]; + wants = [ "gnome-keyring.service" ]; + serviceConfig = { + ExecStartPre = "${pkgs.bash}/bin/bash -c 'until ${pkgs.systemd}/bin/busctl --user list | grep -q org.freedesktop.secrets; do sleep 1; done'"; + RestartSec = "10s"; + }; }; } diff --git a/hosts/nixos-home/config/boot.nix b/hosts/nixos-home/config/boot.nix index 6cce82e..5987fb1 100644 --- a/hosts/nixos-home/config/boot.nix +++ b/hosts/nixos-home/config/boot.nix @@ -11,4 +11,15 @@ configurationLimit = 10; }; boot.loader.efi.canTouchEfiVariables = true; + # affichage logs + boot = { + consoleLogLevel = 3; + initrd.verbose = false; + kernelParams = [ + "quiet" + "udev.log_level=3" + "rd.udev.log_level=3" + "rd.systemd.show_status=auto" + ]; + }; } diff --git a/hosts/nixos-laptop/config/boot.nix b/hosts/nixos-laptop/config/boot.nix index 5e5a0fe..37ea4eb 100644 --- a/hosts/nixos-laptop/config/boot.nix +++ b/hosts/nixos-laptop/config/boot.nix @@ -11,4 +11,16 @@ configurationLimit = 5; }; boot.loader.efi.canTouchEfiVariables = true; + # affichage logs + boot = { + consoleLogLevel = 3; + initrd.verbose = false; + kernelParams = [ + "quiet" + "udev.log_level=3" + "rd.udev.log_level=3" + "rd.systemd.show_status=auto" + ]; + }; + }