From 6e8a3139a4424bb6e54fffec7bd1015824953e8d Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 17 Jul 2024 19:48:10 -0400 Subject: [PATCH] clean up --- flake.nix | 2 +- hosts/fwbook.hardware-configuration.nix | 5 ----- hosts/fwbook.nix | 4 +++- modules/os/containers/podman.nix | 1 - modules/os/default.nix | 2 +- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index cc118fb..df5b8b5 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,7 @@ enableNetowrking = true; enableSSH = false; hardware = { enable = true; }; - containerRuntime = "podman"; + containerRuntime = "docker"; }; configuration = { ... }: { imports = [ diff --git a/hosts/fwbook.hardware-configuration.nix b/hosts/fwbook.hardware-configuration.nix index 076f76a..488edd6 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -45,11 +45,6 @@ [{ device = "/dev/disk/by-uuid/5175a4b0-0067-47c6-b7da-35acb247f134"; }]; networking.useDHCP = lib.mkDefault true; - # networking.interfaces.br-74ce7d3722b8.useDHCP = lib.mkDefault true; - networking.interfaces.docker0.useDHCP = lib.mkDefault true; - # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true; - # networking.interfaces.vethdb1ba40.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 183357a..669d9b0 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -20,7 +20,7 @@ in boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.tmp.useTmpfs = true; - boot.kernelPackages = pkgs.linuxPackages_zen; + # Packages environment.systemPackages = with pkgs; [ # Amd GPU Support rocmPackages.rocm-smi @@ -58,11 +58,13 @@ in ${lib.getBin pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource 2 0 ''; # Kernel + boot.kernelPackages = pkgs.linuxPackages_zen; boot.initrd.kernelModules = [ "amdgpu" "evdi" ]; # Add Functions home-manager.users.${user.name}.programs.zsh.initExtra = '' source ${zshFunctions} ''; + environment.localBinInPath = true; # Advance Power Management powerManagement.powertop.enable = true; powerManagement.enable = true; diff --git a/modules/os/containers/podman.nix b/modules/os/containers/podman.nix index 5175017..9442595 100644 --- a/modules/os/containers/podman.nix +++ b/modules/os/containers/podman.nix @@ -8,7 +8,6 @@ defaultNetwork.settings.dns_enabled = true; dockerSocket.enable = true; autoPrune.enable = true; - networkSocket.enable = true; }; }; environment.systemPackages = with pkgs; [ podman-compose ]; diff --git a/modules/os/default.nix b/modules/os/default.nix index 9f32852..98af6a3 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -12,7 +12,7 @@ (import ./core.nix { user = user; }) ./rootUser.nix (import ./user.nix { user = user; }) - (import ./containers.nix { + (import ./containers/default.nix { user = user; runtime = containerRuntime; })