Hare/cornflake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Hare:35623910b0507eee054c4014632cffdf2ae8c385
Branches Tags
Hare:master
Hare:aqua
..
compare: Hare:e3de591a27158c98f7e330ec0f331356ef107d50
Branches Tags
Hare:aqua
Hare:master

No commits in common. "35623910b0507eee054c4014632cffdf2ae8c385" and "e3de591a27158c98f7e330ec0f331356ef107d50" have entirely different histories.
35623910b0 ... e3de591a27

11 changed files with 122 additions and 141 deletions
Show Stats Expand all files Collapse all files

1
home-manager/fish/default.nix
View File

@ -4,7 +4,6 @@
enable = true; enable = true;
interactiveShellInit = '' interactiveShellInit = ''
set -g fish_greeting "" set -g fish_greeting ""
set -gx SSH_AUTH_SOCK "$XDG_RUNTIME_DIR/ssh-agent"
''; '';
}; };

15
hosts/arcadia/default.nix
View File

@ -1,15 +0,0 @@
inputs:
let
mkHost = import ../mkHost.nix inputs;
in
mkHost {
system = "x86_64-linux";
hostname = "Arcadia";
users = [
{
username = "hare";
homeModule = [ ./hare ];
}
];
systemModules = [ ./nixos.nix ];
}

29
hosts/arcadia/hare/default.nix → hosts/arcadia/home-manager.nix
View File

