diff --git a/bin/skyg b/bin/skyg index 6bc48e0..27ae232 100755 --- a/bin/skyg +++ b/bin/skyg @@ -32,7 +32,8 @@ function run-build() { : Run nixos build and emits difference : unlock - nixos-rebuild build --flake . + echo "sudo nixos-rebuild build --flake ." + sudo nixos-rebuild build --flake . lock run-diff } @@ -53,7 +54,6 @@ function run-switch() { fi sudo nixos-rebuild switch --flake . - git cap unlock } @@ -62,7 +62,9 @@ function run-diff() { : Diff results to current system : echo -e "Running ${YELLOW_BOLD}nvd${NC}" - nvd diff /run/current-system result | sed "s/^/\t│ /" + sudo nvd diff /run/current-system result | sed "s/^/\t│ /" + echo "press any key to continue " + read echo -e "\t└──${NC}DONE ${BLUE_BOLD}nvd${NC}" echo -e "Running ${YELLOW_BOLD}diff${NC}" diff --color=always -r /run/current-system result | sed "s/^/\t│ /" diff --git a/configs/hyprland/mine/hypr/hyprland.d/consts.conf b/configs/hyprland/mine/hypr/hyprland.d/consts.conf index 0f662e8..5916633 100644 --- a/configs/hyprland/mine/hypr/hyprland.d/consts.conf +++ b/configs/hyprland/mine/hypr/hyprland.d/consts.conf @@ -1,6 +1,6 @@ $term = alacritty $browser = firefox -$filemanager = thunar +$filemanager = nautilus $editor = code $applauncher = wofi --show drun $cmdlauncher = wofi --show run diff --git a/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf b/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf index 35d06ce..3cabd41 100644 --- a/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf +++ b/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf @@ -16,7 +16,7 @@ windowrulev2 = float,class:(Rofi) windowrulev2 = size 30% 90%,class:(Rofi) windowrulev2 = move 5% 5%,class:(Rofi) -$centerable = (Slack|nm-connection-editor|pavucontrol|system-config-printer|lxqt-policykit-agent|amdgpu_top|.*blueman.*|thunar) +$centerable = (Slack|nm-connection-editor|pavucontrol|system-config-printer|lxqt-policykit-agent|amdgpu_top|.*blueman.*|thunar|xdg-desktop-portal-gtk) # Centerable & Floatable windowrulev2 = float, class:$centerable diff --git a/configs/hyprland/mine/hypr/monitors.conf b/configs/hyprland/mine/hypr/monitors.conf index d75575c..c629800 100644 --- a/configs/hyprland/mine/hypr/monitors.conf +++ b/configs/hyprland/mine/hypr/monitors.conf @@ -1,7 +1,7 @@ -monitor=eDP-1,2256x1504@60.0,4176x1381,1.175 +monitor=eDP-1,2256x1504@60.0,0x0,1.175 # External Monitors -monitor=DP-11,1920x1080@60.0,5186x301,1.0 -monitor=DP-12,1920x1080@60.0,3266x301,1.0 monitor=DP-9,1920x1080@60.0,5186x301,1.0 monitor=DP-10,1920x1080@60.0,3266x301,1.0 + +monitor=*,preffered,auto,1 diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 5ad5efd..363d077 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -71,23 +71,18 @@ in google-cloud-sdk awscli dbeaver-bin - # Web - chromium # Photo Editing krita gimp-with-plugins ]; - programs.firefox = { - enable = true; - }; - programs.chromium = { - enable = true; - enablePlasmaBrowserIntegration = true; - extensions = [ - "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin - "nngceckbapebfimnlniiiahkandclblb" # bitwarden - ]; - }; + # programs.chromium = { + # enable = true; + # enablePlasmaBrowserIntegration = true; + # extensions = [ + # "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin + # "nngceckbapebfimnlniiiahkandclblb" # bitwarden + # ]; + # }; # # Opengl hardware.opengl = { diff --git a/modules/nixos/desktop/hyprland/common.nix b/modules/nixos/desktop/hyprland/common.nix index e05d47f..4fe4140 100644 --- a/modules/nixos/desktop/hyprland/common.nix +++ b/modules/nixos/desktop/hyprland/common.nix @@ -12,6 +12,7 @@ in xwayland.enable = true; systemd.setPath.enable = true; }; + xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; services.hypridle.enable = true; environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; diff --git a/modules/nixos/desktop/hyprland/mine.nix b/modules/nixos/desktop/hyprland/mine.nix index f1d1f5e..20c15b7 100644 --- a/modules/nixos/desktop/hyprland/mine.nix +++ b/modules/nixos/desktop/hyprland/mine.nix @@ -22,7 +22,7 @@ in swappy # screenshot editor hyprshot # screenshots cliphist # clipboard manager - xfce.thunar # file manager + gnome.nautilus # file manager wofi # app launcher wl-screenrec # screen recorder slurp # helper selection tools diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index c9ce170..e55890a 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -32,9 +32,6 @@ in # development vscode - # web - brave - # mail thunderbird @@ -60,9 +57,12 @@ in # Video recording obs-studio ]; + programs.firefox = { + enable = true; + }; home-manager.users.${config.skyg.user.name}.home.shellAliases = { open-image = "feh"; - open-file = "thunar"; + open-file = "nautilus"; }; }; }