caspervk/nixos
1
0
Fork 0
Code Activity Actions

Compare commits

base: caspervk:2dcd9b6af3ad8b21ff5649fa66421c4341ca619c
Branches Tags
caspervk:master
caspervk:dev
..
compare: caspervk:4602d82759b1f79e1703b7fdef31c7c19b8eaa45
Branches Tags
caspervk:master
caspervk:dev

No commits in common. "2dcd9b6af3ad8b21ff5649fa66421c4341ca619c" and "4602d82759b1f79e1703b7fdef31c7c19b8eaa45" have entirely different histories.
2dcd9b6af3 ... 4602d82759

4 changed files with 2 additions and 30 deletions
Show stats Expand all files Collapse all files

1
hosts/mu/hardware.nix
View file

@ -9,6 +9,7 @@
nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-pc nixos-hardware.nixosModules.common-pc
nixos-hardware.nixosModules.common-pc-laptop nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-acpi_call
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
]; ];

24
hosts/tor/tor.nix
View file

@ -55,8 +55,6 @@
MyFamily = builtins.concatStringsSep "," [ MyFamily = builtins.concatStringsSep "," [
"1B9D2C9E0EFE2C6BD23D62B2FCD145886AD242D1" # /var/lib/tor-1/fingerprint "1B9D2C9E0EFE2C6BD23D62B2FCD145886AD242D1" # /var/lib/tor-1/fingerprint
"293CE00D11B1D8B99AE8811CBDFDA3F353353710" # /var/lib/tor-2/fingerprint "293CE00D11B1D8B99AE8811CBDFDA3F353353710" # /var/lib/tor-2/fingerprint
# "TODO" # /var/lib/tor-3/fingerprint
# "TODO" # /var/lib/tor-4/fingerprint
]; ];
}; };
}; };
@ -74,16 +72,6 @@
orPort = 444; orPort = 444;
controlPort = 9052; controlPort = 9052;
}; };
tor-3 = mkTorContainer {
stateDir = "/var/lib/tor-3/";
orPort = 445;
controlPort = 9053;
};
tor-4 = mkTorContainer {
stateDir = "/var/lib/tor-4/";
orPort = 446;
controlPort = 9054;
};
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -182,18 +170,6 @@
group = builtins.toString config.ids.gids.tor; group = builtins.toString config.ids.gids.tor;
mode = "0700"; mode = "0700";
} }
{
directory = "/var/lib/tor-3";
user = builtins.toString config.ids.uids.tor;
group = builtins.toString config.ids.gids.tor;
mode = "0700";
}
{
directory = "/var/lib/tor-4";
user = builtins.toString config.ids.uids.tor;
group = builtins.toString config.ids.gids.tor;
mode = "0700";
}
]; ];
}; };
} }

1
hosts/zeta/hardware.nix
View file

@ -9,6 +9,7 @@
nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-cpu-intel
nixos-hardware.nixosModules.common-pc nixos-hardware.nixosModules.common-pc
nixos-hardware.nixosModules.common-pc-laptop nixos-hardware.nixosModules.common-pc-laptop
nixos-hardware.nixosModules.common-pc-laptop-acpi_call
nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-pc-ssd
]; ];

6
modules/base/vim.nix
View file

@ -517,11 +517,6 @@
local lspconfig = require("lspconfig") local lspconfig = require("lspconfig")
-- https://github.com/golang/tools/tree/master/gopls
lspconfig.gopls.setup({
capabilities = capabilities,
})
-- https://github.com/nix-community/nixd -- https://github.com/nix-community/nixd
lspconfig.nixd.setup({ lspconfig.nixd.setup({
capabilities = capabilities, capabilities = capabilities,
@ -913,7 +908,6 @@
nixpkgs-unstable.legacyPackages.${pkgs.system}.basedpyright # lsp nixpkgs-unstable.legacyPackages.${pkgs.system}.basedpyright # lsp
nixpkgs-unstable.legacyPackages.${pkgs.system}.ruff # lsp/conform nixpkgs-unstable.legacyPackages.${pkgs.system}.ruff # lsp/conform
pkgs.alejandra # conform pkgs.alejandra # conform
pkgs.gopls # lsp
pkgs.nixd # lsp pkgs.nixd # lsp
pkgs.nodePackages.prettier # conform pkgs.nodePackages.prettier # conform
pkgs.opentofu # conform pkgs.opentofu # conform