feat: finally got hyprland working

This commit is contained in:
Nick 2025-02-03 02:00:27 -06:00
parent 17ea540427
commit c8e774a0ca
12 changed files with 66 additions and 13 deletions

38
flake.lock generated
View file

@ -126,6 +126,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -708,6 +724,7 @@
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"sops-nix": "sops-nix_2", "sops-nix": "sops-nix_2",
"systems": "systems_5", "systems": "systems_5",
"waybar": "waybar",
"yazi": "yazi" "yazi": "yazi"
} }
}, },
@ -950,6 +967,27 @@
"type": "github" "type": "github"
} }
}, },
"waybar": {
"inputs": {
"flake-compat": "flake-compat_5",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1738399335,
"narHash": "sha256-OvtDGDUX0P5oz/LzhzeAcGfd6ihlUHPMKR4CZgnScTA=",
"owner": "Alexays",
"repo": "Waybar",
"rev": "0d5a4f82eca6df03b73908244d1dcd5fec2c3584",
"type": "github"
},
"original": {
"owner": "Alexays",
"repo": "Waybar",
"type": "github"
}
},
"yazi": { "yazi": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",

View file

@ -37,6 +37,10 @@
url = "github:helix-editor/helix"; url = "github:helix-editor/helix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
waybar = {
url = "github:Alexays/Waybar";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =

View file

@ -7,6 +7,7 @@ with pkgs.vscode-extensions;
esbenp.prettier-vscode esbenp.prettier-vscode
haskell.haskell haskell.haskell
james-yu.latex-workshop james-yu.latex-workshop
bbenoist.nix
# jnoortheen.nix-ide # jnoortheen.nix-ide
mattn.lisp mattn.lisp
mkhl.direnv mkhl.direnv

View file

@ -21,8 +21,9 @@ in
"pactl set-default-sink bluez_output.00_16_94_35_0D_5F.1" "pactl set-default-sink bluez_output.00_16_94_35_0D_5F.1"
"pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source" "pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source"
"bluetoothctl power on" "bluetoothctl power on"
"gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'"
"gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'" "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'"
"gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}" "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}"
"systemctl --user import-environment PATH" # "systemctl --user import-environment PATH"
"systemctl --user restart xdg-desktop-portal.service" # "systemctl --user restart xdg-desktop-portal.service"
] ]

View file

@ -1,7 +1,7 @@
{ {
focus_on_activate = 1; focus_on_activate = 1;
force_default_wallpaper = 0; force_default_wallpaper = 0;
# disable_hyprland_logo = true; disable_hyprland_logo = true;
# disable_splash_rendering = true; disable_splash_rendering = true;
# disable_hyprland_qtutils_check = true; disable_hyprland_qtutils_check = true;
} }

View file

@ -61,7 +61,6 @@ let
]; ];
pinWindows = builtins.map (x: "pin, " + x) [ pinWindows = builtins.map (x: "pin, " + x) [
"title:^${bitwarden}$"
"title:^${picture}$" "title:^${picture}$"
"title:^${discord-popout}$" "title:^${discord-popout}$"
]; ];

View file

@ -29,7 +29,14 @@ in
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
xwayland.enable = true; xwayland.enable = true;
systemd.enable = false; systemd = {
enable = true;
enableXdgAutostart = true;
extraCommands = [
"systemctl --user stop hyprland-session.target"
"systemctl --user start hyprland-session.target"
];
};
settings = configImports; settings = configImports;
}; };
} }

View file

@ -12,6 +12,7 @@ in
{ {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = flake.inputs.waybar.packages.${pkgs.system}.default;
settings = settingsPath; settings = settingsPath;
style = stylePath; style = stylePath;
}; };

View file

@ -3,7 +3,7 @@
enable = true; enable = true;
settings = { settings = {
"default" = { "default" = {
path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/wpaperd/wallpaper"; path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/hypr/wpaperd/wallpaper";
apply-shadow = true; apply-shadow = true;
duration = "1m"; duration = "1m";
sorting = "random"; sorting = "random";

View file

@ -2,9 +2,9 @@
flake, flake,
pkgs, pkgs,
... ...
}: { }:
{
services.hypridle = { services.hypridle = {
enable = true; enable = true;
package = flake.inputs.hypridle.packages.${pkgs.system}.hypridle;
}; };
} }

View file

@ -10,6 +10,8 @@
extraPortals = builtins.attrValues { extraPortals = builtins.attrValues {
inherit (pkgs) inherit (pkgs)
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland
xdg-desktop-portal-wlr
; ;
}; };
}; };

View file

@ -71,11 +71,11 @@ in
in in
{ {
"/" = { "/" = {
device = "/dev/disk/by-uuid/c22a06af-8855-4938-9d04-68cd4d88d7f0"; device = "/dev/disk/by-uuid/58987815-99d2-4a26-b260-529a4e78b854";
fsType = "ext4"; fsType = "ext4";
}; };
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/7B8C-1E95"; device = "/dev/disk/by-uuid/D39C-83F7";
fsType = "vfat"; fsType = "vfat";
options = desktop.boot.options; options = desktop.boot.options;
}; };
@ -85,7 +85,7 @@ in
// (builtins.listToAttrs (map sambaMounts sambaDrives)); // (builtins.listToAttrs (map sambaMounts sambaDrives));
swapDevices = [ swapDevices = [
{ device = "/dev/disk/by-uuid/8c9d0c0b-0bc8-442b-a3fd-02a37acd409f"; } { device = "/dev/disk/by-uuid/f5d9890c-b341-47b0-8726-40afb645db56"; }
]; ];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [