refactor: cleanup configs, unify session handling
- flake.nix:
- Close braces formatting for `allowUnfree`
- Remove per-user `custom.sessionType` modules
- home-manager:
- home.nix: remove unused apps (bambu-studio, hydralauncher, keymapp, etc.)
- drop librespot service
- add waydroid
- fix kitty font_family spacing
- gnome: add gnome-tweaks and appindicator extension
- vim: update nixvim module import path
- zsh: drop sessionType option and conditional aliases
- hardcode wl-copy/wl-paste as pbcopy/pbpaste
- hyprland: style fixes in braces, spacing, keybind comments
- hosts/Nixstation:
- remove gnome-session and redundant tweaks
- remove env vars NIXOS_HOST / NIXOS_DE
- enable virtualization (libvirtd, spiceUSBRedirection, vmware.host=false)
- hardware-configuration: reformat fileSystems definitions
- common/nvidia:
- remove explicit kernelPackages override
- ensure xserver.enable=true and GNOME/GDM config intact
- users/thiago: reorder and regroup extraGroups list
This commit is contained in:
parent
ea25b5b515
commit
95e94196b2
11 changed files with 70 additions and 133 deletions
|
|
@ -3,16 +3,7 @@
|
|||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
isWayland = config.custom.sessionType == "wayland";
|
||||
in
|
||||
{
|
||||
options.custom.sessionType = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "x11";
|
||||
description = "The X session type: 'wayland' or 'x11'";
|
||||
};
|
||||
|
||||
config = {
|
||||
home.file."scripts/lsgpu.sh" = {
|
||||
source = ./scripts/lsgpu.sh;
|
||||
|
|
@ -28,25 +19,15 @@ in
|
|||
export GPG_TTY=$(tty)
|
||||
'';
|
||||
|
||||
shellAliases = lib.mkMerge [
|
||||
{
|
||||
"vi" = "nvim";
|
||||
"vim" = "nvim";
|
||||
"ll" = "ls -l";
|
||||
"lsgpu" = "$HOME/scripts/lsgpu.sh";
|
||||
"gedit" = "gnome-text-editor";
|
||||
}
|
||||
|
||||
(lib.mkIf isWayland {
|
||||
"pbcopy" = "wl-copy";
|
||||
"pbpaste" = "wl-paste";
|
||||
})
|
||||
|
||||
(lib.mkIf (!isWayland) {
|
||||
"pbcopy" = "xclip -selection clipboard -i";
|
||||
"pbpaste" = "xclip -selection clipboard -o";
|
||||
})
|
||||
];
|
||||
shellAliases = {
|
||||
"vi" = "nvim";
|
||||
"vim" = "nvim";
|
||||
"ll" = "ls -l";
|
||||
"lsgpu" = "$HOME/scripts/lsgpu.sh";
|
||||
"gedit" = "gnome-text-editor";
|
||||
"pbcopy" = "wl-copy";
|
||||
"pbpaste" = "wl-paste";
|
||||
};
|
||||
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
|
|
@ -57,7 +38,5 @@ in
|
|||
];
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [ xclip ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue