refinement, cleanup, fixes

This commit is contained in:
2025-05-21 18:57:46 +02:00
parent ab93aae1b6
commit e4e8d86131
17 changed files with 125 additions and 695 deletions
+31 -7
View File
@@ -1,10 +1,16 @@
{ cfg, config, lib, pkgs, inputs, ... }:
let
hyprplugins = {
hyprexpo_dir = "${pkgs.hyprlandPlugins.hyprexpo}";
};
in
{
imports = [
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
];
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
];
boot = {
loader.systemd-boot.enable = true;
@@ -86,14 +92,25 @@
gvfs.enable = true;
auto-cpufreq.enable = true;
thermald.enable = true;
power-profiles-daemon.enable = false;
pulseaudio.enable = false;
};
security.pam.services.hyprlock = {};
environment.etc."greetd/environments".text = ''
Hyprland
'';
environment = {
etc = {
"greetd/environments".text = ''
Hyprland
'';
"hyprland/plugins.conf" = {
mode = "0444";
text = ''
plugin = ${pkgs.hyprlandPlugins.hyprexpo}
'';
};
};
};
hardware = {
bluetooth.enable = true;
@@ -158,10 +175,17 @@
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
};
hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
xwayland.enable = true;
withUWSM = true;
plugins = [
pkgs.hyprlandPlugins.hyprbars
pkgs.hyprlandPlugins.hyprexpo
];
};
gnupg.agent = {
enable = true;
@@ -178,7 +202,7 @@
home-manager = {
useGlobalPkgs = true;
extraSpecialArgs = { inherit inputs; inherit cfg; };
extraSpecialArgs = { inherit inputs; inherit cfg; inherit hyprplugins; };
users = {
"${cfg.username}" = import ./home.nix;
};
+7 -6
View File
@@ -36,11 +36,6 @@ in
outOfStoreSymlink = true;
recursive = true;
};
".config/kitty" = {
source = ../../configs/kitty;
outOfStoreSymlink = true;
recursive = true;
};
".config/nvim" = {
source = ../../configs/nvim;
outOfStoreSymlink = true;
@@ -51,11 +46,17 @@ in
outOfStoreSymlink = true;
recursive = true;
};
".config/swaync" = {
source = ../../configs/swaync;
outOfStoreSymlink = true;
recursive = true;
};
# I have no idea why this is an issue...
# ".config/emacs" = {
# source = ../../configs/emacs;
# outOfStoreSymlink = true;
# recursive = true;
# };
};
}
+12 -1
View File
@@ -1,4 +1,13 @@
{ cfg, config, pkgs, lib, callPackage, inputs, ... }:
{
cfg,
hyprplugins,
config,
pkgs,
lib,
callPackage,
inputs,
...
}:
{
home.username = cfg.username;
@@ -24,6 +33,7 @@
GIT_EDITOR = "nvim";
NIX_SHELL_PRESERVE_PROMPT = 1;
NIX_CONFIG_DIR = "${cfg.homeDirectory}/personal/nixos";
HYPR_EXPO_LIB = "${hyprplugins.hyprexpo_dir}/lib/libhyprexpo.so";
};
nix.settings.extra-trusted-substituters = [
@@ -65,6 +75,7 @@
source = ../../configs/emacs;
recursive = true;
};
"user-dirs.dirs".source = ../../configs/user-dirs.dirs;
"user-dirs.locale".source = ../../configs/user-dirs.locale;
};
+1
View File
@@ -45,6 +45,7 @@
pywal
qbittorrent
signal-desktop
swaynotificationcenter
swww
texliveFull
tree
-1
View File
@@ -25,7 +25,6 @@
mpris-proxy.enable = true;
network-manager-applet.enable = true;
nextcloud-client.enable = true;
swaync.enable = true;
swww.enable = true;
};
}