From 784e002847047fdf8991e21492b354c02db1e1cf Mon Sep 17 00:00:00 2001 From: Hare Date: Thu, 30 Jan 2025 22:48:39 +0900 Subject: [PATCH] fix: remove unused overriding --- hosts/arcadia/home-manager.nix | 6 ------ hosts/default.nix | 13 ++++++------- programs/utility.nix | 1 - programs/vscode-server.nix | 16 ---------------- 4 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 programs/vscode-server.nix diff --git a/hosts/arcadia/home-manager.nix b/hosts/arcadia/home-manager.nix index ef87ea6..0a0a650 100644 --- a/hosts/arcadia/home-manager.nix +++ b/hosts/arcadia/home-manager.nix @@ -4,13 +4,7 @@ ../../home-manager/hyprland.nix ../../home-manager/tofi.nix ../../home-manager/direnv.nix - ../../home-manager/waybar.nix ]; - home = rec { - username = "hare"; - homeDirectory = "/home/${username}"; - stateVersion = "24.11"; - }; home.packages = with pkgs; [ vscode vivaldi diff --git a/hosts/default.nix b/hosts/default.nix index 66064b0..e22ab58 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -23,7 +23,6 @@ let "wheel" ]; }; - programs.git.enable = true; } ]; inherit system; @@ -54,22 +53,22 @@ let in rec { hosts = { - myNixOS = mkHost { + arcadia = mkHost { system = "x86_64-linux"; - hostname = "myNixOS"; + hostname = "Arcadia"; username = "hare"; systemModules = [ - ./myNixOS/nixos.nix + ./arcadia/nixos.nix ]; homeModule = [ - ./myNixOS/home-manager.nix + ./arcadia/home-manager.nix ]; }; }; nixos = { - myNixOS = hosts.myNixOS.nixos; + arcadia = hosts.arcadia.nixos; }; home-manager = { - myNixOS = hosts.myNixOS.home-manager; + arcadia = hosts.arcadia.home-manager; }; } diff --git a/programs/utility.nix b/programs/utility.nix index 785e53f..c8de501 100644 --- a/programs/utility.nix +++ b/programs/utility.nix @@ -7,7 +7,6 @@ btop bat - neovim wezterm kitty nixfmt-rfc-style diff --git a/programs/vscode-server.nix b/programs/vscode-server.nix deleted file mode 100644 index 7b05691..0000000 --- a/programs/vscode-server.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - (fetchTarball { - url = "https://github.com/msteen/nixos-vscode-server/tarball/master"; - sha256 = "09j4kvsxw1d5dvnhbsgih0icbrxqv90nzf0b589rb5z6gnzwjnqf"; - }) - ]; - environment.systemPackages = with pkgs; [ - code-server - ]; - - services.vscode-server.enable = true; - services.vscode-server.enableFHS = true; - services.vscode-server.nodejsPackage = pkgs.nodejs_22; -}