diff --git a/flake.lock b/flake.lock index 2a0be25..48edbc0 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674082145, - "narHash": "sha256-4IpEt5Jc6VrNcpIcrKMCZAyeJMLXaaHk+yOV9HusO/A=", + "lastModified": 1674250603, + "narHash": "sha256-SBolFspxBHpW3hCCDNAFXUiO2mucmkVmf17UmSIK3Cs=", "owner": "nix-community", "repo": "home-manager", - "rev": "7026e1a934abfa02623c9870378dbcdac3cd7f80", + "rev": "275ab728912006eecb549338a50f24f294a7cfb7", "type": "github" }, "original": { @@ -47,11 +47,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1674143063, - "narHash": "sha256-CfP6ZYjxLeC1Q6W4f+RCd2sokIX8RnyTA8wYzYmx9XE=", + "lastModified": 1674296335, + "narHash": "sha256-jUvjOqKGuEk1XfZNPXU3hcPtIJKkSNzwUm5yN1EFYZA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5112056fdbda989191310364444f328240bbf6f1", + "rev": "fcbfd193930dd146b141531a9cf5301d55f26907", "type": "github" }, "original": { @@ -122,11 +122,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673796341, - "narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=", + "lastModified": 1674120619, + "narHash": "sha256-xLT1FQl7/jNPOEq5q/vmc3AExt1V9LtcjM+QY2+MUpA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6dccdc458512abce8d19f74195bb20fdb067df50", + "rev": "d7705c01ef0a39c8ef532d1033bace8845a07d35", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1f71165..ddc53de 100644 --- a/flake.nix +++ b/flake.nix @@ -8,6 +8,8 @@ hyprland.inputs.nixpkgs.follows = "nixpkgs"; hyprpaper.url = github:hyprwm/hyprpaper; hyprpaper.inputs.nixpkgs.follows = "nixpkgs"; + #xdph.url = github:hyprwm/xdg-desktop-portal-hyprland; + #xdph.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = github:Mic92/sops-nix; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; nix-colors.url = github:Misterio77/nix-colors; diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 7a82274..8626683 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -33,9 +33,17 @@ # Enable sound. sound.enable = true; - hardware.pulseaudio.enable = true; + #hardware.pulseaudio.enable = true; hardware.bluetooth.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; + xdg.portal.wlr.enable = true; + programs.dconf.enable = true; # control display backlight diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix index 742f592..b4c9680 100644 --- a/users/rouven/modules/default.nix +++ b/users/rouven/modules/default.nix @@ -4,7 +4,6 @@ [ ./accounts ./alacritty - ./flameshot # TODO fix ./fzf ./git ./gpg diff --git a/users/rouven/modules/hyprland/default.nix b/users/rouven/modules/hyprland/default.nix index 168023a..481b2a9 100644 --- a/users/rouven/modules/hyprland/default.nix +++ b/users/rouven/modules/hyprland/default.nix @@ -10,8 +10,12 @@ ''; home.packages = with pkgs; [ wofi + wl-clipboard + grim + slurp font-awesome hyprpaper.packages.x86_64-linux.default + #xdph.packages.x86_64-linux.default ]; xdg.configFile."wofi/config".text = '' diff --git a/users/rouven/modules/hyprland/hyprland.conf b/users/rouven/modules/hyprland/hyprland.conf index 3b8f6f9..37fc197 100644 --- a/users/rouven/modules/hyprland/hyprland.conf +++ b/users/rouven/modules/hyprland/hyprland.conf @@ -139,3 +139,6 @@ bind = $mainMod, mouse_up, workspace, e-1 # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow + +# Screenshot +bind = ,Print,exec, grim -g "$(slurp)" - | wl-copy -t image/png