mirror of https://github.com/Horhik/dotfiles.git
resolve conflict
This commit is contained in:
horhik
commit
4bab073456
|
|
@ -25,201 +25,201 @@
|
||||||
|
|
||||||
|
|
||||||
];
|
];
|
||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.loader.grub.device = "/dev/nvme0n1";
|
boot.loader.grub.device = "/dev/nvme0n1";
|
||||||
boot.loader.grub.useOSProber = true;
|
boot.loader.grub.useOSProber = true;
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nixpkgs.config.allowBroken = true;
|
nixpkgs.config.allowBroken = true;
|
||||||
networking.hostName = "lap"; # Define your hostname.
|
networking.hostName = "lap"; # Define your hostname.
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
MAIN_DISK="/dev/nvme0n1";
|
MAIN_DISK="/dev/nvme0n1";
|
||||||
TERMINAL="alacritty";
|
TERMINAL="alacritty";
|
||||||
};
|
};
|
||||||
# let inputs = {
|
# let inputs = {
|
||||||
# home-manager = {
|
# home-manager = {
|
||||||
# url = "github:rycee/home-manager/release-20.09";
|
# url = "github:rycee/home-manager/release-20.09";
|
||||||
# inputs = {
|
# inputs = {
|
||||||
# nixpkgs.follows = "nixpkgs";
|
# nixpkgs.follows = "nixpkgs";
|
||||||
# };
|
# };
|
||||||
# };
|
# };
|
||||||
# nur.url = "github:nix-community/NUR";
|
# nur.url = "github:nix-community/NUR";
|
||||||
# emacs-overlay.url = "github:nix-community/emacs-overlay";
|
# emacs-overlay.url = "github:nix-community/emacs-overlay";
|
||||||
# neovim-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
# neovim-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
||||||
#
|
#
|
||||||
# nixpkgs.url = "github:nixos/nixpkgs/nixos-20.09";
|
# nixpkgs.url = "github:nixos/nixpkgs/nixos-20.09";
|
||||||
# unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
# unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
# master.url = "github:nixos/nixpkgs/master";
|
# master.url = "github:nixos/nixpkgs/master";
|
||||||
#};
|
#};
|
||||||
#
|
#
|
||||||
# nur = final: prev: {
|
# nur = final: prev: {
|
||||||
# nur = import inputs.nur { nurpkgs = final.unstable; pkgs = final.unstable; };
|
# nur = import inputs.nur { nurpkgs = final.unstable; pkgs = final.unstable; };
|
||||||
# };
|
# };
|
||||||
# networking.wireless.enable = true;
|
# networking.wireless.enable = true;
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# networks={
|
# networks={
|
||||||
# Goga = {
|
# Goga = {
|
||||||
# hidden = true;
|
# hidden = true;
|
||||||
# pskRaw = "aaeb0f9e9709a1f25bc93d34290054849e3f8b37071801bbfa4eef5e2eac5084";
|
# pskRaw = "aaeb0f9e9709a1f25bc93d34290054849e3f8b37071801bbfa4eef5e2eac5084";
|
||||||
# };
|
# };
|
||||||
# };
|
# };
|
||||||
# };
|
# };
|
||||||
# Set your time zone.
|
# Set your time zone.
|
||||||
time.timeZone = "Europe/Moscow";
|
time.timeZone = "Europe/Moscow";
|
||||||
|
|
||||||
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
|
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
|
||||||
# Per-interface useDHCP will be mandatory in the future, so this generated config
|
# Per-interface useDHCP will be mandatory in the future, so this generated config
|
||||||
# replicates the default behaviour.
|
# replicates the default behaviour.
|
||||||
networking.useDHCP = false;
|
networking.useDHCP = false;
|
||||||
networking.interfaces.wlp2s0.useDHCP = true;
|
networking.interfaces.wlp2s0.useDHCP = true;
|
||||||
|
|
||||||
# Configure network proxy if necessary
|
# Configure network proxy if necessary
|
||||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||||
|
|
||||||
# Select internationalisation properties.
|
# Select internationalisation properties.
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
console = {
|
console = {
|
||||||
font = "Lat2-Terminus16";
|
font = "Lat2-Terminus16";
|
||||||
keyMap = "us";
|
keyMap = "us";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Configure keymap in X11
|
# Configure keymap in X11
|
||||||
# Enable CUPS to print documents.
|
# Enable CUPS to print documents.
|
||||||
services.printing.enable = true;
|
services.printing.enable = true;
|
||||||
services.blueman.enable = true;
|
services.blueman.enable = true;
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
# Enable sound.
|
# Enable sound.
|
||||||
|
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
# Enable touchpad support (enabled default in most desktopManager).
|
||||||
services.xserver.libinput.enable = true;
|
services.xserver.libinput.enable = true;
|
||||||
services.xserver.libinput.touchpad.tapping = true;
|
services.xserver.libinput.touchpad.tapping = true;
|
||||||
services.xserver.libinput.touchpad.disableWhileTyping = true;
|
services.xserver.libinput.touchpad.disableWhileTyping = true;
|
||||||
# TODO create touchpad.nix
|
# TODO create touchpad.nix
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
users.defaultUserShell = pkgs.zsh;
|
users.defaultUserShell = pkgs.zsh;
|
||||||
users.users.horhik = {
|
users.users.horhik = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "networkmanager" "audio" "docker" "light" "adbusers" ]; # Enable ‘sudo’ for the user.
|
extraGroups = [ "wheel" "networkmanager" "audio" "docker" "light" "adbusers" ]; # Enable ‘sudo’ for the user.
|
||||||
};
|
};
|
||||||
system.autoUpgrade.enable = true;
|
system.autoUpgrade.enable = true;
|
||||||
system.autoUpgrade.channel = https://nixos.org/channels/nixos-unstable;
|
system.autoUpgrade.channel = https://nixos.org/channels/nixos-unstable;
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
papirus-icon-theme pop-gtk-theme
|
papirus-icon-theme pop-gtk-theme
|
||||||
wget git vim neovim emacs alacritty xterm zsh tmux stow dunst
|
wget git vim neovim emacs alacritty xterm zsh tmux stow dunst
|
||||||
# haskellPackages.xmonad haskellPackages.xmonad-contrib haskellPackages.xmonad-utils
|
# haskellPackages.xmonad haskellPackages.xmonad-contrib haskellPackages.xmonad-utils
|
||||||
haskellPackages.xmobar
|
haskellPackages.xmobar
|
||||||
tabbed
|
tabbed
|
||||||
i3 surf dmenu st qutebrowser
|
i3 surf dmenu st qutebrowser
|
||||||
lightdm rofi nitrogen rofi-emoji
|
lightdm rofi nitrogen rofi-emoji
|
||||||
mononoki fontmatrix
|
mononoki fontmatrix
|
||||||
firefox
|
firefox
|
||||||
connman
|
connman
|
||||||
wpa_supplicant python3 xkblayout-state acpi yaru-theme
|
wpa_supplicant python3 xkblayout-state acpi yaru-theme
|
||||||
pipewire pulsemixer nerdfonts
|
pipewire pulsemixer nerdfonts
|
||||||
feh compton ninja meson cmake
|
feh compton ninja meson cmake
|
||||||
anki clang_12 llvmPackages_12.libcxxabi
|
anki clang_12 zathura redshift rustup neofetch tree
|
||||||
zathura redshift rustup neofetch tree
|
killall audacity thefuck
|
||||||
killall audacity thefuck
|
polkit etcher gsettings-qt appimage-run pamixer unzip qjackctl gnome3.nautilus bluez pkgconfig pavucontrol bpytop
|
||||||
polkit etcher gsettings-qt appimage-run pamixer unzip qjackctl gnome3.nautilus bluez pkgconfig pavucontrol bpytop
|
#nur.repos.reedrw.picom-next-ibhagwan
|
||||||
#nur.repos.reedrw.picom-next-ibhagwan
|
spotify obsidian discord
|
||||||
spotify obsidian discord
|
nfs-utils cifs-utils
|
||||||
];
|
nfs-ganesha
|
||||||
|
];
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
# started in user sessions.
|
# started in user sessions.
|
||||||
# programs.mtr.enable = true;
|
# programs.mtr.enable = true;
|
||||||
# programs.gnupg.agent = {
|
# programs.gnupg.agent = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# enableSSHSupport = true;
|
# enableSSHSupport = true;
|
||||||
# };
|
# };
|
||||||
|
|
||||||
# List services that you want to enable:
|
# List services that you want to enable:
|
||||||
|
|
||||||
# Enable the OpenSSH daemon.
|
# Enable the OpenSSH daemon.
|
||||||
# services.openssh.enable = true;
|
# services.openssh.enable = true;
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the firewall.
|
||||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||||
# Or disable the firewall altogether.
|
# Or disable the firewall altogether.
|
||||||
# networking.firewall.enable = false;
|
# 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
|
||||||
# this value at the release version of the first install of this system.
|
# this value at the release version of the first install of this system.
|
||||||
# Before changing this value read the documentation for this option
|
# Before changing this value read the documentation for this option
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
# system.stateVersion = "20.09"; # Did you read the comment?
|
# system.stateVersion = "20.09"; # Did you read the comment?
|
||||||
### OH MY ZSH ###
|
### OH MY ZSH ###
|
||||||
|
|
||||||
#programs.zsh.interactiveShellInit = ''
|
#programs.zsh.interactiveShellInit = ''
|
||||||
# export ZSH=${pkgs.oh-my-zsh}/share/oh-my-zsh/
|
# export ZSH=${pkgs.oh-my-zsh}/share/oh-my-zsh/
|
||||||
# export CC=/usr/bin/clang
|
# export CC=/usr/bin/clang
|
||||||
# export CXX=/usr/bin/clang++
|
# export CXX=/usr/bin/clang++
|
||||||
# export _JAVA_AWT_WM_NONREPARENTING=1
|
# export _JAVA_AWT_WM_NONREPARENTING=1
|
||||||
# export ANDROID_SDK_ROOT=/home/horhik/Android/Sdk/
|
# export ANDROID_SDK_ROOT=/home/horhik/Android/Sdk/
|
||||||
# export NDK_HOME=/home/horhik/Android/Sdk/ndk/22.0.7026061/
|
# export NDK_HOME=/home/horhik/Android/Sdk/ndk/22.0.7026061/
|
||||||
# ZSH_THEME="cloud"
|
# ZSH_THEME="cloud"
|
||||||
# plugins=(git colorize colored-man-pages emoji rustup sudo zsh-syntax-highlighting zsh-autosuggestions zsh-completions)
|
# plugins=(git colorize colored-man-pages emoji rustup sudo zsh-syntax-highlighting zsh-autosuggestions zsh-completions)
|
||||||
# autoload -U compinit && compinit
|
# autoload -U compinit && compinit
|
||||||
# source $ZSH/oh-my-zsh.sh
|
# source $ZSH/oh-my-zsh.sh
|
||||||
# export PATH=$HOME/.local/bin:$PATH
|
# export PATH=$HOME/.local/bin:$PATH
|
||||||
# export PATH=/usr/local/bin:$PATH
|
# export PATH=/usr/local/bin:$PATH
|
||||||
# export PATH=$HOME/.cargo/bin:$PATH
|
# export PATH=$HOME/.cargo/bin:$PATH
|
||||||
# export PATH=$HOME/.emacs.d/bin:$PATH
|
# export PATH=$HOME/.emacs.d/bin:$PATH
|
||||||
# export PATH=$HOME/Desktop:$PATH
|
# export PATH=$HOME/Desktop:$PATH
|
||||||
# export PATH=/home/horhik/code/projects/potato-notify:$PATH
|
# export PATH=/home/horhik/code/projects/potato-notify:$PATH
|
||||||
# export PATH="/root/.deno/bin:$PATH"
|
# export PATH="/root/.deno/bin:$PATH"
|
||||||
# alias vim=nvim
|
# alias vim=nvim
|
||||||
# alias vi=vim
|
# alias vi=vim
|
||||||
# alias libvirtdaemon="sudo start-stop-daemon --start libvirtd"
|
# alias libvirtdaemon="sudo start-stop-daemon --start libvirtd"
|
||||||
# alias virtm="sudo start-stop-daemon --start virtlogd &; sudo start-stop-daemon --start libvirtd &; virt-manager &"
|
# alias virtm="sudo start-stop-daemon --start virtlogd &; sudo start-stop-daemon --start libvirtd &; virt-manager &"
|
||||||
# alias clip=xclip -selection clipboard
|
# alias clip=xclip -selection clipboard
|
||||||
# alias suspend="loginctl suspend"
|
# alias suspend="loginctl suspend"
|
||||||
# if [ -f '/home/horhik/yandex-cloud/path.bash.inc' ]; then source '/home/horhik/yandex-cloud/path.bash.inc'; fi
|
# if [ -f '/home/horhik/yandex-cloud/path.bash.inc' ]; then source '/home/horhik/yandex-cloud/path.bash.inc'; fi
|
||||||
# if [ -f '/home/horhik/yandex-cloud/completion.zsh.inc' ]; then source '/home/horhik/yandex-cloud/completion.zsh.inc'; fi
|
# if [ -f '/home/horhik/yandex-cloud/completion.zsh.inc' ]; then source '/home/horhik/yandex-cloud/completion.zsh.inc'; fi
|
||||||
# alias rd='rustc -g --emit="obj,link"'
|
# alias rd='rustc -g --emit="obj,link"'
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# alias rdr=compile_and_run
|
# alias rdr=compile_and_run
|
||||||
# alias aia=ankiaudio
|
# alias aia=ankiaudio
|
||||||
# alias picom="killall picom; picom --experimental-backends &;"
|
# alias picom="killall picom; picom --experimental-backends &;"
|
||||||
# alias cc="cargo check"
|
# alias cc="cargo check"
|
||||||
# alias ct="cargo test"
|
# alias ct="cargo test"
|
||||||
# alias gc="git clone"
|
# alias gc="git clone"
|
||||||
# alias gs="git status"
|
# alias gs="git status"
|
||||||
# alias vim="nvim"
|
# alias vim="nvim"
|
||||||
#
|
#
|
||||||
# neofetch
|
# neofetch
|
||||||
#
|
#
|
||||||
# eval $(thefuck --alias)
|
# eval $(thefuck --alias)
|
||||||
# source $ZSH/oh-my-zsh.sh
|
# source $ZSH/oh-my-zsh.sh
|
||||||
#'';
|
#'';
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
### FONTS ###
|
### FONTS ###
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
programs.adb.enable = true;
|
programs.adb.enable = true;
|
||||||
services.emacs.package = pkgs.emacsUnstable;
|
services.emacs.package = pkgs.emacsUnstable;
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
(import (builtins.fetchTarball {
|
|
||||||
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
|
|
||||||
sha256 = "0c2p2ycx6c50rzfd5k56cc411cb0ilhc3zyhhxlwcjnz1ysn5laj";
|
|
||||||
}))
|
|
||||||
];
|
|
||||||
|
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(import (builtins.fetchTarball {
|
||||||
|
url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
|
||||||
|
sha256 = "0c2p2ycx6c50rzfd5k56cc411cb0ilhc3zyhhxlwcjnz1ysn5laj";
|
||||||
|
}))
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue