diff --git a/flake.lock b/flake.lock index 462339a..7a1285f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -59,16 +59,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1720823163, + "narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 652b5a9..cc118fb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { inputs = { nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; systems.url = "github:nix-systems/default"; home-manager = { - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { @@ -67,6 +67,7 @@ enableNetowrking = true; enableSSH = false; hardware = { enable = true; }; + containerRuntime = "podman"; }; configuration = { ... }: { imports = [ diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 38ab6a6..183357a 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_latest; + boot.kernelPackages = pkgs.linuxPackages_zen; environment.systemPackages = with pkgs; [ # Amd GPU Support rocmPackages.rocm-smi @@ -47,19 +47,18 @@ in services.ollama = { enable = true; acceleration = "rocm"; - # listenAddress = "0.0.0.0:11434"; - host = "0.0.0.0"; + listenAddress = "0.0.0.0:11434"; }; # Brother Printer hardware.sane.brscan5.enable = true; # Display Managers - services.xserver.videoDrivers = [ "displaylink" "modesetting" ]; + services.xserver.videoDrivers = + [ "displaylink" "modesetting" "amdgpu" "fbdev" ]; services.xserver.displayManager.sessionCommands = '' ${lib.getBin pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource 2 0 ''; # Kernel boot.initrd.kernelModules = [ "amdgpu" "evdi" ]; - # hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd amdvlk ]; # Add Functions home-manager.users.${user.name}.programs.zsh.initExtra = '' source ${zshFunctions} @@ -95,17 +94,17 @@ in STOP_CHARGE_THRESH_BAT0 = 97; # and above it stops charging }; }; - # services.auto-cpufreq.enable = true; - # services.auto-cpufreq.settings = { - # battery = { - # governor = "powersave"; - # turbo = "never"; - # }; - # charger = { - # governor = "performance"; - # turbo = "auto"; - # }; - # }; + services.auto-cpufreq.enable = true; + services.auto-cpufreq.settings = { + battery = { + governor = "powersave"; + turbo = "never"; + }; + charger = { + governor = "performance"; + turbo = "auto"; + }; + }; # Logind services.logind = { lidSwitchExternalPower = "suspend-then-hibernate"; diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index d59ff28..e08f991 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -16,16 +16,16 @@ services.ollama = { enable = true; acceleration = "cuda"; - host = "0.0.0.0"; - environmentVariables = { - OLLAMA_LLM_LIBRARY = "cuda"; - LD_LIBRARY_PATH = "run/opengl-driver/lib"; - NVARCH = "x86_64"; - NV_CUDA_CUDART_VERSION = "11.3.1"; - NVIDIA_VISIBLE_DEVICES = "all"; - }; + # environmentVariables = { + # OLLAMA_LLM_LIBRARY = "cuda"; + # LD_LIBRARY_PATH = "run/opengl-driver/lib"; + # NVARCH = "x86_64"; + # NV_CUDA_CUDART_VERSION = "11.3.1"; + # NVIDIA_VISIBLE_DEVICES = "all"; + # }; }; # Nvidia Settings + services.xserver.videoDrivers = [ "nvidia" "modesetting" "fbdev" ]; hardware.graphics = { enable = true; }; hardware.nvidia = { modesetting.enable = true; diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index aba20a0..d803262 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -53,4 +53,7 @@ ]; # udev rules for crypto wallets services.udev.packages = with pkgs; [ ledger-udev-rules trezor-udev-rules ]; + # trezor groups + users.groups.trezord = { }; + users.groups.trezord.members = [ user.name ]; } diff --git a/modules/main.nix b/modules/main.nix index f34713f..4015473 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -11,42 +11,48 @@ enable = false; } # Home Manager -, home-manager ? { - enable = false; - } +, home-manager ? { enable = false; } , ... }: -{ ... }: -{ +{ ... }: { imports = [ (import ./nix { user = user; systemStateVersion = systemStateVersion; }) - ] ++ (if desktop.enable then [ - (import ./desktop { - user = user; - enableKDE = desktop.enableKDE; - enableHypr = desktop.enableHypr; - enableX11 = desktop.enableX11; - enableWine = desktop.enableWine; - }) - ] else [ ]) ++ (if os.enable then [ - (import ./os { - user = user; - hostName = hostName; - firewall = os.firewall; - enableFonts = os.enableFonts; - enableNetowrking = os.enableNetowrking; - enableSSH = os.enableSSH; - hardware = os.hardware; - }) - ] else [ ]) ++ (if home-manager.enable then [ - (import ./home-manager/common.nix { - user = user; - homeMangerVersion = home-manager.version; - hostName = hostName; - }) - ] else [ ]) - ; + ] ++ (if desktop.enable then + [ + (import ./desktop { + user = user; + enableKDE = desktop.enableKDE; + enableHypr = desktop.enableHypr; + enableX11 = desktop.enableX11; + enableWine = desktop.enableWine; + }) + ] + else + [ ]) ++ (if os.enable then + [ + (import ./os { + user = user; + hostName = hostName; + firewall = os.firewall; + enableFonts = os.enableFonts; + enableNetowrking = os.enableNetowrking; + enableSSH = os.enableSSH; + hardware = os.hardware; + containerRuntime = os.containerRuntime; + }) + ] + else + [ ]) ++ (if home-manager.enable then + [ + (import ./home-manager/common.nix { + user = user; + homeMangerVersion = home-manager.version; + hostName = hostName; + }) + ] + else + [ ]); } diff --git a/modules/os/containers/default.nix b/modules/os/containers/default.nix new file mode 100644 index 0000000..864250f --- /dev/null +++ b/modules/os/containers/default.nix @@ -0,0 +1,11 @@ +{ user, runtime ? null }: +{ pkgs, ... }: { + virtualisation.containers.enable = true; + environment.systemPackages = with pkgs; [ dive podman-tui ]; + imports = (if runtime == "podman" then + [ (import ./podman.nix { user = user; }) ] + else if runtime == "docker" then + [ (import ./docker.nix { user = user; }) ] + else + [ ]); +} diff --git a/modules/os/containers/docker.nix b/modules/os/containers/docker.nix new file mode 100644 index 0000000..c97a2a6 --- /dev/null +++ b/modules/os/containers/docker.nix @@ -0,0 +1,11 @@ +{ user }: +{ pkgs, ... }: { + virtualisation.docker = { + enable = true; + autoPrune.enable = true; + enableOnBoot = false; + liveRestore = false; + }; + environment.systemPackages = with pkgs; [ docker-compose ]; + users.users.${user.name}.extraGroups = [ "docker" ]; +} diff --git a/modules/os/containers/podman.nix b/modules/os/containers/podman.nix new file mode 100644 index 0000000..5175017 --- /dev/null +++ b/modules/os/containers/podman.nix @@ -0,0 +1,15 @@ +{ user }: +{ pkgs, ... }: { + virtualisation.oci-containers.backend = "podman"; + virtualisation = { + podman = { + enable = true; + dockerCompat = true; + 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 5a0e718..9f32852 100644 --- a/modules/os/default.nix +++ b/modules/os/default.nix @@ -4,36 +4,35 @@ , enableFonts ? true , enableNetowrking ? true , enableSSH ? true -, hardware ? { - enable = false; - } +, containerRuntime ? null +, hardware ? { enable = false; } }: -{ pkgs, ... }: -{ +{ pkgs, ... }: { imports = [ - (import ./core.nix { - user = user; - }) + (import ./core.nix { user = user; }) ./rootUser.nix - (import ./user.nix { + (import ./user.nix { user = user; }) + (import ./containers.nix { user = user; + runtime = containerRuntime; }) - (import ./docker.nix { - user = user; - }) - ] ++ (if enableFonts then [ - ./fonts.nix - ] else [ ]) ++ (if hardware.enable then [ - ./hardware.nix - ] else [ ]) ++ (if enableNetowrking then [ - (import ./networking.nix { - hostName = hostName; - firewall = firewall; - }) - ] else [ ]) ++ (if enableSSH then [ - (import ./ssh.nix { - enableSSHServer = true; - user = user; - }) - ] else [ ]); + ] ++ (if enableFonts then [ ./fonts.nix ] else [ ]) + ++ (if hardware.enable then [ ./hardware.nix ] else [ ]) + ++ (if enableNetowrking then + [ + (import ./networking.nix { + hostName = hostName; + firewall = firewall; + }) + ] + else + [ ]) ++ (if enableSSH then + [ + (import ./ssh.nix { + enableSSHServer = true; + user = user; + }) + ] + else + [ ]); } diff --git a/modules/os/docker.nix b/modules/os/docker.nix deleted file mode 100644 index 4f282e0..0000000 --- a/modules/os/docker.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ user }: -{ pkgs, ... }: { - virtualisation.docker.enable = true; - virtualisation.docker.autoPrune.enable = true; - virtualisation.docker.enableOnBoot = false; - virtualisation.docker.liveRestore = false; - environment.systemPackages = with pkgs; [ docker-compose ]; - users.users.${user.name}.extraGroups = [ "docker" ]; -}