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

re-re-enabled hyperland

Browse source
This commit is contained in:
specCon18 2023-08-15 21:45:34 -04:00
parent f5cf55ef26
commit bcc246acf9
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
flake.nix
View file

@ -6,8 +6,8 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
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, ... }@inputs: outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, devenv, hyprland, xdph ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
@ -63,8 +63,8 @@
./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
./hosts/katana/system-pkgs.nix ./hosts/katana/system-pkgs.nix
@ -76,8 +76,8 @@
] #extra modules to be loaded ] #extra modules to be loaded
[ [
# hyprland.homeManagerModules.default hyprland.homeManagerModules.default
# ./modules/home-manager/hyprland.nix ./modules/home-manager/hyprland.nix
./modules/home-manager/helix.nix ./modules/home-manager/helix.nix
./modules/home-manager/alacritty.nix ./modules/home-manager/alacritty.nix
./modules/home-manager/vscode.nix ./modules/home-manager/vscode.nix

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

@ -1,11 +1,12 @@
{ pkgs, config, lib, ...}: { pkgs, config, lib, ...}:
{ {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
systemdIntegration = true;
enable = true; enable = true;
extraConfig = '' extraConfig = ''
bind = SUPER, Return, exec, alacritty bind = SUPER, Return, exec, alacritty
bind = CONTROL_SHIFT, W, exec, firefox bind = CONTROL_SHIFT, W, exec, firefox
bind = SUPER, colon, exec, rofi -show drun bind = SUPER, R, exec, rofi -show drun
exec-once=waybar exec-once=waybar
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once=mako exec-once=mako

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

@ -28,7 +28,6 @@ in {
rofi-wayland rofi-wayland
libnotify libnotify
mako mako
xdg-desktop-portal-hyprland
]; ];
sessionVariables = { sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "1";