From 8cfd0875417589cb67f65ccb0951451e13b03a18 Mon Sep 17 00:00:00 2001 From: Krosh Date: Sat, 15 Nov 2025 01:08:23 +0300 Subject: [PATCH] edit nixos config --- .gitignore | 4 +- nixos/configuration.nix | 225 ------------------------------- nixos/custom.nix | 69 ++++++++++ nixos/hardware-configuration.nix | 43 ------ 4 files changed, 72 insertions(+), 269 deletions(-) delete mode 100755 nixos/configuration.nix create mode 100644 nixos/custom.nix delete mode 100755 nixos/hardware-configuration.nix diff --git a/.gitignore b/.gitignore index 5970e4d..7cfc2f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ for_config/* -home-manager/modules/custom/* \ No newline at end of file +home-manager/modules/custom/* +nixos/configuration.nix +nixos/configuration.nix.bak \ No newline at end of file diff --git a/nixos/configuration.nix b/nixos/configuration.nix deleted file mode 100755 index 10f3a89..0000000 --- a/nixos/configuration.nix +++ /dev/null @@ -1,225 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: - -{ - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - - ]; - - fileSystems."/".options = [ "ssd" "noatime" "compress=zstd:1" ]; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - networking.hostName = "nixos"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - networking.nameservers = [ "8.8.8.8" "1.1.1.1" ]; - # networking.proxy.default = - # "http://VVM8MipXHu:rZVMKEwSx9@mandarin-indicolite11678.my-vm.work:45162"; - # networking.proxy.noProxy = "127.0.0.1,localhost,::1"; - - # environment.variables = { - # http_proxy = - # "http://VVM8MipXHu:rZVMKEwSx9@mandarin-indicolite11678.my-vm.work:45162"; - # https_proxy = - # "http://VVM8MipXHu:rZVMKEwSx9@mandarin-indicolite11678.my-vm.work:45162"; - # HTTP_PROXY = - # "http://VVM8MipXHu:rZVMKEwSx9@mandarin-indicolite11678.my-vm.work:45162"; - # HTTPS_PROXY = - # "http://VVM8MipXHu:rZVMKEwSx9@mandarin-indicolite11678.my-vm.work:45162"; - # no_proxy = "127.0.0.1,localhost,::1"; - # NO_PROXY = "127.0.0.1,localhost,::1"; - # }; - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager = { - enable = true; - insertNameservers = [ "1.1.1.1" "8.8.8.8" ]; - }; - - # Set your time zone. - time.timeZone = "Europe/Moscow"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "ru_RU.UTF-8"; - LC_IDENTIFICATION = "ru_RU.UTF-8"; - LC_MEASUREMENT = "ru_RU.UTF-8"; - LC_MONETARY = "ru_RU.UTF-8"; - LC_NAME = "ru_RU.UTF-8"; - LC_NUMERIC = "ru_RU.UTF-8"; - LC_PAPER = "ru_RU.UTF-8"; - LC_TELEPHONE = "ru_RU.UTF-8"; - LC_TIME = "ru_RU.UTF-8"; - }; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us,ru"; - variant = ""; - options = "grp:win_space_toggle"; - }; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable sound with pipewire. - services.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.enable = true; - }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.krosh = { - isNormalUser = true; - description = "Krosh"; - extraGroups = [ "networkmanager" "wheel" ]; - }; - - # Install firefox. - programs.firefox.enable = true; - - nixpkgs.config.allowUnfree = true; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - pkgs.kitty - # pkgs.hiddify-app - amnezia-vpn - ]; - - systemd.services.amnezia-vpn = { - description = "AmneziaVPN Service"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - ExecStart = "${pkgs.amnezia-vpn}/bin/AmneziaVPN-service"; - Restart = "on-failure"; - }; - }; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # 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 - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "25.05"; # Did you read the comment? - - programs.neovim = { - enable = true; - configure = { - customRC = '' - set runtimepath^=${pkgs.vimPlugins.jellybeans-vim} - colorscheme jellybeans - set number - set cc=80 - set list - set listchars=tab:→\ ,space:·,nbsp:␣,trail:•,eol:¶,precedes:«,extends:» - if &diff - colorscheme blue - endif - ''; - packages.myVimPackage = with pkgs.vimPlugins; { start = [ ctrlp ]; }; - }; - }; - - programs.neovim = { defaultEditor = true; }; - - programs.hyprland = { - enable = true; - # withUWSM = true; # recommended for most users - # xwayland.enable = true; # Xwayland can be disabled. - }; - - programs.zsh.enable = true; - users.users.krosh.shell = pkgs.zsh; - - boot = { - - plymouth = { - enable = true; - theme = "connect"; - themePackages = with pkgs; - [ - # By default we would install all themes - (adi1090x-plymouth-themes.override { - selected_themes = [ "connect" ]; - }) - ]; - }; - - # 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 - loader.timeout = 0; - - }; - security.polkit.enable = true; - # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest; - - environment.sessionVariables.NIXOS_OZONE_WL = "1"; -} diff --git a/nixos/custom.nix b/nixos/custom.nix new file mode 100644 index 0000000..1f9cba5 --- /dev/null +++ b/nixos/custom.nix @@ -0,0 +1,69 @@ +{ config, pkgs, ... }: + +{ + 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 ]; + + systemd.services.amnezia-vpn = { + description = "AmneziaVPN Service"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.amnezia-vpn}/bin/AmneziaVPN-service"; + Restart = "on-failure"; + }; + }; + + programs.neovim = { + enable = true; + defaultEditor = true; + configure = { + customRC = '' + set runtimepath^=${pkgs.vimPlugins.jellybeans-vim} + colorscheme jellybeans + set number + set cc=80 + set list + set listchars=tab:→\ ,space:·,nbsp:␣,trail:•,eol:¶,precedes:«,extends:» + if &diff + colorscheme blue + endif + ''; + packages.myVimPackage = with pkgs.vimPlugins; { start = [ ctrlp ]; }; + }; + }; + + programs.zsh.enable = true; + + boot = { + + plymouth = { + enable = true; + theme = "connect"; + themePackages = with pkgs; + [ + (adi1090x-plymouth-themes.override { + selected_themes = [ "connect" ]; + }) + ]; + }; + + consoleLogLevel = 3; + initrd.verbose = false; + kernelParams = [ + "quiet" + "splash" + "boot.shell_on_fail" + "udev.log_priority=3" + "rd.systemd.show_status=auto" + ]; + loader.timeout = 0; + }; +} diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix deleted file mode 100755 index 74cf09f..0000000 --- a/nixos/hardware-configuration.nix +++ /dev/null @@ -1,43 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/679969dd-4c5e-47bd-94ab-95cbb1fc5bd3"; - fsType = "btrfs"; - options = [ - "subvol=@" - ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5584-3E01"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = [ ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} -