diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 141fe8d..bca8aae 100755 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -21,15 +21,16 @@ ]; }; - fileSystems."/mnt/working-files" = { + fileSystems."/home/javi/working-files" = { device = "/dev/disk/by-uuid/BE8EBBDA8EBB8A03"; fsType = "ntfs"; options = [ "uid=1000" # your user ID (check with `id -u`) "gid=100" # your primary group ID (check with `id -g`) "dmask=022" # dir permissions - "fmask=133" # file permissions + "fmask=022" # file permissions "nofail" + "exec" # make Nautilus show it with a friendly name/icon "x-gvfs-show" diff --git a/modules/home/home.nix b/modules/home/home.nix index c67fca5..160ebec 100755 --- a/modules/home/home.nix +++ b/modules/home/home.nix @@ -77,6 +77,7 @@ XDG_CONFIG_HOME = "${config.home.homeDirectory}/.config"; XDG_DATA_HOME = "${config.home.homeDirectory}/.local/share"; XDG_STATE_HOME = "${config.home.homeDirectory}/.local/state"; + QT_QPA_PLATFORM = "wayland"; }; }; diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index a079051..9d1551e 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -55,14 +55,14 @@ "$mod, SPACE, exec, wofi --show drun" "$mod, d, exec, ${pkgs.wofi-emoji}/bin/wofi-emoji" - "$mod SHIFT, s, exec, hyprshot --mode region" + "$mod SHIFT, s, exec, flameshot gui" ", PRINT, exec, hyprshot --mode output" "$mod SHIFT, c, togglespecialworkspace, comms" "$mod SHIFT, a, togglespecialworkspace, research" "$mod SHIFT ALT, x, exec, hyprctl dispatch exit" - "SHIFT, Print, exec, grimblast copy area" - "CTRL, Print, exec, grimblast copy active" + # "SHIFT, Print, exec, grimblast copy area" + # "CTRL, Print, exec, grimblast copy active" ] ++ ( # workspaces diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index ac7659f..ab39282 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -12,6 +12,7 @@ ./hyprpanel.nix ./wofi.nix ./desktop-env.nix + ./screenshots.nix ]; home = { @@ -22,16 +23,8 @@ packages = with pkgs; [ # Notifications libnotify - - # Screenshots - grim - slurp - wl-clipboard - hyprshot - # Desktop env hyprpanel - # Utility wl-clipboard ]; diff --git a/modules/home/hyprland/screenshots.nix b/modules/home/hyprland/screenshots.nix new file mode 100644 index 0000000..f077688 --- /dev/null +++ b/modules/home/hyprland/screenshots.nix @@ -0,0 +1,20 @@ +{ + config, + pkgs, + inputs, + ... +}: + +{ + nixpkgs.config.packageOverrides = pkgs: { + flameshot = pkgs.flameshot.override { + enableWlrSupport = true; + }; + }; + + home.packages = with pkgs; [ + flameshot + grim + slurp + ]; +}