From fcb352381548c6b9b50beb86dc9309fde00e4c59 Mon Sep 17 00:00:00 2001 From: Faris Date: Tue, 28 Apr 2026 13:32:41 +0100 Subject: [PATCH] Add packages --- README.md | 2 +- config/common.nix | 46 ++++++---------------------------------------- config/linux.nix | 2 ++ home/common.nix | 36 +++++++++++++++++------------------- 4 files changed, 26 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index b598377..202d207 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ To rebuild and switch to the configuration, first copy over the *hardware.nix* w sudo nixos-rebuild switch --flake .#desktop ``` ``` -sudo nixos-rebuild switch --flake .#admins-MacBook-Air +sudo darwin-rebuild switch --flake .#admins-MacBook-Air ``` ``` sudo nixos-rebuild switch --flake .#nixos-server diff --git a/config/common.nix b/config/common.nix index 0806e24..5f142c2 100644 --- a/config/common.nix +++ b/config/common.nix @@ -53,45 +53,7 @@ }; # unfree - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - # nvidia - "nvidia-x11" - "nvidia-settings" - # cuda - "cuda_cudart" - "cuda_nvcc" - "cuda_cccl" - "libcublas" - "cuda-merged" - "cuda_cuobjdump" - "cuda_gdb" - "cuda_nvdisasm" - "cuda_nvprune" - "cuda_cupti" - "cuda_cuxxfilt" - "cuda_nvml_dev" - "cuda_nvrtc" - "cuda_nvtx" - "cuda_profiler_api" - "cuda_sanitizer_api" - "libcufft" - "libcurand" - "libcusolver" - "libnvjitlink" - "libcusparse" - "libnpp" - # other - "proton-authenticator" - "obsidian" - "via" - "steam" - "steam-unwrapped" - "osu-lazer-bin" - "corefonts" - - "brgenml1lpr" - "unrar" - ]; + nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ zsh @@ -105,9 +67,11 @@ nmap tree p7zip - unrar + unar inetutils # telnet wget + dnsutils + iftop # media yt-dlp @@ -130,6 +94,8 @@ "server" = "ssh admin@192.168.0.30"; "desktop" = "ssh admin@192.168.30.40"; "server-nut" = "ssh admin@192.168.0.20"; + "laptop" = "ssh admin@192.168.0.41"; + ".." = "cd .."; "lsa" = "ls -al"; }; diff --git a/config/linux.nix b/config/linux.nix index 063e8a9..7e524be 100644 --- a/config/linux.nix +++ b/config/linux.nix @@ -38,6 +38,8 @@ environment.systemPackages = with pkgs; [ lm_sensors + iotop + dmidecode ]; # enable developer documenation diff --git a/home/common.nix b/home/common.nix index eef945e..6a46548 100644 --- a/home/common.nix +++ b/home/common.nix @@ -8,24 +8,24 @@ programs = { - mpv = { - enable = true; - package = pkgs.mpv.override { - scripts = with pkgs.mpvScripts; [ - sponsorblock - ]; - }; - config = { - profile = "high-quality"; - ytdl-format = "bestvideo+bestaudio"; - cache-default = 4000000; - loop-file = "inf"; - }; + mpv = { + enable = true; + package = pkgs.mpv.override { + scripts = with pkgs.mpvScripts; [ + sponsorblock + ]; + }; + config = { + profile = "high-quality"; + ytdl-format = "bestvideo+bestaudio"; + cache-default = 4000000; + loop-file = "inf"; + }; - extraInput = '' - r cycle_values video-rotate 90 180 270 0 - ''; - }; + extraInput = '' + r cycle_values video-rotate 90 180 270 0 + ''; + }; neovim = { enable = true; @@ -76,8 +76,6 @@ zsh = { enable = true; dotDir = "${config.xdg.configHome}/zsh"; - #enableCompletions = true; - #autosuggestions.enable = true; syntaxHighlighting.enable = true; oh-my-zsh = { enable = true;