specCon18/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed hyprland collision

Browse source
This commit is contained in:
specCon18 2023-08-15 22:40:24 -04:00
parent 08ee0b7d56
commit 4ae96c2a65
5 changed files with 11 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

79
flake.lock generated
View file

@ -163,31 +163,6 @@
"type": "github" "type": "github"
} }
}, },
"hyprland-protocols_2": {
"inputs": {
"nixpkgs": [
"xdph",
"nixpkgs"
],
"systems": [
"xdph",
"systems"
]
},
"locked": {
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"lowdown-src": { "lowdown-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -356,22 +331,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": {
"locked": {
"lastModified": 1683014792,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -408,8 +367,7 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"sops-nix": "sops-nix", "sops-nix": "sops-nix"
"xdph": "xdph_2"
} }
}, },
"sops-nix": { "sops-nix": {
@ -446,21 +404,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"wlroots": { "wlroots": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -508,26 +451,6 @@
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"type": "github" "type": "github"
} }
},
"xdph_2": {
"inputs": {
"hyprland-protocols": "hyprland-protocols_2",
"nixpkgs": "nixpkgs_5",
"systems": "systems_2"
},
"locked": {
"lastModified": 1691841170,
"narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

6
flake.nix
View file

@ -7,7 +7,7 @@
sops-nix.url = github:Mic92/sops-nix; sops-nix.url = github:Mic92/sops-nix;
devenv.url = "github:cachix/devenv/latest"; devenv.url = "github:cachix/devenv/latest";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
xdph.url = "github:hyprwm/xdg-desktop-portal-hyprland"; # xdph.url = "github:hyprwm/xdg-desktop-portal-hyprland";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.05"; url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -18,7 +18,7 @@
}; };
}; };
outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, devenv, hyprland, xdph, ... }@inputs: outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, devenv, hyprland, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
@ -63,7 +63,7 @@
./machines/katana.nix #machine specific configuration ./machines/katana.nix #machine specific configuration
"speccon18" #default user "speccon18" #default user
[ [
hyprland.nixosModules.default # hyprland.nixosModules.default
./modules/system/desktop-environments/hyprland.nix ./modules/system/desktop-environments/hyprland.nix
./hosts/katana/default.nix ./hosts/katana/default.nix
./hosts/katana/networkd.nix ./hosts/katana/networkd.nix

2
modules/home-manager/hyprland.nix
View file

@ -1,7 +1,7 @@
{ pkgs, config, lib, ...}: { pkgs, config, lib, ...}:
{ {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
# systemdIntegration = true; # systemdIntegration = true;
enable = true; enable = true;
extraConfig = '' extraConfig = ''
bind = SUPER, Return, exec, alacritty bind = SUPER, Return, exec, alacritty

2
modules/system/desktop-environments/gnome.nix
View file

@ -47,7 +47,7 @@ in {
}; };
xdg = { xdg = {
portal = { enable = lib.mkDefault true; }; # portal = { enable = lib.mkDefault true; };
mime.defaultApplications = { mime.defaultApplications = {
"text/markdown" = "hx"; "text/markdown" = "hx";
}; };

13
modules/system/desktop-environments/hyprland.nix
View file

@ -1,9 +1,5 @@
{ { config, pkgs, lib, ...}:
config, let
pkgs,
lib,
...
}: let
inherit (lib) mkEnableOption mkIf; inherit (lib) mkEnableOption mkIf;
cfg = config.speccon18.desktop.hyprland; cfg = config.speccon18.desktop.hyprland;
in { in {
@ -13,7 +9,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
enableNvidiaPatches = true; nvidiaPatches = true;
xwayland.enable = true; xwayland.enable = true;
}; };
environment = { environment = {
@ -28,6 +24,7 @@ in {
rofi-wayland rofi-wayland
libnotify libnotify
mako mako
hyprland
]; ];
sessionVariables = { sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "1";
@ -37,8 +34,8 @@ in {
xdg.portal = { xdg.portal = {
enable = true; enable = true;
extraPortals = [ extraPortals = [
pkgs.xdg-desktop-portal-hyprland
pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
pkgs.xdg-desktop-portal-hyprland
]; ];
}; };
hardware = { hardware = {