Zaktualizuj zależności i uporządkuj konfigurację NixOS
- Zaktualizowano zależności w `flake.lock`, w tym `home-manager` i `stylix`, oraz dodano nową zależność `tinted-schemes`. - Usunięto zbędne zmienne oraz przeniesiono `mutableUsers` do `security.nix` dla lepszej organizacji konfiguracji. - Przeniesiono zakomentowane wpisy dotyczące montowania `Garand-Library` do `hardware.nix`. - Dodano zakomentowaną konfigurację zapory sieciowej do `networking.nix` oraz przeniesiono `console.keyMap` do `services.nix`. - Uporządkowano konfigurację, usuwając zbędne linie i przenosząc odpowiednie sekcje do bardziej logicznych miejsc.
This commit is contained in:
29
flake.lock
generated
29
flake.lock
generated
@@ -228,11 +228,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739287084,
|
"lastModified": 1739298825,
|
||||||
"narHash": "sha256-CtRNJsqsXIArJV+AKWZVBMO8PD1FQB69br+WMtTJEgI=",
|
"narHash": "sha256-q9CzTY7n8n9RK9mKUQ4VbaKdydhXQqzphahEG5Wt8sI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "8f351726c5841d86854e7fa6003ea472352f5208",
|
"rev": "f0a31d38e6de48970ce1fe93e6ea343e20a9c80a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -286,15 +286,16 @@
|
|||||||
"systems": "systems",
|
"systems": "systems",
|
||||||
"tinted-foot": "tinted-foot",
|
"tinted-foot": "tinted-foot",
|
||||||
"tinted-kitty": "tinted-kitty",
|
"tinted-kitty": "tinted-kitty",
|
||||||
|
"tinted-schemes": "tinted-schemes",
|
||||||
"tinted-tmux": "tinted-tmux",
|
"tinted-tmux": "tinted-tmux",
|
||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739215427,
|
"lastModified": 1739309576,
|
||||||
"narHash": "sha256-1yIsiPwwxXal7+wkWogjPhsM5BjRlK61lAHQtlX8s04=",
|
"narHash": "sha256-IMK19j1b2VH44lUad2/3BSski9T4ecrCHFlkjKWQV2o=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "4af2686c1c62176d0ce28c4d55e813ae5ed52b6f",
|
"rev": "d8289c3f0e5995863921ea207392c122f5d59f6d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -352,6 +353,22 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"tinted-schemes": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1737565458,
|
||||||
|
"narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=",
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "schemes",
|
||||||
|
"rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "tinted-theming",
|
||||||
|
"repo": "schemes",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"tinted-tmux": {
|
"tinted-tmux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
{...}: let
|
{...}: {
|
||||||
inherit (import ./variables.nix) keyboardLayout;
|
|
||||||
in {
|
|
||||||
imports = [
|
imports = [
|
||||||
./hardware.nix
|
./hardware.nix
|
||||||
./users.nix
|
./users.nix
|
||||||
@@ -25,40 +23,6 @@ in {
|
|||||||
../../modules/local-hardware-clock.nix
|
../../modules/local-hardware-clock.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
users = {
|
|
||||||
mutableUsers = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# fileSystems."/mnt/Garand-Library" = {
|
|
||||||
# device = "//192.168.1.156/Garand-Library";
|
|
||||||
# fsType = "cifs";
|
|
||||||
# options = [
|
|
||||||
# "rw" # Odczyt i zapis
|
|
||||||
# "uid=1000" # UID użytkownika montującego (np. 1000 to często UID pierwszego użytkownika)
|
|
||||||
# "gid=100" # GID grupy użytkownika montującego
|
|
||||||
# "file_mode=0775" # Uprawnienia dla plików
|
|
||||||
# "dir_mode=0775" # Uprawnienia dla katalogów
|
|
||||||
# "credentials=/etc/smb-credentials"
|
|
||||||
# ];
|
|
||||||
# };
|
|
||||||
|
|
||||||
# services.openvpn.servers = {
|
|
||||||
# RO-P2P = {
|
|
||||||
# config = ''
|
|
||||||
# config /home/garand_plg/Documents/RO-ovpn-tcp.ovpn
|
|
||||||
# '';
|
|
||||||
# updateResolvConf = true;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
console.keyMap = "${keyboardLayout}";
|
|
||||||
|
|
||||||
# Open ports in the firewall.
|
|
||||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
|
||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
|
||||||
# Or disable the firewall altogether.
|
|
||||||
# networking.firewall.enable = false;
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
|||||||
@@ -20,4 +20,17 @@
|
|||||||
enable32Bit = true;
|
enable32Bit = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# fileSystems."/mnt/Garand-Library" = {
|
||||||
|
# device = "//192.168.1.156/Garand-Library";
|
||||||
|
# fsType = "cifs";
|
||||||
|
# options = [
|
||||||
|
# "rw" # Odczyt i zapis
|
||||||
|
# "uid=1000" # UID użytkownika montującego (np. 1000 to często UID pierwszego użytkownika)
|
||||||
|
# "gid=100" # GID grupy użytkownika montującego
|
||||||
|
# "file_mode=0775" # Uprawnienia dla plików
|
||||||
|
# "dir_mode=0775" # Uprawnienia dla katalogów
|
||||||
|
# "credentials=/etc/smb-credentials"
|
||||||
|
# ];
|
||||||
|
# };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,4 +10,10 @@
|
|||||||
hostName = host;
|
hostName = host;
|
||||||
timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"];
|
timeServers = options.networking.timeServers.default ++ ["pool.ntp.org"];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Open ports in the firewall.
|
||||||
|
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||||
|
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||||
|
# Or disable the firewall altogether.
|
||||||
|
# networking.firewall.enable = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,4 +33,8 @@
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
users = {
|
||||||
|
mutableUsers = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -98,8 +98,18 @@ in {
|
|||||||
# enable = true;
|
# enable = true;
|
||||||
# package = pkgs.open-webui;
|
# package = pkgs.open-webui;
|
||||||
# };
|
# };
|
||||||
|
# penvpn.servers = {
|
||||||
|
# RO-P2P = {
|
||||||
|
# config = ''
|
||||||
|
# config /home/garand_plg/Documents/RO-ovpn-tcp.ovpn
|
||||||
|
# '';
|
||||||
|
# updateResolvConf = true;
|
||||||
|
# };
|
||||||
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
console.keyMap = "${keyboardLayout}";
|
||||||
|
|
||||||
systemd.services.flatpak-repo = {
|
systemd.services.flatpak-repo = {
|
||||||
path = [pkgs.flatpak];
|
path = [pkgs.flatpak];
|
||||||
script = ''
|
script = ''
|
||||||
|
|||||||
Reference in New Issue
Block a user