From 3e9e074cc57aea661a03f0d9638a52922c7e29d9 Mon Sep 17 00:00:00 2001 From: Dmitrii Gudov Date: Fri, 19 Dec 2025 08:04:19 +0300 Subject: [PATCH] end of refactor for now --- new_script.sh => depr/new_script.sh | 0 .../remove-all-bckps.sh | 0 .../update-home-manager.sh | 0 depr/update-nixos.sh | 30 ++++++++++++++++++ flake.nix | 8 ----- home-manager/modules/hypr/hyprland/rules.nix | 4 +++ home-manager/modules/zsh/saved_modes | 2 +- .../modules/zsh/update_system_from_git.sh | 3 -- home-manager/modules/zsh/zsh.nix | 1 - hosts/fenrir-nixos/configuration.nix | 28 +++++------------ hosts/loki-nixos/configuration.nix | 3 -- update-nixos.sh | 31 +------------------ 12 files changed, 44 insertions(+), 66 deletions(-) rename new_script.sh => depr/new_script.sh (100%) rename remove-all-bckps.sh => depr/remove-all-bckps.sh (100%) rename update-home-manager.sh => depr/update-home-manager.sh (100%) create mode 100755 depr/update-nixos.sh diff --git a/new_script.sh b/depr/new_script.sh similarity index 100% rename from new_script.sh rename to depr/new_script.sh diff --git a/remove-all-bckps.sh b/depr/remove-all-bckps.sh similarity index 100% rename from remove-all-bckps.sh rename to depr/remove-all-bckps.sh diff --git a/update-home-manager.sh b/depr/update-home-manager.sh similarity index 100% rename from update-home-manager.sh rename to depr/update-home-manager.sh diff --git a/depr/update-nixos.sh b/depr/update-nixos.sh new file mode 100755 index 0000000..6d678dc --- /dev/null +++ b/depr/update-nixos.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash +set -euo pipefail + +# ---------------- CONFIG ---------------- +SRC_FOLDER="./nixos" # folder in your repo +DEST_FOLDER="/etc/nixos" # target folder +# ---------------------------------------- + +# Check for root +if [[ $EUID -ne 0 ]]; then + echo "This script must be run as root (sudo)." 1>&2 + exit 1 +fi + +echo "Copying files from '$SRC_FOLDER' to '$DEST_FOLDER'..." + +# Backup existing /etc/nixos (optional) +BACKUP_DIR="/etc/nixos.bak.$(date +%Y%m%d%H%M%S)" +echo "Backing up current /etc/nixos to $BACKUP_DIR" +cp -r "$DEST_FOLDER" "$BACKUP_DIR" + +# Copy files +cp -a "$SRC_FOLDER/." "$DEST_FOLDER/" + +echo "Done! Files from '$SRC_FOLDER' have been copied to '$DEST_FOLDER'." +# echo "You may now run 'sudo nixos-rebuild switch' if needed." + +nixos-rebuild switch --fast + +echo "Done!" diff --git a/flake.nix b/flake.nix index b6826f6..fe4ef01 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,6 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.users.${username} = import ./home-manager/home.nix; home-manager.extraSpecialArgs = { inherit inputs username gitName gitEmail; @@ -54,13 +53,6 @@ pkgsFor = system: nixpkgs.legacyPackages.${system}; in { - # homeConfigurations.${username} = - # home-manager.lib.homeManagerConfiguration { - # pkgs = pkgsFor "x86_64-linux"; - # modules = [ ./home-manager/home.nix ]; - # extraSpecialArgs = { inherit inputs username gitName gitEmail; }; - # }; - nixosConfigurations = { loki-nixos = mkHost { hostName = "loki-nixos"; diff --git a/home-manager/modules/hypr/hyprland/rules.nix b/home-manager/modules/hypr/hyprland/rules.nix index 025bb16..2251a8c 100644 --- a/home-manager/modules/hypr/hyprland/rules.nix +++ b/home-manager/modules/hypr/hyprland/rules.nix @@ -12,6 +12,10 @@ "noblur, opacity 1 1, onworkspace:special:s1" "workspace 1, class:.*zen.*" + + "idleinhibit fullscreen, class:^(*)$" + "idleinhibit fullscreen, title:^(*)$" + "idleinhibit fullscreen, fullscreen:1" ]; workspace = [ diff --git a/home-manager/modules/zsh/saved_modes b/home-manager/modules/zsh/saved_modes index c9d458f..c9675bc 100644 --- a/home-manager/modules/zsh/saved_modes +++ b/home-manager/modules/zsh/saved_modes @@ -5,4 +5,4 @@ amnezia (pgrep -x ".AmneziaVPN-ser" > /dev/null 2>&1 || sudo AmneziaVPN-service keeper_bot cd /home/krosh/Documents/Github/tg-keeper && code . battery_stats kitty -1 watch -n1 cat /sys/class/power_supply/BAT1/power_now lab cd /home/krosh/Documents/Github/network-diagrams-tool && code . -nixos_config cd /home/krosh/Documents/Github/nixos-config && code . \ No newline at end of file +nixos_config cd /home/krosh/Documents/Github/nixos-config && code . diff --git a/home-manager/modules/zsh/update_system_from_git.sh b/home-manager/modules/zsh/update_system_from_git.sh index 9e02cf0..76ed377 100644 --- a/home-manager/modules/zsh/update_system_from_git.sh +++ b/home-manager/modules/zsh/update_system_from_git.sh @@ -16,7 +16,6 @@ REMOTE_HASH=$(git rev-parse @{u}) if [ "$LOCAL_HASH" = "$REMOTE_HASH" ]; then echo "The repository is already up to date." - exit 0 else echo "Updates are available. Pulling latest changes..." if ! git pull; then @@ -29,7 +28,5 @@ chmod -R u+rwX "$REPO_DIR" sudo ./update-nixos.sh -./update-home-manager.sh - echo "System update from git completed successfully." diff --git a/home-manager/modules/zsh/zsh.nix b/home-manager/modules/zsh/zsh.nix index 62f8c6a..317519f 100644 --- a/home-manager/modules/zsh/zsh.nix +++ b/home-manager/modules/zsh/zsh.nix @@ -21,7 +21,6 @@ bat ripgrep entr - busybox ]; home.file.".p10k.zsh".source = ./p10k.zsh; diff --git a/hosts/fenrir-nixos/configuration.nix b/hosts/fenrir-nixos/configuration.nix index c88602a..6b81940 100755 --- a/hosts/fenrir-nixos/configuration.nix +++ b/hosts/fenrir-nixos/configuration.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - networking.hostName = "fenrir-nixos"; # Define your hostname. + networking.hostName = "fenrir-nixos"; imports = [ ../../nixos/custom.nix ./hardware-configuration.nix ]; fileSystems."/".options = [ "ssd" "noatime" "compress=zstd" ]; @@ -41,19 +41,7 @@ services.thermald.enable = true; services.power-profiles-daemon.enable = false; - services.auto-cpufreq = { - enable = true; - settings = { - battery = { - governor = "powersave"; - turbo = "never"; - }; - charger = { - governor = "powersave"; - turbo = "auto"; - }; - }; - }; + services.auto-cpufreq = { enable = true; }; # boot.blacklistedKernelModules = # [ "nouveau" "nvidia" "nvidia_drm" "nvidia_modeset" ]; @@ -122,13 +110,13 @@ hardware.nvidia = { open = true; modesetting.enable = true; # полезно и для Wayland/tearing - prime = { - offload.enable = true; - offload.enableOffloadCmd = true; # добавит скрипт `nvidia-offload` + # prime = { + # offload.enable = true; + # offload.enableOffloadCmd = true; # добавит скрипт `nvidia-offload` - # intelBusId = "PCI:0:2:0"; # <-- подставь свои - # nvidiaBusId = "PCI:1:0:0"; # <-- подставь свои - }; + # # intelBusId = "PCI:0:2:0"; # <-- подставь свои + # # nvidiaBusId = "PCI:1:0:0"; # <-- подставь свои + # }; }; programs.uwsm.enable = true; diff --git a/hosts/loki-nixos/configuration.nix b/hosts/loki-nixos/configuration.nix index c70849f..237762b 100644 --- a/hosts/loki-nixos/configuration.nix +++ b/hosts/loki-nixos/configuration.nix @@ -98,9 +98,6 @@ ]; }; - # Install firefox. - programs.firefox.enable = true; - # Allow unfree packages nixpkgs.config.allowUnfree = true; diff --git a/update-nixos.sh b/update-nixos.sh index 6d678dc..d77bb95 100755 --- a/update-nixos.sh +++ b/update-nixos.sh @@ -1,30 +1 @@ -#!/usr/bin/env bash -set -euo pipefail - -# ---------------- CONFIG ---------------- -SRC_FOLDER="./nixos" # folder in your repo -DEST_FOLDER="/etc/nixos" # target folder -# ---------------------------------------- - -# Check for root -if [[ $EUID -ne 0 ]]; then - echo "This script must be run as root (sudo)." 1>&2 - exit 1 -fi - -echo "Copying files from '$SRC_FOLDER' to '$DEST_FOLDER'..." - -# Backup existing /etc/nixos (optional) -BACKUP_DIR="/etc/nixos.bak.$(date +%Y%m%d%H%M%S)" -echo "Backing up current /etc/nixos to $BACKUP_DIR" -cp -r "$DEST_FOLDER" "$BACKUP_DIR" - -# Copy files -cp -a "$SRC_FOLDER/." "$DEST_FOLDER/" - -echo "Done! Files from '$SRC_FOLDER' have been copied to '$DEST_FOLDER'." -# echo "You may now run 'sudo nixos-rebuild switch' if needed." - -nixos-rebuild switch --fast - -echo "Done!" +sudo nixos-rebuild switch --flake .#$(hostname)