harald/nixcfg
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

refactor: update configurations and fix inconsistent naming

Browse source 
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.
This commit is contained in:
Harald Hoyer 2024-11-28 10:01:46 +01:00
parent 26b76063e1
commit 3953362456
17 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
flake.lock
View file

@ -466,6 +466,7 @@
"original": { "original": {
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "5fe5c41975ed0af55f55dc37cd28ba906a5d015e",
"type": "github" "type": "github"
} }
}, },

1
homes/aarch64-darwin/harald@m4/default.nix
View file

@ -11,7 +11,6 @@
stateVersion = "23.11"; # Please read the comment before changing. stateVersion = "23.11"; # Please read the comment before changing.
}; };
programs.ssh.extraConfig = '' programs.ssh.extraConfig = ''
UseKeychain yes UseKeychain yes
AddKeysToAgent yes AddKeysToAgent yes

1
homes/x86_64-linux/harald@mx/default.nix
View file

@ -26,7 +26,6 @@
}; };
tools = { tools = {
git.enable = true; git.enable = true;
direnv.enable = true;
}; };
}; };

1
homes/x86_64-linux/harald@sgx-nixos/default.nix
View file

@ -17,7 +17,6 @@
}; };
tools = { tools = {
git.enable = true; git.enable = true;
direnv.enable = true;
}; };
}; };

1
homes/x86_64-linux/harald@sgx/default.nix
View file

@ -17,7 +17,6 @@
}; };
tools = { tools = {
git.enable = true; git.enable = true;
direnv.enable = true;
}; };
}; };

1
homes/x86_64-linux/harald@t15/default.nix
View file

@ -17,7 +17,6 @@
}; };
tools = { tools = {
git.enable = true; git.enable = true;
direnv.enable = true;
}; };
}; };

4
modules/home/cli-apps/neovim/default.nix
View file

@ -196,7 +196,7 @@ in
}; };
smartcolumn = { smartcolumn = {
enable = true; enable = true;
columnAt.languages = { setupOpts.custom_colorcolumn = {
# this is a freeform module, it's `buftype = int;` for configuring column position # this is a freeform module, it's `buftype = int;` for configuring column position
nix = "110"; nix = "110";
ruby = "120"; ruby = "120";
@ -228,7 +228,7 @@ in
comment-nvim.enable = true; comment-nvim.enable = true;
}; };
vim.spellChecking.languages = [ vim.spellcheck.languages = [
"en" "en"
"de" "de"
]; ];

5
modules/nixos/services/base/default.nix
View file

@ -102,7 +102,10 @@ in
}; };
starship.enable = true; starship.enable = true;
mosh.enable = true; mosh.enable = true;
vim.defaultEditor = true; vim = {
defaultEditor = true;
enable = true;
};
fish.enable = true; fish.enable = true;
}; };

10
modules/nixos/services/gui/default.nix
View file

@ -18,7 +18,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
services = { services = {
gnome.tracker-miners.enable = lib.mkForce false; gnome.localsearch.enable = lib.mkForce false;
flatpak.enable = true; flatpak.enable = true;
@ -62,11 +62,11 @@ in
#security.tpm2.pkcs11.enable = true; #security.tpm2.pkcs11.enable = true;
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
onevpl-intel-gpu vpl-gpu-rt
intel-compute-runtime intel-compute-runtime
intel-media-driver # LIBVA_DRIVER_NAME=iHD intel-media-driver # LIBVA_DRIVER_NAME=iHD
#intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) #intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
@ -118,8 +118,8 @@ in
gimp gimp
git git
gnome-browser-connector gnome-browser-connector
gnome.cheese cheese
gnome.gnome-software gnome-software
gnomeExtensions.appindicator gnomeExtensions.appindicator
gnomeExtensions.autohide-battery gnomeExtensions.autohide-battery
gnomeExtensions.dash-to-panel gnomeExtensions.dash-to-panel

6
systems/aarch64-darwin/m4/default.nix
View file

@ -11,9 +11,9 @@ with lib.metacfg;
]; ];
masApps = { }; masApps = { };
onActivation = { onActivation = {
cleanup = "zap"; cleanup = "zap";
autoUpdate = true; autoUpdate = true;
upgrade = true; upgrade = true;
}; };
}; };

