[home] split out home-manager from configuration

This commit is contained in:
2024-06-28 03:04:24 +08:00
parent 28810c407b
commit 6f9de6434c
8 changed files with 23 additions and 18 deletions
+1 -8
View File
@@ -73,6 +73,7 @@
v2raya # Only for Chinese user v2raya # Only for Chinese user
# Nix related # Nix related
home-manager
nix-output-monitor nix-output-monitor
nixd nixd
nixpkgs-fmt nixpkgs-fmt
@@ -171,14 +172,6 @@
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh.enable = true; services.openssh.enable = true;
system.stateVersion = "23.11"; system.stateVersion = "23.11";
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"vscode"
"code"
"qq"
"feishu"
];
} }
+8 -10
View File
@@ -17,19 +17,17 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./configuration.nix ./configuration.nix
home-manager.nixosModules.home-manager
{
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.origami = import ./home.nix;
extraSpecialArgs = inputs;
backupFileExtension = "bak";
};
}
]; ];
}; };
}; };
homeConfigurations = {
"origami@um790-nix" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
modules = [ ./home/um790.nix ];
extraSpecialArgs = { inherit inputs; };
};
};
}; };
} }
@@ -1,10 +1,13 @@
{ pkgs, lib, config, ... }: { pkgs, lib, config, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
desktop-file-utils
telegram-desktop telegram-desktop
qq qq
mpv mpv
feishu feishu
moonlight-qt
]; ];
# An Apple Music client, only can be downloaded after purchasing # An Apple Music client, only can be downloaded after purchasing
+10
View File
@@ -0,0 +1,10 @@
{ pkgs, lib, config, ... }:
{
programs.gnupg = {
enable = true;
agent = {
enable = true;
enableSSHSupport = true;
};
};
}
+1
View File
@@ -13,6 +13,7 @@
(import ./modules/gnome-dconf.nix) (import ./modules/gnome-dconf.nix)
]; ];
nixpkgs.config.allowUnfreePredicate = _: true;
home.packages = with pkgs;[ home.packages = with pkgs;[
# system call monitoring # system call monitoring
strace # system call monitoring strace # system call monitoring