new wm, hyprland gone

This commit is contained in:
Reid 2025-05-18 23:05:26 -07:00
parent 003f37bfbd
commit cb4b22b4e5
Signed by: reidlab
GPG key ID: DAF5EAF6665839FD
41 changed files with 1145 additions and 1364 deletions

View file

@ -5,25 +5,20 @@ let
inherit (lib.modules) mkDefault mkIf mkAliasOptionModule;
inherit (lib.my) mapModulesRec';
in {
imports =
[
inputs.home-manager.nixosModules.home-manager
(mkAliasOptionModule ["hm"] ["home-manager" "users" config.user.name])
inputs.nix-colors.homeManagerModules.default
inputs.hyprland.nixosModules.default
]
imports = [
inputs.home-manager.nixosModules.home-manager
(mkAliasOptionModule ["hm"] ["home-manager" "users" config.user.name])
inputs.nix-colors.homeManagerModules.default # >home manager modules >in non-hm modules
inputs.niri.nixosModules.niri
]
++ (mapModulesRec' (toString ./modules) import);
hm.imports = [
inputs.hyprland.homeManagerModules.default
];
environment.variables = {
NIXPKGS_ALLOW_UNFREE = "1";
};
nix = {
package = pkgs.nix;
package = pkgs.nixVersions.latest;
# flake registry and nix path pinning
# might not be needed? see: https://github.com/NixOS/nixpkgs/commit/e456032addae76701eb17e6c03fc515fd78ad74f
@ -38,13 +33,15 @@ in {
substituters = [
"https://nix-community.cachix.org"
"https://nixpkgs-wayland.cachix.org"
"https://hyprland.cachix.org"
"https://wezterm.cachix.org"
"https://niri.cachix.org"
"https://cache.soopy.moe"
];
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
"niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
"cache.soopy.moe-1:0RZVsQeR+GOh0VQI9rvnHz55nVXkFardDqfm4+afjPo="
];
};
@ -57,6 +54,8 @@ in {
};
};
programs.nix-ld.enable = mkDefault true;
system.stateVersion = "23.11";
system.configurationRevision = with inputs; mkIf (self ? rev) self.rev;
hm.home.stateVersion = config.system.stateVersion;
@ -95,8 +94,6 @@ in {
hardware.enableRedistributableFirmware = true;
programs.nix-ld.enable = mkDefault true;
environment.systemPackages = with pkgs; [
openssh mosh
unrar unzip