From 3953362456fda14e8f9c79bb1ac67a1cb9bf807c Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 28 Nov 2024 10:01:46 +0100 Subject: [PATCH] refactor: update configurations and fix inconsistent naming Refactor various NixOS and home-manager configurations to improve consistency and readability. Correct naming inconsistencies, ensure proper indentation, and restructure Samba settings for better clarity and maintainability. --- flake.lock | 1 + homes/aarch64-darwin/harald@m4/default.nix | 1 - homes/x86_64-linux/harald@mx/default.nix | 1 - .../x86_64-linux/harald@sgx-nixos/default.nix | 1 - homes/x86_64-linux/harald@sgx/default.nix | 1 - homes/x86_64-linux/harald@t15/default.nix | 1 - modules/home/cli-apps/neovim/default.nix | 4 +- modules/nixos/services/base/default.nix | 5 +- modules/nixos/services/gui/default.nix | 10 ++-- systems/aarch64-darwin/m4/default.nix | 6 +-- systems/x86_64-linux/mx/default.nix | 3 ++ systems/x86_64-linux/sgx-nixos/default.nix | 3 ++ systems/x86_64-linux/sgx/backup.nix | 2 +- systems/x86_64-linux/sgx/default.nix | 3 ++ systems/x86_64-linux/sgx/fileserver.nix | 49 +++++++------------ systems/x86_64-linux/t15/default.nix | 3 ++ systems/x86_64-linux/x1/default.nix | 4 +- 17 files changed, 49 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index 8c9f7aa..ff7d586 100644 --- a/flake.lock +++ b/flake.lock @@ -466,6 +466,7 @@ "original": { "owner": "Gerg-L", "repo": "mnw", + "rev": "5fe5c41975ed0af55f55dc37cd28ba906a5d015e", "type": "github" } }, diff --git a/homes/aarch64-darwin/harald@m4/default.nix b/homes/aarch64-darwin/harald@m4/default.nix index fa867e9..3f55c74 100644 --- a/homes/aarch64-darwin/harald@m4/default.nix +++ b/homes/aarch64-darwin/harald@m4/default.nix @@ -11,7 +11,6 @@ stateVersion = "23.11"; # Please read the comment before changing. }; - programs.ssh.extraConfig = '' UseKeychain yes AddKeysToAgent yes diff --git a/homes/x86_64-linux/harald@mx/default.nix b/homes/x86_64-linux/harald@mx/default.nix index a2f3061..6198bea 100644 --- a/homes/x86_64-linux/harald@mx/default.nix +++ b/homes/x86_64-linux/harald@mx/default.nix @@ -26,7 +26,6 @@ }; tools = { git.enable = true; - direnv.enable = true; }; }; diff --git a/homes/x86_64-linux/harald@sgx-nixos/default.nix b/homes/x86_64-linux/harald@sgx-nixos/default.nix index 4a26efe..39b20a4 100644 --- a/homes/x86_64-linux/harald@sgx-nixos/default.nix +++ b/homes/x86_64-linux/harald@sgx-nixos/default.nix @@ -17,7 +17,6 @@ }; tools = { git.enable = true; - direnv.enable = true; }; }; diff --git a/homes/x86_64-linux/harald@sgx/default.nix b/homes/x86_64-linux/harald@sgx/default.nix index 4a26efe..39b20a4 100644 --- a/homes/x86_64-linux/harald@sgx/default.nix +++ b/homes/x86_64-linux/harald@sgx/default.nix @@ -17,7 +17,6 @@ }; tools = { git.enable = true; - direnv.enable = true; }; }; diff --git a/homes/x86_64-linux/harald@t15/default.nix b/homes/x86_64-linux/harald@t15/default.nix index d2ed44e..4fd150c 100644 --- a/homes/x86_64-linux/harald@t15/default.nix +++ b/homes/x86_64-linux/harald@t15/default.nix @@ -17,7 +17,6 @@ }; tools = { git.enable = true; - direnv.enable = true; }; }; diff --git a/modules/home/cli-apps/neovim/default.nix b/modules/home/cli-apps/neovim/default.nix index 8cecfd4..82aa0d5 100644 --- a/modules/home/cli-apps/neovim/default.nix +++ b/modules/home/cli-apps/neovim/default.nix @@ -196,7 +196,7 @@ in }; smartcolumn = { enable = true; - columnAt.languages = { + setupOpts.custom_colorcolumn = { # this is a freeform module, it's `buftype = int;` for configuring column position nix = "110"; ruby = "120"; @@ -228,7 +228,7 @@ in comment-nvim.enable = true; }; - vim.spellChecking.languages = [ + vim.spellcheck.languages = [ "en" "de" ]; diff --git a/modules/nixos/services/base/default.nix b/modules/nixos/services/base/default.nix index f745ac3..02e2c4e 100644 --- a/modules/nixos/services/base/default.nix +++ b/modules/nixos/services/base/default.nix @@ -102,7 +102,10 @@ in }; starship.enable = true; mosh.enable = true; - vim.defaultEditor = true; + vim = { + defaultEditor = true; + enable = true; + }; fish.enable = true; }; diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix index 17e7dda..b939f04 100644 --- a/modules/nixos/services/gui/default.nix +++ b/modules/nixos/services/gui/default.nix @@ -18,7 +18,7 @@ in config = mkIf cfg.enable { services = { - gnome.tracker-miners.enable = lib.mkForce false; + gnome.localsearch.enable = lib.mkForce false; flatpak.enable = true; @@ -62,11 +62,11 @@ in #security.tpm2.pkcs11.enable = true; - hardware.opengl = { + hardware.graphics = { enable = true; extraPackages = with pkgs; [ - onevpl-intel-gpu + vpl-gpu-rt intel-compute-runtime intel-media-driver # LIBVA_DRIVER_NAME=iHD #intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) @@ -118,8 +118,8 @@ in gimp git gnome-browser-connector - gnome.cheese - gnome.gnome-software + cheese + gnome-software gnomeExtensions.appindicator gnomeExtensions.autohide-battery gnomeExtensions.dash-to-panel diff --git a/systems/aarch64-darwin/m4/default.nix b/systems/aarch64-darwin/m4/default.nix index 2d06abd..6fcfb01 100644 --- a/systems/aarch64-darwin/m4/default.nix +++ b/systems/aarch64-darwin/m4/default.nix @@ -11,9 +11,9 @@ with lib.metacfg; ]; masApps = { }; onActivation = { - cleanup = "zap"; - autoUpdate = true; - upgrade = true; + cleanup = "zap"; + autoUpdate = true; + upgrade = true; }; }; diff --git a/systems/x86_64-linux/mx/default.nix b/systems/x86_64-linux/mx/default.nix index 46622e2..3a90061 100644 --- a/systems/x86_64-linux/mx/default.nix +++ b/systems/x86_64-linux/mx/default.nix @@ -22,6 +22,9 @@ nix.enable = true; podman.enable = true; secureboot.enable = false; + tools = { + direnv.enable = true; + }; }; security = { diff --git a/systems/x86_64-linux/sgx-nixos/default.nix b/systems/x86_64-linux/sgx-nixos/default.nix index 34f8178..c8eb488 100644 --- a/systems/x86_64-linux/sgx-nixos/default.nix +++ b/systems/x86_64-linux/sgx-nixos/default.nix @@ -27,6 +27,9 @@ with lib.metacfg; "docker" "sgx" ]; + tools = { + direnv.enable = true; + }; }; environment.etc."sgx_default_qcnl.conf".text = '' diff --git a/systems/x86_64-linux/sgx/backup.nix b/systems/x86_64-linux/sgx/backup.nix index f24cb8a..bd5a61d 100644 --- a/systems/x86_64-linux/sgx/backup.nix +++ b/systems/x86_64-linux/sgx/backup.nix @@ -47,7 +47,7 @@ in "/home" "/root" "/persist" - config.services.samba.shares.Qmultimedia.path + config.services.samba.settings.Qmultimedia.path ]; extraBackupArgs = let diff --git a/systems/x86_64-linux/sgx/default.nix b/systems/x86_64-linux/sgx/default.nix index 52a14d8..6873e12 100644 --- a/systems/x86_64-linux/sgx/default.nix +++ b/systems/x86_64-linux/sgx/default.nix @@ -23,6 +23,9 @@ podman.enable = true; secureboot.enable = true; user.extraGroups = [ "docker" ]; + tools = { + direnv.enable = true; + }; }; virtualisation = { diff --git a/systems/x86_64-linux/sgx/fileserver.nix b/systems/x86_64-linux/sgx/fileserver.nix index 847565e..0f37087 100644 --- a/systems/x86_64-linux/sgx/fileserver.nix +++ b/systems/x86_64-linux/sgx/fileserver.nix @@ -38,36 +38,25 @@ services.samba = { enable = true; openFirewall = true; - securityType = "user"; - extraConfig = '' - read raw = Yes - write raw = Yes - socket options = TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=131072 SO_SNDBUF=131072 - min receivefile size = 16384 - use sendfile = true - aio read size = 16384 - aio write size = 16384 - workgroup = WORKGROUP - server string = sgx - netbios name = sgx - security = user - #max protocol = smb2 - hosts allow = 192.168.178. 127.0.0.1 localhost 2003::/16 ::1 - hosts deny = ALL - guest account = nobody - map to guest = bad user - ''; - shares = { - # public = { - # path = "/mnt/Shares/Public"; - # browseable = "yes"; - # "read only" = "no"; - # "guest ok" = "yes"; - # "create mask" = "0644"; - # "directory mask" = "0755"; - # "force user" = "username"; - # "force group" = "groupname"; - # }; + settings = { + global = { + security = "user"; + "read raw" = "Yes"; + "write raw" = "Yes"; + "socket options" = "TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=131072 SO_SNDBUF=131072"; + "min receivefile size" = 16384; + "use sendfile" = true; + "aio read size" = 16384; + "aio write size" = 16384; + "workgroup" = "WORKGROUP"; + "server string" = "sgx"; + "netbios name" = "sgx"; + #"max protocol" = "smb2"; + "hosts allow" = "192.168.178. 127.0.0.1 localhost 2003::/16 ::1"; + "hosts deny" = "ALL"; + "guest account" = "nobody"; + "map to guest" = "bad user"; + }; Qmultimedia = { path = "/mnt/raid/Qmultimedia"; browseable = "yes"; diff --git a/systems/x86_64-linux/t15/default.nix b/systems/x86_64-linux/t15/default.nix index c7cc6b6..e059fd9 100644 --- a/systems/x86_64-linux/t15/default.nix +++ b/systems/x86_64-linux/t15/default.nix @@ -14,6 +14,9 @@ "docker" "dialout" ]; + tools = { + direnv.enable = true; + }; }; system.autoUpgrade = { diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix index 419f97b..aa101fa 100644 --- a/systems/x86_64-linux/x1/default.nix +++ b/systems/x86_64-linux/x1/default.nix @@ -13,8 +13,8 @@ with lib.metacfg; secureboot.enable = true; homeprinter.enable = true; tools = { - direnv.enable = true; - #git.enable = true; + direnv.enable = true; + #git.enable = true; }; user.extraGroups = [ "docker"