From 6454f8c69c0e01145fda52615a04881bb7d33d05 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Sat, 4 Mar 2023 21:22:42 +0100 Subject: [PATCH] hyprland tweaks --- flake.lock | 45 +++++++++++---------- flake.nix | 9 ++++- hosts/thinkpad/default.nix | 12 ++++-- users/rouven/modules/hyprland/default.nix | 12 ++++-- users/rouven/modules/hyprland/hyprland.conf | 5 --- users/rouven/modules/packages.nix | 3 +- 6 files changed, 50 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 2396179..6a87ef9 100644 --- a/flake.lock +++ b/flake.lock @@ -77,19 +77,23 @@ }, "hyprland": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprland-protocols": [ + "hyprland-protocols" + ], "nixpkgs": [ "nixpkgs" ], "wlroots": "wlroots", - "xdph": "xdph" + "xdph": [ + "xdph" + ] }, "locked": { - "lastModified": 1677778250, - "narHash": "sha256-OBDL8u2bO83GqX8BTiLkop1fKg4fZKt0zozO9hfTBns=", + "lastModified": 1677946956, + "narHash": "sha256-5kzTfzNVzN/VOssGfNko5O2BTYciWSKlqb+q7oX1lh4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "34685a836a40648167848060b48b62788cdcc85f", + "rev": "5184b542b1f505c90f9ef4715ae949ac45b2b7ef", "type": "github" }, "original": { @@ -101,16 +105,15 @@ "hyprland-protocols": { "inputs": { "nixpkgs": [ - "hyprland", "nixpkgs" ] }, "locked": { - "lastModified": 1671839510, - "narHash": "sha256-+PY1qqJfmZzzROgcIY4I7AkCwpnC+qBIYk2eFoA9RWc=", + "lastModified": 1673631087, + "narHash": "sha256-gkLgUg9/fP04bKCJMj/rN0r6PV/cbLShDvKQyFvVap0=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "b8f55e02a328c47ed373133c52483bbfa20a1b75", + "rev": "eb7dcc0132ad25addc3e8d434c4bfae6bd3a8c90", "type": "github" }, "original": { @@ -160,11 +163,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1677591639, - "narHash": "sha256-DMlAyge+u3K+JOFLA5YfdjqagdAYJf29YGBWpy5izg4=", + "lastModified": 1677949148, + "narHash": "sha256-dEdcn+UYs8TUK3VTNCQk9TsJapJLEq50A4q7eC3/PTU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "77de4cd09db4dbee9551ed2853cfcf113d7dc5ce", + "rev": "d63e86cbed3d399c4162594943bd8c1d8392e550", "type": "github" }, "original": { @@ -273,12 +276,14 @@ "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", + "hyprland-protocols": "hyprland-protocols", "hyprpaper": "hyprpaper", "nix-colors": "nix-colors", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixvim": "nixvim", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "xdph": "xdph" } }, "sops-nix": { @@ -336,11 +341,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1675374853, - "narHash": "sha256-BSrjNcddYWhFUMtjGwxiEXw67MYRaIHGvLn19Mvm1NE=", + "lastModified": 1677789111, + "narHash": "sha256-dWrk+Q3bLdtFe5rkyaAKWCQJCeE/KFNllcu1DvBC38c=", "owner": "wlroots", "repo": "wlroots", - "rev": "677a3f2f8847ed2de49dd60868f9d9487a546f58", + "rev": "5ae17de23f5fd9bb252a698f3771c840280e2c05", "type": "gitlab" }, "original": { @@ -353,20 +358,18 @@ "xdph": { "inputs": { "hyprland-protocols": [ - "hyprland", "hyprland-protocols" ], "nixpkgs": [ - "hyprland", "nixpkgs" ] }, "locked": { - "lastModified": 1673116118, - "narHash": "sha256-eR0yDSkR2XYMesfdRWJs25kAdXET2mbNNHu5t+KUcKA=", + "lastModified": 1676131170, + "narHash": "sha256-K2KLGfUHbasZQCeXTRIZMYcEEnW2exBXvJiXRmJZibM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "d479c846531fd0e1d2357c9588b8310a2b859ef2", + "rev": "2fa7e345a4131fb9bddb5dc168475613c0684cf5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 06c0110..d9982ed 100644 --- a/flake.nix +++ b/flake.nix @@ -7,17 +7,24 @@ sops-nix.url = github:Mic92/sops-nix; nix-colors.url = github:Misterio77/nix-colors; hyprpaper.url = github:hyprwm/hyprpaper; + hyprland-protocols.url = github:hyprwm/hyprland-protocols; + xdph.url = github:hyprwm/xdg-desktop-portal-hyprland; nixos-hardware.url = github:nixos/nixos-hardware; nixvim.url = github:pta2002/nixvim; home-manager.inputs.nixpkgs.follows = "nixpkgs"; hyprland.inputs.nixpkgs.follows = "nixpkgs"; + hyprland.inputs.hyprland-protocols.follows = "hyprland-protocols"; + hyprland.inputs.xdph.follows = "xdph"; hyprpaper.inputs.nixpkgs.follows = "nixpkgs"; + hyprland-protocols.inputs.nixpkgs.follows = "nixpkgs"; + xdph.inputs.nixpkgs.follows = "nixpkgs"; + xdph.inputs.hyprland-protocols.follows = "hyprland-protocols"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, home-manager, hyprland, hyprpaper, sops-nix, nix-colors, nixos-hardware, nixvim }@attrs: { + outputs = { self, nixpkgs, home-manager, hyprland, hyprpaper, xdph, sops-nix, nix-colors, nixos-hardware, nixvim, ... }@attrs: { formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; nixosConfigurations = { thinkpad = nixpkgs.lib.nixosSystem { diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 40345d3..6e3f395 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, inputs, ... }: { nix.settings.experimental-features = [ "nix-command" "flakes" ]; @@ -27,8 +27,7 @@ keyMap = "dvorak"; font = "Lat2-Terminus16"; colors = - let - colors = config.home-manager.users.rouven.colorScheme.colors; + let colors = config.home-manager.users.rouven.colorScheme.colors; in [ colors.base00 @@ -70,7 +69,12 @@ alsa.support32Bit = true; pulse.enable = true; }; - xdg.portal.wlr.enable = true; + xdg.portal = { + enable = true; + extraPortals = [ + inputs.xdph.packages.x86_64-linux.default + ]; + }; programs.dconf.enable = true; diff --git a/users/rouven/modules/hyprland/default.nix b/users/rouven/modules/hyprland/default.nix index 2ef2946..6956917 100644 --- a/users/rouven/modules/hyprland/default.nix +++ b/users/rouven/modules/hyprland/default.nix @@ -1,9 +1,15 @@ { config, pkgs, ... }: { imports = [ - ./hyprpaper.nix ./session.nix ./waybar.nix + ./hyprpaper.nix + ./session.nix + ./waybar.nix ]; - wayland.windowManager.hyprland.enable = true; + wayland.windowManager.hyprland = { + enable = true; + extraConfig = builtins.readFile ./hyprland.conf; # todo nix config when available + }; + home.sessionVariables = { GRIM_DEFAULT_DIR = "~/Pictures/Screenshots/"; }; @@ -19,8 +25,6 @@ ]; xdg.configFile = { - "hypr/hyprland.conf".source = ./hyprland.conf; - "wofi/config".text = '' allow_images = true term = alacritty diff --git a/users/rouven/modules/hyprland/hyprland.conf b/users/rouven/modules/hyprland/hyprland.conf index 7991b6a..86ddcb3 100644 --- a/users/rouven/modules/hyprland/hyprland.conf +++ b/users/rouven/modules/hyprland/hyprland.conf @@ -1,10 +1,5 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ monitor=eDP-1, 1920x1080, 0x0, 1 - -# manually start the systemd target -exec-once = systemctl --user start hyprland-session.target - - # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { kb_layout = us diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index e490c92..bb2daff 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -9,7 +9,7 @@ pcmanfm # rock solid file manager xdg-utils # used for xdg-open snapper-gui - comma # run any command + comma # run any command kleopatra python310Packages.pyhanko @@ -68,6 +68,7 @@ }) ]; + programs.obs-studio.enable = true; xdg.mimeApps = { enable = true;