From d117be2be9af0b50baf46e63f6cccbba3164b667 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Thu, 13 Jun 2024 10:48:06 +0200 Subject: [PATCH] Temp --- flake.lock | 198 ++++++++++++++++++++++++++++++++------ flake.nix | 2 +- home/apps/nvim/server.nix | 33 ------- home/apps/server.nix | 2 +- hosts/laptop/fonts.nix | 4 +- 5 files changed, 170 insertions(+), 69 deletions(-) delete mode 100644 home/apps/nvim/server.nix diff --git a/flake.lock b/flake.lock index 06a5d57..4ee52be 100644 --- a/flake.lock +++ b/flake.lock @@ -1,8 +1,32 @@ { "nodes": { - "devshell": { + "apple-fonts": { "inputs": { "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "ny": "ny", + "sf-arabic": "sf-arabic", + "sf-compact": "sf-compact", + "sf-mono": "sf-mono", + "sf-pro": "sf-pro" + }, + "locked": { + "lastModified": 1718062482, + "narHash": "sha256-bGWs6XRVgzm1Uagx/EAnz9wnMQVImR1ZlVpAy+SDXCw=", + "owner": "Lyndeno", + "repo": "apple-fonts.nix", + "rev": "eeb3521706bfe21206b1301ff8e0876defa1b6dd", + "type": "github" + }, + "original": { + "owner": "Lyndeno", + "repo": "apple-fonts.nix", + "type": "github" + } + }, + "devshell": { + "inputs": { + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixvim", "nixpkgs" @@ -75,7 +99,25 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" }, "locked": { "lastModified": 1701680307, @@ -91,9 +133,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1685518550, @@ -165,11 +207,11 @@ ] }, "locked": { - "lastModified": 1717931644, - "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", + "lastModified": 1718141734, + "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", + "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", "type": "github" }, "original": { @@ -234,8 +276,8 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs", - "systems": "systems", + "nixpkgs": "nixpkgs_2", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -316,7 +358,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1709914708, @@ -405,15 +447,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717974879, - "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", - "owner": "NixOS", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -436,6 +478,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1717974879, + "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1717974879, "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", @@ -451,7 +509,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1717786204, "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", @@ -467,7 +525,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -483,7 +541,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1686020360, "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", @@ -507,7 +565,7 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -524,11 +582,24 @@ "type": "github" } }, + "ny": { + "flake": false, + "locked": { + "narHash": "sha256-FkV8Z2fdUTwvcKeltFJVCisvAarcdnmlj/33exdyxnQ=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg" + } + }, "root": { "inputs": { + "apple-fonts": "apple-fonts", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "rose-pine-hyprcursor": "rose-pine-hyprcursor", "sops-nix": "sops-nix", @@ -538,7 +609,7 @@ "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "utils": "utils" }, "locked": { @@ -555,6 +626,54 @@ "type": "github" } }, + "sf-arabic": { + "flake": false, + "locked": { + "narHash": "sha256-u+Q2Hd+JCiKhIQtbQqawg1lIEgGhjmdGye2cNdWlBG0=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg" + } + }, + "sf-compact": { + "flake": false, + "locked": { + "narHash": "sha256-9kXXWmu2zg0LSE7SihItXmBltLvNwyG1Ba6QehvMh04=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" + } + }, + "sf-mono": { + "flake": false, + "locked": { + "narHash": "sha256-BVmYmgqq79ezgyqNClyHkj2L4N3/PRisPm8YFBQZQ98=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg" + } + }, + "sf-pro": { + "flake": false, + "locked": { + "narHash": "sha256-yQhtaEPTuYOIOaC6eSPdka/Jv5Ydw3Mnd8Prlcgjs90=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ @@ -578,8 +697,8 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1704167711, @@ -597,20 +716,35 @@ }, "systems": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -625,7 +759,7 @@ "type": "github" } }, - "systems_3": { + "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -640,7 +774,7 @@ "type": "github" } }, - "systems_4": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -655,7 +789,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -693,7 +827,7 @@ }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index 129bc1c..6b03299 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ url = "github:nix-community/nixvim"; # inputs.nixpkgs.follows = "nixpkgs"; }; -# apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; + apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; spicetify-nix.url = "github:the-argus/spicetify-nix"; sops-nix = { url = "github:Mic92/sops-nix"; diff --git a/home/apps/nvim/server.nix b/home/apps/nvim/server.nix deleted file mode 100644 index d9a152e..0000000 --- a/home/apps/nvim/server.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ inputs, ... }: { - imports = [ - inputs.nixvim.homeManagerModules.nixvim - ./auto-pairs.nix - ./options.nix - ./telescope.nix - ./nvim-tree.nix - ./lightline.nix - ./git.nix - ./cmp.nix - ./none-ls.nix - ./wilder.nix - ./lsp.nix - ./treesitter.nix - ./toggleterm.nix - ./whichkey.nix - ./alpha.nix - ./keymaps.nix - ./comment.nix - ./oil.nix - ./trouble.nix - ./noice.nix - ]; - - programs.nixvim = { - enable = true; - colorschemes.catppuccin = { - enable = true; - settings = { transparent_background = true; }; - }; - }; - -} diff --git a/home/apps/server.nix b/home/apps/server.nix index c866955..568045a 100644 --- a/home/apps/server.nix +++ b/home/apps/server.nix @@ -1 +1 @@ -{ imports = [ ./lf ./neofetch ./nvim/server.nix ]; } +{ imports = [ ./lf ./neofetch ]; } diff --git a/hosts/laptop/fonts.nix b/hosts/laptop/fonts.nix index 758f1d1..cdbf34b 100644 --- a/hosts/laptop/fonts.nix +++ b/hosts/laptop/fonts.nix @@ -21,8 +21,8 @@ noto-fonts-emoji jetbrains-mono (nerdfonts.override { fonts = [ "FiraCode" ]; }) - # inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd - # inputs.apple-fonts.packages.${pkgs.system}.sf-mono-nerd + inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd + inputs.apple-fonts.packages.${pkgs.system}.sf-mono-nerd openmoji-color ];