From 47e69553c124c6709d6daabcdd02cce5719093a7 Mon Sep 17 00:00:00 2001 From: specCon18 Date: Tue, 15 Aug 2023 12:47:40 -0400 Subject: [PATCH] updated hyprland config --- flake.lock | 59 +------------------ flake.nix | 14 ++--- hosts/katana/system-pkgs.nix | 1 + modules/home-manager/hyprland.nix | 5 +- modules/system/desktop-environments/gnome.nix | 2 +- .../system/desktop-environments/hyprland.nix | 8 ++- 6 files changed, 18 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index 72b1c17..51dd287 100644 --- a/flake.lock +++ b/flake.lock @@ -158,27 +158,6 @@ "type": "github" } }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "xdph", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1681065697, - "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "lowdown-src": { "flake": false, "locked": { @@ -347,22 +326,6 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1680945546, - "narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": [ @@ -399,8 +362,7 @@ "hyprland": "hyprland", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", - "sops-nix": "sops-nix", - "xdph": "xdph_2" + "sops-nix": "sops-nix" } }, "sops-nix": { @@ -464,25 +426,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "xdph_2": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_2", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1681489757, - "narHash": "sha256-FxgZ2jBU+wmbjIv7F4N5Jx6h+LD4aQ+bXHrzrbxapJk=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "bf035bf3d5b56fd3da9d11966ad0b3c57f852d78", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 459aa1c..52f8021 100644 --- a/flake.nix +++ b/flake.nix @@ -6,8 +6,8 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; sops-nix.url = github:Mic92/sops-nix; devenv.url = "github:cachix/devenv/latest"; - hyprland.url = "github:hyprwm/Hyprland"; - xdph.url = "github:hyprwm/xdg-desktop-portal-hyprland"; + # hyprland.url = "github:hyprwm/Hyprland"; + # xdph.url = "github:hyprwm/xdg-desktop-portal-hyprland"; home-manager = { url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -18,7 +18,7 @@ }; }; - outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, devenv, hyprland, ... }@inputs: + outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, devenv, ... }@inputs: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -63,8 +63,8 @@ ./machines/katana.nix #machine specific configuration "speccon18" #default user [ - hyprland.nixosModules.default - ./modules/system/desktop-environments/hyprland.nix + # hyprland.nixosModules.default + # ./modules/system/desktop-environments/hyprland.nix ./hosts/katana/default.nix ./hosts/katana/networkd.nix ./hosts/katana/system-pkgs.nix @@ -76,8 +76,8 @@ ] #extra modules to be loaded [ - hyprland.homeManagerModules.default - ./modules/home-manager/hyprland.nix + # hyprland.homeManagerModules.default + # ./modules/home-manager/hyprland.nix ./modules/home-manager/helix.nix ./modules/home-manager/alacritty.nix ./modules/home-manager/vscode.nix diff --git a/hosts/katana/system-pkgs.nix b/hosts/katana/system-pkgs.nix index e7c40bf..9a8f94b 100644 --- a/hosts/katana/system-pkgs.nix +++ b/hosts/katana/system-pkgs.nix @@ -27,5 +27,6 @@ bottom felix-fm gitui + swww ]; } \ No newline at end of file diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index a8245b3..af1d38f 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -5,9 +5,10 @@ extraConfig = '' bind = SUPER, Return, exec, alacritty bind = CONTROL_SHIFT, W, exec, firefox - bind = CONTROL_SHIFT, Lm, exec, rofi -show drun - exec-once=/usr/lib/polkit-kde-authentication-agent-1 + bind = SUPER, colon, exec, rofi -show drun exec-once=waybar + exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP + exec-once=mako ''; }; } diff --git a/modules/system/desktop-environments/gnome.nix b/modules/system/desktop-environments/gnome.nix index 1e2163f..1882022 100644 --- a/modules/system/desktop-environments/gnome.nix +++ b/modules/system/desktop-environments/gnome.nix @@ -36,7 +36,7 @@ }; xdg = { - portal = { enable = lib.mkDefault true; }; +# portal = { enable = lib.mkDefault true; }; mime.defaultApplications = { "text/markdown" = "hx"; }; diff --git a/modules/system/desktop-environments/hyprland.nix b/modules/system/desktop-environments/hyprland.nix index 9251742..415ea0b 100644 --- a/modules/system/desktop-environments/hyprland.nix +++ b/modules/system/desktop-environments/hyprland.nix @@ -7,8 +7,9 @@ }; environment = { systemPackages = with pkgs; [ - libsForQt5.polkit-kde-agent + # libsForQt5.polkit-kde-agent libsForQt5.qt5.qtwayland + qt6.full qt6.qtwayland waybar swww @@ -16,6 +17,7 @@ rofi-wayland libnotify mako + xdg-desktop-portal-hyprland ]; sessionVariables = { WLR_NO_HARDWARE_CURSORS = "1"; @@ -23,7 +25,7 @@ }; }; hardware = { -# opengl.enable = true; - nvidia.modesetting.enable = true; + opengl.enable = true; + nvidia.modesetting.enable = true; }; } \ No newline at end of file