small fix
This commit is contained in:
@@ -3,7 +3,13 @@
|
|||||||
# TODO: split into multiple files
|
# TODO: split into multiple files
|
||||||
|
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [ telegram-desktop vscode spotify ];
|
home.packages = with pkgs; [
|
||||||
|
telegram-desktop
|
||||||
|
vscode
|
||||||
|
spotify
|
||||||
|
obsidian
|
||||||
|
lmstudio
|
||||||
|
];
|
||||||
|
|
||||||
# do i really need it?
|
# do i really need it?
|
||||||
programs.direnv.enable = true;
|
programs.direnv.enable = true;
|
||||||
|
|||||||
@@ -59,17 +59,16 @@
|
|||||||
|
|
||||||
gitpa = ''f() { git add -A && git commit -m "$1" && git push; }; f'';
|
gitpa = ''f() { git add -A && git commit -m "$1" && git push; }; f'';
|
||||||
|
|
||||||
home-cnfg = "nvim ~/.config/home-manager/home.nix";
|
# home-cnfg = "nvim ~/.config/home-manager/home.nix";
|
||||||
home-rr = "home-manager switch";
|
# home-rr = "home-manager switch";
|
||||||
cnfg = "sudo nvim /nixos/configuration.nix";
|
# cnfg = "sudo nvim /nixos/configuration.nix";
|
||||||
rr = "sudo nixos-rebuild switch";
|
# rr = "sudo nixos-rebuild switch";
|
||||||
|
|
||||||
amnezia = ''
|
amnezia = ''
|
||||||
(pgrep -x ".AmneziaVPN-ser" > /dev/null 2>&1 || sudo AmneziaVPN-service > /dev/null 2>&1 &) &
|
(pgrep -x ".AmneziaVPN-ser" > /dev/null 2>&1 || sudo AmneziaVPN-service > /dev/null 2>&1 &) &
|
||||||
AmneziaVPN > /dev/null 2>&1 &
|
AmneziaVPN > /dev/null 2>&1 &
|
||||||
''; # TODO: start system with service
|
''; # TODO: start system with service
|
||||||
# mkenv = ''
|
cnfg = "cd nixos-config && code . && exit";
|
||||||
# echo "use nix" > .envrc && touch default.nix && direnv allow && echo "✓ env created"'';
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+16
-40
@@ -1,53 +1,31 @@
|
|||||||
{
|
{ config, pkgs, lib, ... }:
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
nix.settings.experimental-features = [
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
"nix-command"
|
|
||||||
"flakes"
|
|
||||||
];
|
|
||||||
nix.gc = {
|
nix.gc = {
|
||||||
automatic = true;
|
automatic = true;
|
||||||
dates = "weekly";
|
dates = "weekly";
|
||||||
options = "--delete-older-than 14d";
|
options = "--delete-older-than 14d";
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.nameservers = [
|
networking.nameservers = [ "8.8.8.8" "1.1.1.1" ];
|
||||||
"8.8.8.8"
|
networking.networkmanager.insertNameservers = [ "1.1.1.1" "8.8.8.8" ];
|
||||||
"1.1.1.1"
|
|
||||||
];
|
|
||||||
networking.networkmanager.insertNameservers = [
|
|
||||||
"1.1.1.1"
|
|
||||||
"8.8.8.8"
|
|
||||||
];
|
|
||||||
networking.firewall.enable = false;
|
networking.firewall.enable = false;
|
||||||
|
|
||||||
programs.firefox.enable = true;
|
programs.firefox.enable = true;
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [ kitty amnezia-vpn lenovo-legion ];
|
||||||
kitty
|
|
||||||
amnezia-vpn
|
|
||||||
lenovo-legion
|
|
||||||
];
|
|
||||||
|
|
||||||
# TODO: Добавить настройку вентиляторов
|
# TODO: Добавить настройку вентиляторов
|
||||||
|
|
||||||
security.sudo.extraRules = [
|
security.sudo.extraRules = [{
|
||||||
{
|
|
||||||
users = [ "ALL" ];
|
users = [ "ALL" ];
|
||||||
commands = [
|
commands = [{
|
||||||
{
|
|
||||||
command = "/run/current-system/sw/bin/AmneziaVPN-service";
|
command = "/run/current-system/sw/bin/AmneziaVPN-service";
|
||||||
options = [ "NOPASSWD" ];
|
options = [ "NOPASSWD" ];
|
||||||
}
|
}];
|
||||||
];
|
}]; # TODO: fix amnezia-service loading on startup
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.neovim = {
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -64,9 +42,7 @@
|
|||||||
colorscheme blue
|
colorscheme blue
|
||||||
endif
|
endif
|
||||||
'';
|
'';
|
||||||
packages.myVimPackage = with pkgs.vimPlugins; {
|
packages.myVimPackage = with pkgs.vimPlugins; { start = [ ctrlp ]; };
|
||||||
start = [ ctrlp ];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -96,19 +72,19 @@
|
|||||||
plymouth = {
|
plymouth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = "lone";
|
theme = "lone";
|
||||||
themePackages = with pkgs; [
|
themePackages = with pkgs;
|
||||||
|
[
|
||||||
(adi1090x-plymouth-themes.override { selected_themes = [ "lone" ]; })
|
(adi1090x-plymouth-themes.override { selected_themes = [ "lone" ]; })
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
consoleLogLevel = 3;
|
consoleLogLevel = 3;
|
||||||
initrd.verbose = false;
|
initrd.verbose = false;
|
||||||
kernelModules = [
|
kernelModules =
|
||||||
"tun"
|
[ "tun" "lenovo-legion-module" ]; # check if tun really needed
|
||||||
"lenovo-legion-module"
|
|
||||||
]; # for VPN
|
|
||||||
kernelPackages = pkgs.linuxPackages_latest;
|
kernelPackages = pkgs.linuxPackages_latest;
|
||||||
extraModulePackages = with config.boot.kernelPackages; [ lenovo-legion-module ];
|
extraModulePackages = with config.boot.kernelPackages;
|
||||||
|
[ lenovo-legion-module ];
|
||||||
kernelParams = [
|
kernelParams = [
|
||||||
"quiet"
|
"quiet"
|
||||||
"splash"
|
"splash"
|
||||||
|
|||||||
Reference in New Issue
Block a user