From 2acc8a1e671607ebf7e77ae2535bc17227683b69 Mon Sep 17 00:00:00 2001 From: Hare Date: Sat, 28 Feb 2026 19:06:35 +0900 Subject: [PATCH] Update structure --- home-manager/fish/default.nix | 1 + hosts/arcadia/default.nix | 11 ++++ hosts/arcadia/home-manager.nix | 3 +- hosts/default.nix | 92 ++-------------------------------- hosts/fungus/default.nix | 11 ++++ hosts/mkHost.nix | 48 ++++++++++++++++++ hosts/x1carbon/default.nix | 11 ++++ hosts/x1carbon/nixos.nix | 4 +- programs/ssh.nix | 2 + 9 files changed, 91 insertions(+), 92 deletions(-) create mode 100644 hosts/arcadia/default.nix create mode 100644 hosts/fungus/default.nix create mode 100644 hosts/mkHost.nix create mode 100644 hosts/x1carbon/default.nix diff --git a/home-manager/fish/default.nix b/home-manager/fish/default.nix index 29bef19..f6b528c 100644 --- a/home-manager/fish/default.nix +++ b/home-manager/fish/default.nix @@ -4,6 +4,7 @@ enable = true; interactiveShellInit = '' set -g fish_greeting "" + set -gx SSH_AUTH_SOCK "$XDG_RUNTIME_DIR/ssh-agent" ''; }; diff --git a/hosts/arcadia/default.nix b/hosts/arcadia/default.nix new file mode 100644 index 0000000..cf858d5 --- /dev/null +++ b/hosts/arcadia/default.nix @@ -0,0 +1,11 @@ +inputs: +let + mkHost = import ../mkHost.nix inputs; +in +mkHost { + system = "x86_64-linux"; + hostname = "Arcadia"; + username = "hare"; + systemModules = [ ./nixos.nix ]; + homeModule = [ ./home-manager.nix ]; +} diff --git a/hosts/arcadia/home-manager.nix b/hosts/arcadia/home-manager.nix index b84f095..654936b 100644 --- a/hosts/arcadia/home-manager.nix +++ b/hosts/arcadia/home-manager.nix @@ -43,7 +43,6 @@ gimp inkscape obsidian - # davinci-resolve kdePackages.filelight inputs.zen-browser.packages."${stdenv.hostPlatform.system}".default (deno.overrideAttrs (oldAttrs: { @@ -62,6 +61,8 @@ vinegar antigravity + + davinci-resolve ]; services.easyeffects = { enable = true; diff --git a/hosts/default.nix b/hosts/default.nix index dd7519a..03b5daf 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,95 +1,9 @@ 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 { hosts = { - arcadia = - let - 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 - ]; - }; + arcadia = import ./arcadia inputs; + x1carbon = import ./x1carbon inputs; + fungus = import ./fungus inputs; }; nixos = builtins.mapAttrs (_: host: host.nixos) hosts; home-manager = builtins.mapAttrs (_: host: host.home-manager) hosts; diff --git a/hosts/fungus/default.nix b/hosts/fungus/default.nix new file mode 100644 index 0000000..d2909a4 --- /dev/null +++ b/hosts/fungus/default.nix @@ -0,0 +1,11 @@ +inputs: +let + mkHost = import ../mkHost.nix inputs; +in +mkHost { + system = "x86_64-linux"; + hostname = "Fungus"; + username = "hare"; + systemModules = [ ./nixos.nix ]; + homeModule = [ ./home-manager.nix ]; +} diff --git a/hosts/mkHost.nix b/hosts/mkHost.nix new file mode 100644 index 0000000..c5929c4 --- /dev/null +++ b/hosts/mkHost.nix @@ -0,0 +1,48 @@ +inputs: +{ + 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; + }; +} diff --git a/hosts/x1carbon/default.nix b/hosts/x1carbon/default.nix new file mode 100644 index 0000000..b184f44 --- /dev/null +++ b/hosts/x1carbon/default.nix @@ -0,0 +1,11 @@ +inputs: +let + mkHost = import ../mkHost.nix inputs; +in +mkHost { + system = "x86_64-linux"; + hostname = "x1carbon"; + username = "hare"; + systemModules = [ ./nixos.nix ]; + homeModule = [ ./home-manager.nix ]; +} diff --git a/hosts/x1carbon/nixos.nix b/hosts/x1carbon/nixos.nix index 86a8f21..7013324 100644 --- a/hosts/x1carbon/nixos.nix +++ b/hosts/x1carbon/nixos.nix @@ -31,12 +31,13 @@ in fzf ghq + + android-tools ]; environment.sessionVariables.NIXOS_OZONE_WL = "1"; users.users.${username} = { extraGroups = [ - "adbusers" "docker" ]; shell = pkgs.fish; @@ -45,7 +46,6 @@ in "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIW2Yrqwi4YjIrdI8mygX5pTHDPmrUgbmpZ4WxoTqORi keihi@Vostro-LapTop" ]; }; - programs.adb.enable = true; programs.nix-ld.enable = true; programs.light.enable = true; diff --git a/programs/ssh.nix b/programs/ssh.nix index d7b07d3..f0b1ac2 100644 --- a/programs/ssh.nix +++ b/programs/ssh.nix @@ -1,4 +1,6 @@ { + programs.ssh.startAgent = true; + services.openssh = { enable = true; ports = [ 22 ];