diff --git a/J0162.nix b/J0162.nix index b3801564..c320b8e1 100644 --- a/J0162.nix +++ b/J0162.nix @@ -1,6 +1,5 @@ {pkgs, ...}: { imports = [ - ./home ./common.nix ./hardware/audio.nix ./hardware/bluetooth.nix @@ -9,6 +8,7 @@ ]; networking.hostName = "J0162"; # Define your hostname. + services.xserver.displayManager.defaultSession = "hyprland"; users.users.elitherl = { isNormalUser = true; diff --git a/home/J0162/elitherl.nix b/home/J0162/elitherl.nix index bdcb3f23..15583264 100644 --- a/home/J0162/elitherl.nix +++ b/home/J0162/elitherl.nix @@ -1,10 +1,19 @@ -{...}: { +{pkgs, ...}: { imports = [../work.nix ../desktop/hyprland.nix]; home.username = "elitherl"; home.homeDirectory = "/home/elitherl"; home.stateVersion = "22.11"; + home.packages = with pkgs; [zotero]; + + programs.fish.functions.nvsync = '' + rsync -avz --filter=':- .gitignore' --exclude='.git*'\ + --delete-during --delete-excluded\ + $HOME/.config/nvim/ heimdall003.jet.uk:.config/nvim + rsync -avz --filter=':- .gitignore' --exclude='.git*'\ + --delete-during --delete-excluded\ + $HOME/.config/nvim/ freia:.config/nvim + ''; - programs.fish.shellAbbrs.hypr = "exec Hyprland"; xdg.configFile."hypr/hyprpaper.conf".source = ./hypr/hyprpaper.conf; wayland.windowManager.hyprland.extraConfig = builtins.readFile ./hypr/hyprland.conf; programs.waybar = { @@ -22,12 +31,11 @@ "temperature" "pulseaudio" "network" - "bluetooth" "backlight" "battery" - "battery#bat2" "tray" ]; + "wlr/workspaces" = {"format-icons" = {"5" = "󰒍";};}; }; }; }; diff --git a/home/J0162/hypr/hyprland.conf b/home/J0162/hypr/hyprland.conf index cc5a3d6e..34d4b905 100644 --- a/home/J0162/hypr/hyprland.conf +++ b/home/J0162/hypr/hyprland.conf @@ -1 +1,7 @@ source=./common.conf + +windowrule = float, title:^([Zz]oom).*$ +windowrule = float, ^(Nxplayer.bin)$ +windowrule = center, title:^([Zz]oom).*$ +windowrule = workspace 4, title:^([Zz]oom).*$ +windowrule = workspace 5 silent, ^(Nxplayer.bin)$ diff --git a/home/Northstar/xenia.nix b/home/Northstar/xenia.nix index 9afb0d13..75f31b08 100644 --- a/home/Northstar/xenia.nix +++ b/home/Northstar/xenia.nix @@ -2,6 +2,7 @@ imports = [ ../env ../tui + ../gui/chromium.nix ../gui/foot.nix ../desktop/sway.nix ../ssh/personal.nix @@ -14,7 +15,11 @@ programs.bash.bashrcExtra = '' source $HOME/.nix-profile/etc/profile.d/nix.sh ''; - programs.firefox.enable = true; + + services.syncthing = { + enable = true; + tray = {enable = true;}; + }; wayland.windowManager.sway = { config = { diff --git a/home/gui/chromium.nix b/home/gui/chromium.nix index 9c74e790..2864780e 100644 --- a/home/gui/chromium.nix +++ b/home/gui/chromium.nix @@ -1,10 +1,4 @@ -{ - config, - lib, - ... -}: let - cfg = config.wayland.windowManager.hyprland; -in { +{...}: { programs.chromium = { enable = true; extensions = [ @@ -13,7 +7,7 @@ in { {id = "nngceckbapebfimnlniiiahkandclblb";} # Bitwarden {id = "dphilobhebphkdjbpfohgikllaljmgbn";} # Simplelogin ]; - commandLineArgs = lib.mkIf cfg.enable [ + commandLineArgs = [ "--enable-features=UseOzonePlatform" "--ozone-platform=wayland" ];