@ -8,19 +8,19 @@
home.stateVersion = "25.05"; home.stateVersion = "25.05";
imports = [ imports = [
inputs.nix-index-database.homeModules.nix-index inputs.nix-index-database.homeModules.nix-index
../display.nix ./display.nix
../../../home-manager/tofi.nix ../../home-manager/tofi.nix
../../../home-manager/hyprland ../../home-manager/hyprland
../../../home-manager/fnott.nix ../../home-manager/fnott.nix
../../../home-manager/wezterm ../../home-manager/wezterm
../../../home-manager/fish ../../home-manager/fish
../../../home-manager/vscode.nix ../../home-manager/vscode.nix
../../../home-manager/direnv.nix ../../home-manager/direnv.nix
../../../home-manager/firefox.nix ../../home-manager/firefox.nix
../../../home-manager/obs-studio.nix ../../home-manager/obs-studio.nix
../../../home-manager/zeditor.nix ../../home-manager/zeditor.nix
../../../home-manager/blender.nix ../../home-manager/blender.nix
../../../home-manager/voicevox.nix ../../home-manager/voicevox.nix
]; ];
hare.hyprland = { hare.hyprland = {
input.sensitivity = -1.0; input.sensitivity = -1.0;
@ -43,6 +43,7 @@
gimp gimp
inkscape inkscape
obsidian obsidian
# davinci-resolve
kdePackages.filelight kdePackages.filelight
inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default
(deno.overrideAttrs (oldAttrs: { (deno.overrideAttrs (oldAttrs: {
@ -61,8 +62,6 @@
vinegar vinegar
antigravity antigravity
davinci-resolve
]; ];
services.easyeffects = { services.easyeffects = {
enable = true; enable = true;

94
hosts/default.nix
View File

@ -1,10 +1,96 @@
inputs: inputs:
let
mkHost =
{
system,
hostname,
username,
systemModules,
homeModule,
}:
{
nixos = inputs.nixpkgs.lib.nixosSystem {
modules = systemModules ++ [
{
users.users.${username} = {
isNormalUser = true;
description = "";
extraGroups = [
"networkmanager"
"wheel"
];
};
}
];
inherit system;
specialArgs = {
inherit inputs hostname username;
};
};
home-manager = inputs.home-manager.lib.homeManagerConfiguration {
pkgs = import inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
};
extraSpecialArgs = {
inherit inputs hostname username;
};
modules = [
{
home = {
inherit username;
homeDirectory = "/home/${username}";
};
programs.home-manager.enable = true;
}
(import ../system/home-manager)
]
++ homeModule;
};
};
in
rec { rec {
hosts = { hosts = {
arcadia = import ./arcadia inputs; arcadia =
x1carbon = import ./x1carbon inputs; let
fungus = import ./fungus inputs; inputs.nixpkgs = import inputs.nixpkgs {
config.rocmSupport = true;
};
in
mkHost {
system = "x86_64-linux";
hostname = "Arcadia";
username = "hare";
systemModules = [
./arcadia/nixos.nix
];
homeModule = [
./arcadia/home-manager.nix
];
};
x1carbon = mkHost {
system = "x86_64-linux";
hostname = "x1carbon";
username = "hare";
systemModules = [
./x1carbon/nixos.nix
];
homeModule = [
./x1carbon/home-manager.nix
];
};
fungus = mkHost {
system = "x86_64-linux";
hostname = "Fungus";
username = "hare";
systemModules = [
./fungus/nixos.nix
];
homeModule = [
./fungus/home-manager.nix
];
};
}; };
nixos = builtins.mapAttrs (_: host: host.nixos) hosts; nixos = builtins.mapAttrs (_: host: host.nixos) hosts;
home-manager = builtins.foldl' (a: b: a // b) { } (map (h: h.home-manager) (builtins.attrValues hosts)); home-manager = builtins.mapAttrs (_: host: host.home-manager) hosts;
} }

15
hosts/fungus/default.nix
View File

@ -1,15 +0,0 @@
inputs:
let
mkHost = import ../mkHost.nix inputs;
in
mkHost {
system = "x86_64-linux";
hostname = "Fungus";
users = [
{
username = "hare";
homeModule = [ ./hare ];
}
];
systemModules = [ ./nixos.nix ];
}

15
hosts/fungus/hare/default.nix → hosts/fungus/home-manager.nix
View File

@ -1,16 +1,17 @@
{ pkgs, ... }: { conifg, pkgs, ... }:
{ {
home.stateVersion = "25.05"; home.stateVersion = "25.05";
imports = [ imports = [
../../../home-manager/direnv.nix ../../home-manager/direnv.nix
../../../home-manager/wezterm ../../home-manager/wezterm
../../../home-manager/fish ../../home-manager/fish
];
home.packages = with pkgs; [
]; ];
home.packages = with pkgs; [ ];
programs.git = { programs.git = {
enable = true; enable = true;
settings.user.name = "Hare"; userName = "Hare";
settings.user.email = "kei.hiracchi.0928@gmail.com"; userEmail = "kei.hiracchi.0928@gmail.com";
}; };
fonts = { fonts = {

57
hosts/mkHost.nix
View File

@ -1,57 +0,0 @@
inputs:
{
system,
hostname,
users,
systemModules,
}:
let
pkgs = import inputs.nixpkgs {
inherit system;
config.allowUnfree = true;
};
in
{
nixos = inputs.nixpkgs.lib.nixosSystem {
modules = systemModules ++ [
{
users.users = builtins.listToAttrs (map (u: {
name = u.username;
value = {
isNormalUser = true;
description = "";
extraGroups = [
"networkmanager"
"wheel"
];
};
}) users);
}
];
inherit system;
specialArgs = {
inherit inputs hostname;
username = (builtins.head users).username;
};
};
home-manager = builtins.listToAttrs (map (u: {
name = "${u.username}@${hostname}";
value = inputs.home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
inherit inputs hostname;
username = u.username;
};
modules = [
{
home = {
username = u.username;
homeDirectory = "/home/${u.username}";
};
programs.home-manager.enable = true;
}
(import ../system/home-manager)
] ++ u.homeModule;
};
}) users);
}

15
hosts/x1carbon/default.nix
View File

@ -1,15 +0,0 @@
inputs:
let
mkHost = import ../mkHost.nix inputs;
in
mkHost {
system = "x86_64-linux";
hostname = "x1carbon";
users = [
{
username = "hare";
homeModule = [ ./hare ];
}
];
systemModules = [ ./nixos.nix ];
}

16
hosts/x1carbon/hare/default.nix → hosts/x1carbon/home-manager.nix
View File

@ -7,16 +7,16 @@
{ {
home.stateVersion = "25.05"; home.stateVersion = "25.05";
imports = [ imports = [
../../../home-manager/hyprland ../../home-manager/hyprland
../../../home-manager/tofi.nix ../../home-manager/tofi.nix
../../../home-manager/fnott.nix ../../home-manager/fnott.nix
../../../home-manager/direnv.nix ../../home-manager/direnv.nix
../../../home-manager/obs-studio.nix ../../home-manager/obs-studio.nix
../../../home-manager/wezterm ../../home-manager/wezterm
../../../home-manager/fish ../../home-manager/fish
]; ];
hare.hyprland = { hare.hyprland = {
style = import ../../../home-manager/hyprland/styles/thin.nix { inherit lib; }; style = import ../../home-manager/hyprland/styles/thin.nix { inherit lib; };
input.sensitivity = -0.6; input.sensitivity = -0.6;
wallpaperCommand = "swww img /usr/share/wallpaper/"; wallpaperCommand = "swww img /usr/share/wallpaper/";
}; };

4
hosts/x1carbon/nixos.nix
View File

@ -31,13 +31,12 @@ in
fzf fzf
ghq ghq
android-tools
]; ];
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";
users.users.${username} = { users.users.${username} = {
extraGroups = [ extraGroups = [
"adbusers"
"docker" "docker"
]; ];
shell = pkgs.fish; shell = pkgs.fish;
@ -46,6 +45,7 @@ in
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIW2Yrqwi4YjIrdI8mygX5pTHDPmrUgbmpZ4WxoTqORi keihi@Vostro-LapTop" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIW2Yrqwi4YjIrdI8mygX5pTHDPmrUgbmpZ4WxoTqORi keihi@Vostro-LapTop"
]; ];
}; };
programs.adb.enable = true;
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
programs.light.enable = true; programs.light.enable = true;

2
programs/ssh.nix
View File

@ -1,6 +1,4 @@
{ {
programs.ssh.startAgent = true;
services.openssh = { services.openssh = {
enable = true; enable = true;
ports = [ 22 ]; ports = [ 22 ];