starred/nix-config-ryan4yin
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-03-26 19:01:07 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: home-manager

Browse Source
This commit is contained in:
Ryan Yin
2023-12-23 17:43:57 +08:00
parent 006bf56fd7
commit 44eb487df9
7 changed files with 27 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
home/linux/server-riscv64.nix → home/base/core.nix
View File

@@ -1,7 +1,4 @@
{username, ...}: {
imports = [
];
# Home Manager needs a bit of information about you and the
# paths it should manage.
home = {

22
home/darwin/default.nix
View File

@@ -1,31 +1,11 @@
{username, ...}: {
imports = [
../base/desktop
../base/core.nix
./proxychains
./core.nix
./rime-squirrel.nix
./shell.nix
];
# Home Manager needs a bit of information about you and the
# paths it should manage.
home = {
inherit username;
# set homeDirectory make build fail
homeDirectory = "/Users/${username}";
# This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage
# when a new Home Manager release introduces backwards
# incompatible changes.
#
# You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version
# changes in each release.
stateVersion = "23.11";
};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
}

31
home/linux/desktop-hyprland.nix
View File

@@ -1,31 +0,0 @@
{username, ...}: {
imports = [
../base/desktop
./base
./fcitx5
./desktop
./hyprland
];
# Home Manager needs a bit of information about you and the
# paths it should manage.
home = {
inherit username;
homeDirectory = "/home/${username}";
# This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage
# when a new Home Manager release introduces backwards
# incompatible changes.
#
# You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version
# changes in each release.
stateVersion = "23.11";
};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
}

31
home/linux/desktop-i3.nix
View File

@@ -1,31 +0,0 @@
{username, ...}: {
imports = [
../base/desktop
./base
./fcitx5
./desktop
./i3
];
# Home Manager needs a bit of information about you and the
# paths it should manage.
home = {
inherit username;
homeDirectory = "/home/${username}";
# This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage
# when a new Home Manager release introduces backwards
# incompatible changes.
#
# You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version
# changes in each release.
stateVersion = "23.11";
};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
}

10
home/linux/desktop.nix Normal file
View File

@@ -0,0 +1,10 @@
{
imports = [
../base/desktop
../base/core.nix
./base
./fcitx5
./desktop
];
}

23
home/linux/server.nix
View File

@@ -1,27 +1,8 @@
{username, ...}: {
{
imports = [
../base/server
../base/core.nix
./base
];
# Home Manager needs a bit of information about you and the
# paths it should manage.
home = {
inherit username;
homeDirectory = "/home/${username}";
# This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage
# when a new Home Manager release introduces backwards
# incompatible changes.
#
# You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version
# changes in each release.
stateVersion = "23.11";
};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
}

19
systems/vars.nix
View File

@@ -6,7 +6,12 @@
../secrets/nixos.nix
../modules/nixos/xorg.nix
];
home-module = import ../home/linux/desktop-i3.nix;
home-module = {
imports = [
../home/linux/desktop.nix
../home/linux/i3
];
};
};
idol_ai_modules_hyprland = {
nixos-modules = [
@@ -14,7 +19,12 @@
../secrets/nixos.nix
../modules/nixos/wayland.nix
];
home-module = import ../home/linux/desktop-hyprland.nix;
home-module = {
imports = [
../home/linux/desktop.nix
../home/linux/hyprland
];
};
};
# 星野 愛久愛海, Hoshino Akuamarin
@@ -59,7 +69,7 @@
# cross-compilation this flake.
{nixpkgs.crossSystem.system = "riscv64-linux";}
];
# home-module = import ../home/linux/server-riscv64.nix;
# home-module = import ../home/linux/server.nix;
};
rolling_nozomi_tags = ["riscv" "nozomi"];
@@ -72,7 +82,7 @@
# cross-compilation this flake.
{nixpkgs.crossSystem.system = "riscv64-linux";}
];
# home-module = import ../home/linux/server-riscv64.nix;
# home-module = import ../home/linux/server.nix;
};
rolling_yukina_tags = ["riscv" "yukina"];
@@ -108,5 +118,4 @@
];
home-module = import ../home/darwin;
};
}