From 257c6d2eedf58e53919dd480dab8fdfa9c68b9cc Mon Sep 17 00:00:00 2001 From: Dmitrii Gudov Date: Sat, 13 Dec 2025 17:00:40 +0300 Subject: [PATCH] some edit --- home-manager/flake.nix | 2 +- home-manager/home.nix | 34 ++++++------------------------ home-manager/modules/cursor.nix | 24 +++++++++++++++++++++ home-manager/modules/hypr/hypr.nix | 2 +- home-manager/modules/programs.nix | 1 + update-nixos.sh | 2 +- 6 files changed, 34 insertions(+), 31 deletions(-) create mode 100644 home-manager/modules/cursor.nix diff --git a/home-manager/flake.nix b/home-manager/flake.nix index f47bf3d..e595cfa 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -25,7 +25,7 @@ home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.${system}; modules = [ ./home.nix ]; - extraSpecialArgs = { inherit inputs; }; + extraSpecialArgs = { inherit inputs username; }; }; }; } diff --git a/home-manager/home.nix b/home-manager/home.nix index ccd6fdc..373d176 100755 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,9 +1,9 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, username, ... }: # TODO: add OCR keybind on gnome { + programs.home-manager.enable = true; nixpkgs.config.allowUnfree = true; - home.packages = with pkgs; [ nixfmt-classic ]; imports = [ ./modules/zsh/zsh.nix @@ -11,36 +11,14 @@ ./modules/git.nix ./modules/programs.nix ./modules/tmux.nix + ./modules/cursor.nix ] ++ lib.optional (builtins.getEnv "DISABLE_HYPR" != "1") ./modules/hypr/hypr.nix ++ lib.optional (builtins.pathExists ./modules/my.nix) ./modules/my.nix; - home.pointerCursor = let - getFrom = url: hash: name: { - gtk.enable = true; - x11.enable = true; - name = name; - size = 48; - package = pkgs.runCommand "moveUp" { } '' - mkdir -p $out/share/icons - ln -s ${ - - pkgs.fetchzip { - url = url; - hash = hash; - } - } $out/share/icons/${name} - ''; - }; - in getFrom - "https://github.com/catppuccin/cursors/releases/download/v2.0.0/catppuccin-mocha-dark-cursors.zip" - "sha256-EbBzbSBalFx6oo85I7at/wYyoGZuJxIbOWBNrfqHey0=" "Catppuccin-Mocha-Dark"; - # TODO: make it universal - home.username = "krosh"; - home.homeDirectory = "/home/krosh"; - home.stateVersion = "25.11"; - programs.home-manager.enable = true; - home.enableNixpkgsReleaseCheck = false; + home.username = username; + home.homeDirectory = "/home/${username}"; + home.stateVersion = "25.11"; } diff --git a/home-manager/modules/cursor.nix b/home-manager/modules/cursor.nix new file mode 100644 index 0000000..4cdcb40 --- /dev/null +++ b/home-manager/modules/cursor.nix @@ -0,0 +1,24 @@ +{ config, pkgs, lib, ... }: + +{ + home.pointerCursor = let + getFrom = url: hash: name: { + gtk.enable = true; + x11.enable = true; + name = name; + size = 48; + package = pkgs.runCommand "moveUp" { } '' + mkdir -p $out/share/icons + ln -s ${ + + pkgs.fetchzip { + url = url; + hash = hash; + } + } $out/share/icons/${name} + ''; + }; + in getFrom + "https://github.com/catppuccin/cursors/releases/download/v2.0.0/catppuccin-mocha-dark-cursors.zip" + "sha256-EbBzbSBalFx6oo85I7at/wYyoGZuJxIbOWBNrfqHey0=" "Catppuccin-Mocha-Dark"; +} diff --git a/home-manager/modules/hypr/hypr.nix b/home-manager/modules/hypr/hypr.nix index 4dfcde2..4622418 100644 --- a/home-manager/modules/hypr/hypr.nix +++ b/home-manager/modules/hypr/hypr.nix @@ -68,7 +68,7 @@ debug = { disable_logs = false; }; monitor = [ - "eDP-1,preferred,auto,1.333333" + "eDP-1,preferred,auto,1.25" "HDMI-A-1,preferred,auto-left,auto" "HDMI-A-2,preferred,auto-left,auto" ]; diff --git a/home-manager/modules/programs.nix b/home-manager/modules/programs.nix index 23a7536..03739c0 100644 --- a/home-manager/modules/programs.nix +++ b/home-manager/modules/programs.nix @@ -8,6 +8,7 @@ vscode spotify obsidian + nixfmt-classic # lmstudio plantuml # amnezia-vpn diff --git a/update-nixos.sh b/update-nixos.sh index b3a4c19..6d678dc 100755 --- a/update-nixos.sh +++ b/update-nixos.sh @@ -25,6 +25,6 @@ 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 +nixos-rebuild switch --fast echo "Done!"