diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 1f510ec..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/caesium.home.nix b/caesium.home.nix index 4f61e93..7c48915 100644 --- a/caesium.home.nix +++ b/caesium.home.nix @@ -89,22 +89,21 @@ '' ; home.file.".config/1Password/ssh/agent.toml".source = ./config.agent.toml; + + # ~/.config (dotfiles) + xdg.enable = true; + xdg.configFile."biome.json".source = ./config.biome.json; + xdg.configFile."oxlintrc.json".source = ./config.oxlintrc.json; + xdg.configFile."ssh.conf".source = ./config.ssh.conf; programs.ssh = { enable = true; enableDefaultConfig = false; + extraConfig = builtins.readFile ./config.ssh.conf; matchBlocks = { - "thiccdata.io" = { - hostname = "192.168.1.45"; - user = "mbessette"; - port = 2222; - }; "*" = { controlMaster = "auto"; controlPath = "~/.ssh/master-%r@%h:%p"; - extraOptions = { - "IdentityAgent" = "~/.1password/agent.sock"; - }; }; }; }; diff --git a/caesium.nixos.nix b/caesium.nixos.nix index 74417bc..87cabe1 100644 --- a/caesium.nixos.nix +++ b/caesium.nixos.nix @@ -161,7 +161,8 @@ # Biome config environment.etc."biome.json".source = ./config.biome.json; - environment.etc."oxlintrc.json".source = ./config.oxlintrc.json; + # environment.etc."oxlintrc.json".source = ./config.oxlintrc.json; + # environment.etc."ssh_config".source = ./config.ssh.conf; environment.systemPackages = with pkgs; [ ethtool @@ -175,6 +176,9 @@ spotify faugus-launcher signal-desktop + ## Emulators + xenia-canary + mupen64plus ]; services.flatpak.packages = [ diff --git a/config.ssh.conf b/config.ssh.conf new file mode 100644 index 0000000..8836215 --- /dev/null +++ b/config.ssh.conf @@ -0,0 +1,12 @@ +Host thiccdata.io + Port 2222 + User mbessette + HostName 192.168.1.45 + +Host germanium + Port 22 + User mbessette + HostName 192.168.2.254 + +Host * + IdentityAgent ~/.1password/agent.sock diff --git a/config.vscode.settings.json b/config.vscode.settings.json index 8fa3c4e..8615c48 100644 --- a/config.vscode.settings.json +++ b/config.vscode.settings.json @@ -58,14 +58,12 @@ "https://www.schemastore.org/": true }, "oxc.enable.oxlint": true, - "oxc.configPath": "/etc/oxlintrc.json", - "oxc.path.oxlint": "/Users/matthew.bessette/.npm-global/bin/oxlint", + "oxc.configPath": "~/.config/oxlintrc.json", "oxc.disableNestedConfig": true, "js/ts.updateImportsOnFileMove.enabled": "always", "js/ts.experimental.useTsgo": true, "workbench.iconTheme": "vscode-icons", - "update.mode": "none", - - "i18n-ally.displayLanguage": "en-US" + "i18n-ally.displayLanguage": "en-US", + "remote.SSH.configFile": "~/.config/ssh.conf" }