diff --git a/builder.nix b/builder.nix index b082c0d..78bbeee 100644 --- a/builder.nix +++ b/builder.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { nix.buildMachines = [ { @@ -21,7 +21,7 @@ programs.ssh.extraConfig = '' Host builder HostName 192.168.1.222 - Port 9022 + Port 22 StrictHostKeyChecking=accept-new ''; } diff --git a/flake.nix b/flake.nix index c41682c..8c5d86f 100644 --- a/flake.nix +++ b/flake.nix @@ -47,11 +47,11 @@ ./hosts/generic/zapret.nix ./hosts/generic/virtualization.nix ./hosts/generic/unfree_allow.nix + ./hosts/generic/plymouth.nix ./hosts/Aphelion/hardware-Aphelion.nix ./hosts/Aphelion/nvidia.nix ./hosts/Aphelion/sunshine.nix ./desktop/gnome.nix - ./misc/disable_suspend.nix ./home/yaroslav/steam.nix home-manager.nixosModules.home-manager { diff --git a/home/yaroslav/home.nix b/home/yaroslav/home.nix index 6d77d00..01fc672 100644 --- a/home/yaroslav/home.nix +++ b/home/yaroslav/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, lib, ... }: let fromGitHub = ref: repo: pkgs.vimUtils.buildVimPlugin { @@ -47,9 +47,11 @@ in }; services.mpd-mpris.enable = true; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "code" "obsidian" "yandex-music" "steam" + "vscode" ]; home.packages = with pkgs; [ mc diff --git a/home/yaroslav/home_gui.nix b/home/yaroslav/home_gui.nix index 0338cba..2e7a763 100644 --- a/home/yaroslav/home_gui.nix +++ b/home/yaroslav/home_gui.nix @@ -1,14 +1,20 @@ { pkgs, ... }: { home.packages = with pkgs; [ + ayugram-desktop + ungoogled-chromium firefox keepassxc + libreoffice-qt6-fresh + obsidian + obs-studio + onlyoffice-desktopeditors remmina prismlauncher kdePackages.kcalc - obs-studio nicotine-plus qbittorrent vscode-fhs + bottles ]; } diff --git a/hosts/Aphelion/hardware-Aphelion.nix b/hosts/Aphelion/hardware-Aphelion.nix index b8eba92..ef29047 100644 --- a/hosts/Aphelion/hardware-Aphelion.nix +++ b/hosts/Aphelion/hardware-Aphelion.nix @@ -20,7 +20,7 @@ #options = [ "subvol=@nixos" ]; device = "none"; fsType = "tmpfs"; - options = [ "defaults" "size=1G" "mode=755" ]; + options = [ "defaults" "size=8G" "mode=755" ]; }; fileSystems."/nix" = diff --git a/hosts/generic/home-persistence.nix b/hosts/generic/home-persistence.nix index 925c2fc..d90ae70 100644 --- a/hosts/generic/home-persistence.nix +++ b/hosts/generic/home-persistence.nix @@ -10,9 +10,15 @@ ".local/share/AyuGramDesktop" ".local/share/PrismLauncher" ".local/share/Steam" + ".local/share/bottles" + ".local/share/backgrounds" ".config/dconf" + ".config/Code" + ".config/libreoffice" + ".vscode" ".mozilla" ".local/state" + ".wine" # XDG User directories "Downloads" "Music" diff --git a/hosts/generic/plymouth.nix b/hosts/generic/plymouth.nix new file mode 100644 index 0000000..a597ee0 --- /dev/null +++ b/hosts/generic/plymouth.nix @@ -0,0 +1,30 @@ +{ pkgs, ... }: { + boot = { + + plymouth = { + enable = true; + theme = "rings"; + themePackages = with pkgs; [ + # By default we would install all themes + (adi1090x-plymouth-themes.override { + selected_themes = [ "rings" ]; + }) + ]; + }; + + # Enable "Silent boot" + consoleLogLevel = 3; + initrd.verbose = false; + kernelParams = [ + "quiet" + "splash" + "boot.shell_on_fail" + "udev.log_priority=3" + "rd.systemd.show_status=auto" + ]; + # Hide the OS choice for bootloaders. + # It's still possible to open the bootloader list by pressing any key + # It will just not appear on screen unless a key is pressed + + }; +}