Skip to content

Commit

Permalink
.: remove things i never ended up using
Browse files Browse the repository at this point in the history
  • Loading branch information
arachnist committed Jul 2, 2024
1 parent 3ffd0f5 commit 97b2b06
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 32 deletions.
8 changes: 0 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,8 @@

inputs = {
nixpkgs.url = "github:arachnist/nixpkgs/ar-patchset-unstable";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
nix-colors.url = "github:misterio77/nix-colors";
nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack";
nix-index-database.url = "github:Mic92/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
deploy-rs.url = "github:serokell/deploy-rs";
microvm.url = "github:astro/microvm.nix";
microvm.inputs.nixpkgs.follows = "nixpkgs";
impermanence.url = "github:nix-community/impermanence";
colmena = {
url = "github:zhaofengli/colmena/main";
Expand All @@ -33,7 +26,6 @@
url = "github:Jovian-Experiments/Jovian-NixOS";
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
lix = {
url =
"git+https://[email protected]/lix-project/lix?ref=refs/tags/2.90.0-rc1";
Expand Down
7 changes: 0 additions & 7 deletions modules/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
let meta = import ../meta.nix;
in {
imports = with inputs; [
nix-index-database.nixosModules.nix-index
agenix.nixosModules.default

microvm.nixosModules.host

self.nixosModules.boot
];

Expand Down Expand Up @@ -188,10 +185,6 @@ in {
[ { Address = "10.0.0.1/24"; } { Address = "fd12:3456:789a::1/64"; } ];
ipv6Prefixes = [{ Prefix = "fd12:3456:789a::/64"; }];
};
networks.microvm-eth0 = {
matchConfig.Name = "vm-*";
networkConfig.Bridge = "virbr0";
};
};

services.chrony.enable = true;
Expand Down
12 changes: 1 addition & 11 deletions modules/graphical.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,10 @@ let
${util-linux}/bin/rfkill unblock 0
'';
in {
imports = [ inputs.self.nixosModules.common inputs.home-manager.nixosModule ];
imports = [ inputs.self.nixosModules.common ];

nix.registry = nixRegistry;

home-manager.users.ar = {
home.username = "ar";
home.homeDirectory = "/home/ar";
home.stateVersion = config.system.stateVersion;
};
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;

boot = {
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
extraModprobeConfig = ''
Expand All @@ -51,8 +43,6 @@ in {
pulse.enable = true;
};

home-manager.users.ar.services.easyeffects.enable = true;

networking.networkmanager.enable = true;
networking.networkmanager.wifi.backend = "wpa_supplicant";
systemd.network.wait-online.enable = false;
Expand Down
2 changes: 0 additions & 2 deletions nixos/akamanto/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ in {

environment.etc."wifi-secrets".text = ci-secrets.wifi;

microvm.host.enable = false;

systemd.network.enable = lib.mkForce false;
networking = {
useDHCP = true;
Expand Down
2 changes: 0 additions & 2 deletions nixos/kamaitachi/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ in {

environment.etc."wifi-secrets".text = ci-secrets.wifi;

microvm.host.enable = false;

systemd.network.enable = lib.mkForce false;
networking = {
useDHCP = true;
Expand Down
2 changes: 0 additions & 2 deletions nixos/tsukumogami/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ in {

environment.etc."wifi-secrets".text = ci-secrets.wifi;

microvm.host.enable = false;

systemd.network.enable = lib.mkForce false;
networking = {
useDHCP = true;
Expand Down

0 comments on commit 97b2b06

Please sign in to comment.