From 98556f202ebc58cf8424d3f1b6aea5dd347ce1be Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Mon, 3 Jun 2024 20:18:30 +0200 Subject: [PATCH] Update --- flake.lock | 108 +++++++++++++++---------------- flake.nix | 2 +- home/apps/wofi/default.nix | 2 +- home/home.nix | 3 - home/system/hyprland/default.nix | 5 +- home/system/shell/zsh.nix | 1 + home/themes/default.nix | 2 +- variables.nix | 4 +- 8 files changed, 61 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 9bde8e5..6420a16 100644 --- a/flake.lock +++ b/flake.lock @@ -166,11 +166,38 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ "nixvim", - "pre-commit-hooks", + "git-hooks", "nixpkgs" ] }, @@ -195,11 +222,11 @@ ] }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1717316182, + "narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af", "type": "github" }, "original": { @@ -216,11 +243,11 @@ ] }, "locked": { - "lastModified": 1716448020, - "narHash": "sha256-u1ddoBOILtLVX4NYzqSZ9Qaqusql1M4reLd1fs554hY=", + "lastModified": 1717052710, + "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", "owner": "nix-community", "repo": "home-manager", - "rev": "25dedb0d52c20448f6a63cc346df1adbd6ef417e", + "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", "type": "github" }, "original": { @@ -268,11 +295,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716583868, - "narHash": "sha256-us5qr9hCqlKu76Sn6oNfxWUn2QgBy2Mejs7JbCmHIHM=", + "lastModified": 1717433180, + "narHash": "sha256-0f7RnoE9cyDd99YkD+sseZz4WBwGBszJqBki6w0Odo8=", "ref": "refs/heads/main", - "rev": "2ff95bba3fec58b9f1a127fe72dda84b1420a7af", - "revCount": 4738, + "rev": "3fd6c1b30e5397432c4640286efaf52a6891f71c", + "revCount": 4757, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -390,11 +417,11 @@ ] }, "locked": { - "lastModified": 1716329735, - "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=", + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", "type": "github" }, "original": { @@ -421,11 +448,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716061101, - "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", + "lastModified": 1717265169, + "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", + "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", "type": "github" }, "original": { @@ -453,11 +480,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -505,20 +532,20 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "flake-root": "flake-root", + "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1716566815, - "narHash": "sha256-WO3MF4W1SrSD0lanU1n7dfuHizeSLfDHJNEir9exlcM=", + "lastModified": 1717430734, + "narHash": "sha256-mJ4uC6gkhNVpDTMBe/KB8q0ZnYJVLwEhJCsB8PBcrD4=", "owner": "nix-community", "repo": "nixvim", - "rev": "9d858de2e9ab136d1c53d92af62fed8fccf492ab", + "rev": "0c2834c50b68c8c2ebe75bd28a74701c573cac49", "type": "github" }, "original": { @@ -539,33 +566,6 @@ "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1716213921, - "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "apple-fonts": "apple-fonts", @@ -654,11 +654,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716400300, - "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=", + "lastModified": 1717297459, + "narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b549832718b8946e875c016a4785d204fcfc2e53", + "rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4b50115..e89f28e 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - users."hadi" = import ./home/home.nix; + users."hadi" = import ./home/home.nix; # CHANGE ME extraSpecialArgs = { inherit inputs; inherit spicetify-nix; diff --git a/home/apps/wofi/default.nix b/home/apps/wofi/default.nix index 036031d..02b0cb2 100644 --- a/home/apps/wofi/default.nix +++ b/home/apps/wofi/default.nix @@ -89,7 +89,7 @@ #input, #entry:selected { - border-radius: ${toString (config.theme.rounding - 10)}px; + border-radius: ${toString config.theme.rounding}px; } ''; }; diff --git a/home/home.nix b/home/home.nix index 3badbae..a9ef02b 100644 --- a/home/home.nix +++ b/home/home.nix @@ -35,13 +35,10 @@ in { zip unzip xdg_utils - tldr wget curl - ripgrep neovide wf-recorder - tree # temp # Just cool peaclock diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index b08e3d9..6b3d420 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -131,10 +131,7 @@ in { blur = { enabled = false; }; }; - master = { - new_is_master = true; - new_on_top = true; - }; + master = { new_is_master = true; }; gestures = { workspace_swipe = true; }; diff --git a/home/system/shell/zsh.nix b/home/system/shell/zsh.nix index ce804a3..735571b 100644 --- a/home/system/shell/zsh.nix +++ b/home/system/shell/zsh.nix @@ -40,6 +40,7 @@ e = "exit"; cd = "z"; ls = "${pkgs.eza}/bin/eza --icons=always"; + tree = "${pkgs.eza}/bin/eza --icons=always --tree"; sl = "ls"; open = "${pkgs.xdg_utils}/bin/xdg-open"; icat = "${pkgs.kitty}/bin/kitty +kitten icat"; diff --git a/home/themes/default.nix b/home/themes/default.nix index b2b09b6..cb350f1 100644 --- a/home/themes/default.nix +++ b/home/themes/default.nix @@ -1 +1 @@ -{ ... }: { imports = [ ./wip.nix ./wallpapers ./config/load_colors.nix ]; } +{ ... }: { imports = [ ./nixy.nix ./wallpapers ./config/load_colors.nix ]; } diff --git a/variables.nix b/variables.nix index 39d2e9a..e65dfc1 100644 --- a/variables.nix +++ b/variables.nix @@ -13,11 +13,11 @@ email = "112569860+anotherhadi@users.noreply.github.com"; }; - stateVersion = "23.11"; + stateVersion = "24.05"; enableAutoUpgrade = false; enableAutoGarbageCollector = false; enableSops = true; enableNextcloud = true; enableNvidia = true; - enablePrime = false; + enablePrime = true; }