diff --git a/home/H0615/elitherl.nix b/home/H0615/elitherl.nix index 074aa22f..e1be27ad 100644 --- a/home/H0615/elitherl.nix +++ b/home/H0615/elitherl.nix @@ -3,7 +3,7 @@ home.username = "elitherl"; home.homeDirectory = "/home/elitherl"; home.stateVersion = "22.11"; - home.packages = [pkgs.microsoft-edge]; + home.packages = with pkgs; [microsoft-edge zotero]; programs.fish.functions.nvsync = '' rsync -avz --filter=':- .gitignore' --exclude='.git*'\ diff --git a/home/desktop/config/hypr/keybinds.conf b/home/desktop/config/hypr/keybinds.conf index 9a4f3339..86d7d91a 100644 --- a/home/desktop/config/hypr/keybinds.conf +++ b/home/desktop/config/hypr/keybinds.conf @@ -1,6 +1,5 @@ # See https://wiki.hyprland.org/Configuring/Keywords/ for more bind = SUPER, Return, exec, wezterm -bind = SUPER SHIFT, Return, exec, foot bind = SUPER, Q, killactive, bind = SUPER, E, exec, power-profiles bind = SUPER, P, exec, powermenu @@ -8,7 +7,7 @@ bind = SUPER, V, togglefloating, bind = SUPER, Space, exec, rofi -show drun bind = SUPER, S, exec, grim -g "$(slurp)" bind = SUPER, F1, exec, swaylock -bind = SUPER, W, exec, firefox +bind = SUPER, W, exec, chromium bind = SUPER, F, exec, thunar bind = SUPER, M, fullscreen, 1 bind = SUPER, A, bringactivetotop diff --git a/home/desktop/config/hypr/window-rules.conf b/home/desktop/config/hypr/window-rules.conf index 7bde393a..108acd2e 100644 --- a/home/desktop/config/hypr/window-rules.conf +++ b/home/desktop/config/hypr/window-rules.conf @@ -9,8 +9,6 @@ windowrule = center, ^(pavucontrol)$ windowrule = center, ^(.blueman-manager-wrapped)$ windowrule = move 2% 6%, ^(otpclient)$ -windowrule = workspace 2 silent, ^(firefox)$ -windowrule = workspace 3 silent, ^(thunar|libreoffice).*$ +windowrule = workspace 2, ^(chromium-browser)$ +windowrule = workspace 3, ^(thunar|libreoffice).*$ windowrule = workspace 4 silent, ^(Element|Signal|discord)$ - -windowrule = monitor 1, ^(firefox)$ diff --git a/home/desktop/config/waybar/modules.json b/home/desktop/config/waybar/modules.json index 82fd151a..5f6a8d3b 100644 --- a/home/desktop/config/waybar/modules.json +++ b/home/desktop/config/waybar/modules.json @@ -151,7 +151,7 @@ "format": "{name}:{icon}", "format-icons": { "1": "󰅴", - "2": "󰈹", + "2": "󰊯", "3": "󰷏", "4": "󰻞", "urgent": "", @@ -173,7 +173,7 @@ "format": "{name}:{icon}", "format-icons": { "1": "󰅴", - "2": "󰈹", + "2": "󰊯", "3": "󰷏", "4": "󰻞", "urgent": "", diff --git a/home/gui/chromium.nix b/home/gui/chromium.nix new file mode 100644 index 00000000..9c74e790 --- /dev/null +++ b/home/gui/chromium.nix @@ -0,0 +1,21 @@ +{ + config, + lib, + ... +}: let + cfg = config.wayland.windowManager.hyprland; +in { + programs.chromium = { + enable = true; + extensions = [ + {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # uBlock Origin + {id = "fnaicdffflnofjppbagibeoednhnbjhg";} # Floccus + {id = "nngceckbapebfimnlniiiahkandclblb";} # Bitwarden + {id = "dphilobhebphkdjbpfohgikllaljmgbn";} # Simplelogin + ]; + commandLineArgs = lib.mkIf cfg.enable [ + "--enable-features=UseOzonePlatform" + "--ozone-platform=wayland" + ]; + }; +} diff --git a/home/gui/default.nix b/home/gui/default.nix index b8248e92..0b41e581 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -1,10 +1 @@ -{pkgs, ...}: { - imports = [./wezterm.nix]; - programs.firefox.enable = true; - home.packages = with pkgs; [ - bitwarden - marktext - signal-desktop - zotero - ]; -} +{...}: {imports = [./chromium.nix ./wezterm.nix];} diff --git a/home/personal.nix b/home/personal.nix index 5ae9417d..18ac2dc4 100644 --- a/home/personal.nix +++ b/home/personal.nix @@ -8,6 +8,7 @@ ./ssh/personal.nix ]; home.packages = with pkgs; [ + signal-desktop discord element-desktop qbittorrent