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