updated hyprland config

This commit is contained in:
specCon18 2023-08-15 12:47:40 -04:00
parent 5a42f79803
commit 47e69553c1
6 changed files with 18 additions and 71 deletions

59
flake.lock generated
View file

@ -158,27 +158,6 @@
"type": "github" "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": { "lowdown-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -347,22 +326,6 @@
"type": "github" "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": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
@ -399,8 +362,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": {
@ -464,25 +426,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"
},
"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", "root": "root",

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, hyprland, ... }@inputs: outputs = { self, home-manager, nixos-hardware, disko, nixpkgs, sops-nix, devenv, ... }@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

View file

@ -27,5 +27,6 @@
bottom bottom
felix-fm felix-fm
gitui gitui
swww
]; ];
} }

View file

@ -5,9 +5,10 @@
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 = CONTROL_SHIFT, Lm, exec, rofi -show drun bind = SUPER, colon, exec, rofi -show drun
exec-once=/usr/lib/polkit-kde-authentication-agent-1
exec-once=waybar exec-once=waybar
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once=mako
''; '';
}; };
} }

View file

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

View file

@ -7,8 +7,9 @@
}; };
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
libsForQt5.polkit-kde-agent # libsForQt5.polkit-kde-agent
libsForQt5.qt5.qtwayland libsForQt5.qt5.qtwayland
qt6.full
qt6.qtwayland qt6.qtwayland
waybar waybar
swww swww
@ -16,6 +17,7 @@
rofi-wayland rofi-wayland
libnotify libnotify
mako mako
xdg-desktop-portal-hyprland
]; ];
sessionVariables = { sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "1";
@ -23,7 +25,7 @@
}; };
}; };
hardware = { hardware = {
# opengl.enable = true; opengl.enable = true;
nvidia.modesetting.enable = true; nvidia.modesetting.enable = true;
}; };
} }