3
systems/x86_64-linux/mx/default.nix
View file

@ -22,6 +22,9 @@
nix.enable = true; nix.enable = true;
podman.enable = true; podman.enable = true;
secureboot.enable = false; secureboot.enable = false;
tools = {
direnv.enable = true;
};
}; };
security = { security = {

3
systems/x86_64-linux/sgx-nixos/default.nix
View file

@ -27,6 +27,9 @@ with lib.metacfg;
"docker" "docker"
"sgx" "sgx"
]; ];
tools = {
direnv.enable = true;
};
}; };
environment.etc."sgx_default_qcnl.conf".text = '' environment.etc."sgx_default_qcnl.conf".text = ''

2
systems/x86_64-linux/sgx/backup.nix
View file

@ -47,7 +47,7 @@ in
"/home" "/home"
"/root" "/root"
"/persist" "/persist"
config.services.samba.shares.Qmultimedia.path config.services.samba.settings.Qmultimedia.path
]; ];
extraBackupArgs = extraBackupArgs =
let let

3
systems/x86_64-linux/sgx/default.nix
View file

@ -23,6 +23,9 @@
podman.enable = true; podman.enable = true;
secureboot.enable = true; secureboot.enable = true;
user.extraGroups = [ "docker" ]; user.extraGroups = [ "docker" ];
tools = {
direnv.enable = true;
};
}; };
virtualisation = { virtualisation = {

49
systems/x86_64-linux/sgx/fileserver.nix
View file

@ -38,36 +38,25 @@
services.samba = { services.samba = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
securityType = "user"; settings = {
extraConfig = '' global = {
read raw = Yes security = "user";
write raw = Yes "read raw" = "Yes";
socket options = TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=131072 SO_SNDBUF=131072 "write raw" = "Yes";
min receivefile size = 16384 "socket options" = "TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=131072 SO_SNDBUF=131072";
use sendfile = true "min receivefile size" = 16384;
aio read size = 16384 "use sendfile" = true;
aio write size = 16384 "aio read size" = 16384;
workgroup = WORKGROUP "aio write size" = 16384;
server string = sgx "workgroup" = "WORKGROUP";
netbios name = sgx "server string" = "sgx";
security = user "netbios name" = "sgx";
#max protocol = smb2 #"max protocol" = "smb2";
hosts allow = 192.168.178. 127.0.0.1 localhost 2003::/16 ::1 "hosts allow" = "192.168.178. 127.0.0.1 localhost 2003::/16 ::1";
hosts deny = ALL "hosts deny" = "ALL";
guest account = nobody "guest account" = "nobody";
map to guest = bad user "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";
# };
Qmultimedia = { Qmultimedia = {
path = "/mnt/raid/Qmultimedia"; path = "/mnt/raid/Qmultimedia";
browseable = "yes"; browseable = "yes";

3
systems/x86_64-linux/t15/default.nix
View file

@ -14,6 +14,9 @@
"docker" "docker"
"dialout" "dialout"
]; ];
tools = {
direnv.enable = true;
};
}; };
system.autoUpgrade = { system.autoUpgrade = {

4
systems/x86_64-linux/x1/default.nix
View file

@ -13,8 +13,8 @@ with lib.metacfg;
secureboot.enable = true; secureboot.enable = true;
homeprinter.enable = true; homeprinter.enable = true;
tools = { tools = {
direnv.enable = true; direnv.enable = true;
#git.enable = true; #git.enable = true;
}; };
user.extraGroups = [ user.extraGroups = [
"docker" "docker"