From 8c848be9e246e9dc9913c998ce455e10efe15496 Mon Sep 17 00:00:00 2001 From: Krosh Date: Sun, 7 Dec 2025 19:04:23 +0300 Subject: [PATCH] some upd --- flake.nix | 18 -- home-manager/flake.lock | 162 ++++++++++++++++-- home-manager/flake.nix | 4 +- home-manager/modules/hypr/hypr.nix | 3 + .../modules/hypr/hyprland/keybinds.nix | 4 +- home-manager/modules/hypr/hyprlock.nix | 2 +- home-manager/modules/programs.nix | 27 +++ 7 files changed, 187 insertions(+), 33 deletions(-) delete mode 100644 flake.nix diff --git a/flake.nix b/flake.nix deleted file mode 100644 index aa2ffaf..0000000 --- a/flake.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - description = "NixOS configuration for my personal setup"; - - inputs = { }; - - outputs = { self, nixpkgs, ... }: - let systems = [ "x86_64-linux" ]; - in { - nixosConfigurations = lib.genAttrs systems (system: - let pkgs = nixpkgs.legacyPackages.${system}; - in nixpkgs.lib.nixosSystem { - inherit system; - modules = [ ./nixos/configuration.nix ]; - specialArgs = { inherit pkgs; }; - }); - }; - -} diff --git a/home-manager/flake.lock b/home-manager/flake.lock index b00cc73..ee05f89 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -1,5 +1,58 @@ { "nodes": { + "fenix": { + "inputs": { + "nixpkgs": [ + "todo", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1649140024, + "narHash": "sha256-SZLyRjOqmCevSFlxLvV6Zy/Hzu4AfYmZQqerLBNJa8A=", + "owner": "nix-community", + "repo": "fenix", + "rev": "2af3ac5c6ee0e353e055241e21ca4710714a1394", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -7,43 +60,130 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } }, + "naersk": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1649096192, + "narHash": "sha256-7O8e+eZEYeU+ET98u/zW5epuoN/xYx9G+CIh4DjZVzY=", + "owner": "nmattia", + "repo": "naersk", + "rev": "d626f73332a8f587b613b0afe7293dd0777be07d", + "type": "github" + }, + "original": { + "owner": "nmattia", + "repo": "naersk", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1764983851, + "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1648219316, + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1648219316, + "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixpkgs-unstable", + "type": "indirect" + } + }, "root": { "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", + "todo": "todo", "zen-browser": "zen-browser" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1649102917, + "narHash": "sha256-xBjxve7+0sIYlxlGLHjJV0DNmNC6GFlvLT+ura1cht8=", + "owner": "rust-analyzer", + "repo": "rust-analyzer", + "rev": "5a6918f1c4e9d4f0c6a655e6283470f64edd64cf", + "type": "github" + }, + "original": { + "owner": "rust-analyzer", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "todo": { + "inputs": { + "fenix": "fenix", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "naersk": "naersk", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1742851551, + "narHash": "sha256-Kpa9f2MVduKjS9uHhj8qqO94XfF04zHlV/wXncB3umw=", + "owner": "sioodmy", + "repo": "todo", + "rev": "02a002153a4536a15a9fd3b5ddbeed93aff80780", + "type": "github" + }, + "original": { + "owner": "sioodmy", + "repo": "todo", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": [ @@ -54,11 +194,11 @@ ] }, "locked": { - "lastModified": 1763663426, - "narHash": "sha256-txr1cH5j+b14jYGvE0BQE/6OgSyHQqGoeeEFlJz7Q8o=", + "lastModified": 1765084755, + "narHash": "sha256-Da6OF+dMG/L8IRrWE7bgJPclrh6e8BJCUs0mp8V9MsA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "34fd0de7cea96cab0307cf07aa5723b60fd775ef", + "rev": "3865973f52b821abc9c1cb2b21245391de42cc79", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index b362130..f47bf3d 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -1,9 +1,9 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home-manager/modules/hypr/hypr.nix b/home-manager/modules/hypr/hypr.nix index 5f02fb5..6ed183d 100644 --- a/home-manager/modules/hypr/hypr.nix +++ b/home-manager/modules/hypr/hypr.nix @@ -36,6 +36,7 @@ pywal jq ]; + programs.vicinae.enable = true; services.swww.enable = true; programs.hyprpanel = { enable = true; @@ -52,6 +53,7 @@ enable = true; plugins = [ pkgs.hyprlandPlugins.hyprexpo ]; settings = { + layerrule = [ "noanim, vicinae" "blur,vicinae" "ignorealpha 0, vicinae" ]; env = [ "XCURSOR_SIZE,24" "HYPRCURSOR_SIZE,24" ]; exec-once = [ @@ -61,6 +63,7 @@ # "(swww-daemon &) && sleep 2 && swww img /home/krosh/Pictures/wallpaper.png" # "hyprctl hyprpaper reload ,~/Pictures/wallpaper.png" "hyprpanel &" + "vicinae server &" "gsettings set org.gnome.desktop.interface cursor-theme '${config.home.pointerCursor.name}'" "gsettings set org.gnome.desktop.interface cursor-size ${ toString config.home.pointerCursor.size diff --git a/home-manager/modules/hypr/hyprland/keybinds.nix b/home-manager/modules/hypr/hyprland/keybinds.nix index 4e15413..50e732c 100644 --- a/home-manager/modules/hypr/hyprland/keybinds.nix +++ b/home-manager/modules/hypr/hyprland/keybinds.nix @@ -15,7 +15,9 @@ wayland.windowManager.hyprland.settings = let super = "Super"; in { bind = [ - "${super}, Super_L, exec, pkill fuzzel || fuzzel" + # "${super}, Super_L, exec, pkill fuzzel || fuzzel" + "Ctrl, Space, exec, vicinae toggle" + "${super}, Super_L, exec, vicinae toggle" # "${super}, g, hyprexpo:expo, toggle" "${super}, H, exec, ~/.config/hypr/scripts/hide_window.sh h" diff --git a/home-manager/modules/hypr/hyprlock.nix b/home-manager/modules/hypr/hyprlock.nix index a4f3c4c..73698db 100644 --- a/home-manager/modules/hypr/hyprlock.nix +++ b/home-manager/modules/hypr/hyprlock.nix @@ -23,7 +23,7 @@ background { color = rgba(181818FF) - path = /home/krosh-Arch/Pictures/Wallpapers/wallhaven-w5q8px_upscayl_2x_digital-art-4x.png + path = ${config.home.homeDirectory}/Pictures/wallpaper.png blur_size = 4 blur_passes = 3 diff --git a/home-manager/modules/programs.nix b/home-manager/modules/programs.nix index 2cd0e6c..f739717 100644 --- a/home-manager/modules/programs.nix +++ b/home-manager/modules/programs.nix @@ -35,4 +35,31 @@ imports = [ inputs.zen-browser.homeModules.twilight ]; programs.zen-browser = { enable = true; }; + + xdg.mimeApps = let + value = let + system = pkgs.stdenv.hostPlatform.system; + zen-browser = inputs.zen-browser.packages.${system}.twilight; + in zen-browser.meta.desktopFileName; + + associations = builtins.listToAttrs (map (name: { inherit name value; }) [ + "application/x-extension-shtml" + "application/x-extension-xhtml" + "application/x-extension-html" + "application/x-extension-xht" + "application/x-extension-htm" + "x-scheme-handler/unknown" + "x-scheme-handler/mailto" + "x-scheme-handler/chrome" + "x-scheme-handler/about" + "x-scheme-handler/https" + "x-scheme-handler/http" + "application/xhtml+xml" + "application/json" + "text/html" + ]); + in { + associations.added = associations; + defaultApplications = associations; + }; }