some upd
This commit is contained in:
+10
-27
@@ -2,51 +2,34 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [ nixfmt-classic ];
|
||||||
# gnomeExtensions.paperwm
|
|
||||||
nixfmt-classic
|
|
||||||
];
|
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
./modules/zsh/zsh.nix
|
./modules/zsh/zsh.nix
|
||||||
./modules/kitty.nix
|
./modules/kitty.nix
|
||||||
./modules/git.nix
|
./modules/git.nix
|
||||||
|
./modules/programs.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# dconf = {
|
home.pointerCursor = let
|
||||||
# enable = true;
|
|
||||||
# settings = {
|
|
||||||
# "org/gnome/shell" = {
|
|
||||||
# enabled-extensions = [
|
|
||||||
# "paperwm@paperwm.github.com"
|
|
||||||
# ];
|
|
||||||
# };
|
|
||||||
# "org/gnome/desktop/interface".show-battery-percentage = true;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
home.pointerCursor =
|
|
||||||
let
|
|
||||||
getFrom = url: hash: name: {
|
getFrom = url: hash: name: {
|
||||||
gtk.enable = true;
|
gtk.enable = true;
|
||||||
x11.enable = true;
|
x11.enable = true;
|
||||||
name = name;
|
name = name;
|
||||||
size = 48;
|
size = 48;
|
||||||
package =
|
package = pkgs.runCommand "moveUp" { } ''
|
||||||
pkgs.runCommand "moveUp" {} ''
|
|
||||||
mkdir -p $out/share/icons
|
mkdir -p $out/share/icons
|
||||||
ln -s ${pkgs.fetchzip {
|
ln -s ${
|
||||||
|
pkgs.fetchzip {
|
||||||
url = url;
|
url = url;
|
||||||
hash = hash;
|
hash = hash;
|
||||||
}} $out/share/icons/${name}
|
}
|
||||||
|
} $out/share/icons/${name}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in getFrom
|
||||||
getFrom
|
|
||||||
"https://github.com/ful1e5/fuchsia-cursor/releases/download/v2.0.0/Fuchsia-Pop.tar.gz"
|
"https://github.com/ful1e5/fuchsia-cursor/releases/download/v2.0.0/Fuchsia-Pop.tar.gz"
|
||||||
"sha256-BvVE9qupMjw7JRqFUj1J0a4ys6kc9fOLBPx2bGaapTk="
|
"sha256-BvVE9qupMjw7JRqFUj1J0a4ys6kc9fOLBPx2bGaapTk=" "Fuchsia-Pop";
|
||||||
"Fuchsia-Pop";
|
|
||||||
|
|
||||||
|
|
||||||
home.username = "krosh";
|
home.username = "krosh";
|
||||||
home.homeDirectory = "/home/krosh";
|
home.homeDirectory = "/home/krosh";
|
||||||
|
|||||||
@@ -4,7 +4,9 @@
|
|||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
userName = "Krosh";
|
settings.user = {
|
||||||
userEmail = "gudovdo@my.msu.ru";
|
name = "Krosh";
|
||||||
|
email = "gudovdo@my.msu.ru";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
home.packages = with pkgs; [ hyprland ];
|
||||||
|
|
||||||
|
home.file.".config/hypr/hyprland.conf".text = ''
|
||||||
|
# Minimal Hyprland config
|
||||||
|
|
||||||
|
# General settings
|
||||||
|
general {
|
||||||
|
dpi=96
|
||||||
|
}
|
||||||
|
|
||||||
|
# Example monitor line — replace with your output name and resolution
|
||||||
|
monitor= eDP-1, 1920x1080@60, 0, 0, 1
|
||||||
|
|
||||||
|
# Basic keybindings (SUPER is the meta/windows key)
|
||||||
|
bind=SUPER+ENTER, exec, alacritty
|
||||||
|
bind=SUPER+D, exec, dmenu_run
|
||||||
|
bind=SUPER+Q, killactive
|
||||||
|
|
||||||
|
# Simple floating example (adjust class/title as needed)
|
||||||
|
windowrulev2 = float,class: Pavucontrol
|
||||||
|
|
||||||
|
# Add any startup commands here (uncomment and edit)
|
||||||
|
# exec = seatd,enabled
|
||||||
|
'';
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{ }
|
||||||
+41
-19
@@ -11,11 +11,7 @@
|
|||||||
<home-manager/nixos>
|
<home-manager/nixos>
|
||||||
];
|
];
|
||||||
|
|
||||||
fileSystems."/".options = [
|
fileSystems."/".options = [ "ssd" "noatime" "compress=zstd:1" ];
|
||||||
"ssd"
|
|
||||||
"noatime"
|
|
||||||
"compress=zstd:1"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Bootloader.
|
# Bootloader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
@@ -25,11 +21,31 @@
|
|||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
|
|
||||||
# Configure network proxy if necessary
|
# 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.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";
|
||||||
|
|
||||||
# Enable networking
|
# Enable networking
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager = {
|
||||||
|
enable = true;
|
||||||
|
insertNameservers = [ "1.1.1.1" "8.8.8.8" ];
|
||||||
|
};
|
||||||
|
|
||||||
# Set your time zone.
|
# Set your time zone.
|
||||||
time.timeZone = "Europe/Moscow";
|
time.timeZone = "Europe/Moscow";
|
||||||
@@ -89,10 +105,7 @@
|
|||||||
users.users.krosh = {
|
users.users.krosh = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Krosh";
|
description = "Krosh";
|
||||||
extraGroups = [
|
extraGroups = [ "networkmanager" "wheel" ];
|
||||||
"networkmanager"
|
|
||||||
"wheel"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Install firefox.
|
# Install firefox.
|
||||||
@@ -104,9 +117,21 @@
|
|||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
pkgs.kitty
|
pkgs.kitty
|
||||||
pkgs.hiddify-app
|
# 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
|
# 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;
|
||||||
@@ -124,7 +149,7 @@
|
|||||||
# 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
|
||||||
@@ -148,15 +173,11 @@
|
|||||||
colorscheme blue
|
colorscheme blue
|
||||||
endif
|
endif
|
||||||
'';
|
'';
|
||||||
packages.myVimPackage = with pkgs.vimPlugins; {
|
packages.myVimPackage = with pkgs.vimPlugins; { start = [ ctrlp ]; };
|
||||||
start = [ ctrlp ];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.neovim = {
|
programs.neovim = { defaultEditor = true; };
|
||||||
defaultEditor = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.hyprland = {
|
programs.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -172,7 +193,8 @@
|
|||||||
plymouth = {
|
plymouth = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = "connect";
|
theme = "connect";
|
||||||
themePackages = with pkgs; [
|
themePackages = with pkgs;
|
||||||
|
[
|
||||||
# By default we would install all themes
|
# By default we would install all themes
|
||||||
(adi1090x-plymouth-themes.override {
|
(adi1090x-plymouth-themes.override {
|
||||||
selected_themes = [ "connect" ];
|
selected_themes = [ "connect" ];
|
||||||
|
|||||||
Reference in New Issue
Block a user