From e9310630bdf2447b3daf407ec8a3f655beacda51 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Tue, 11 Jun 2024 21:58:04 +0200 Subject: [PATCH] Fix --- flake.lock | 196 +++---------------- flake.nix | 2 +- home/apps/qutebrowser/serverpage/default.nix | 14 +- hosts/laptop/configuration.nix | 2 +- hosts/laptop/fonts.nix | 4 +- 5 files changed, 47 insertions(+), 171 deletions(-) diff --git a/flake.lock b/flake.lock index b1bd973..2f99004 100644 --- a/flake.lock +++ b/flake.lock @@ -1,32 +1,8 @@ { "nodes": { - "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": 1705496891, - "narHash": "sha256-lLX87aJ9oUT3u0Iaf60xKIJ2RQNt3v4Ne2cvSWyaS7U=", - "owner": "Lyndeno", - "repo": "apple-fonts.nix", - "rev": "e6ffbc887752ba0fe035fbcc8b282555804dd3f6", - "type": "github" - }, - "original": { - "owner": "Lyndeno", - "repo": "apple-fonts.nix", - "type": "github" - } - }, "devshell": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixvim", "nixpkgs" @@ -99,25 +75,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -133,9 +91,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1685518550, @@ -275,8 +233,8 @@ "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", - "systems": "systems_2", + "nixpkgs": "nixpkgs", + "systems": "systems", "xdph": "xdph" }, "locked": { @@ -353,7 +311,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1709914708, @@ -417,15 +375,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696375444, - "narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=", - "owner": "nixos", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "81e8f48ebdecf07aab321182011b067aafc78896", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -448,22 +406,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1717602782, "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", @@ -479,7 +421,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -495,7 +437,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1686020360, "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", @@ -538,24 +480,11 @@ "type": "github" } }, - "ny": { - "flake": false, - "locked": { - "narHash": "sha256-phACDdjI8RX6yD77PSmFcsriagt+2UuySD7+WEzdzGo=", - "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_3", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "rose-pine-hyprcursor": "rose-pine-hyprcursor", "sops-nix": "sops-nix", @@ -565,7 +494,7 @@ "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -582,54 +511,6 @@ "type": "github" } }, - "sf-arabic": { - "flake": false, - "locked": { - "narHash": "sha256-CPewXMGI78xHsjdRU8ZJIBSYjh5UY6UW21ihE4B+Bkk=", - "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-nJkPlddKF2dIwj+6jiVvS60hDcGAMasEOWemUwBS2mQ=", - "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-KT1RXz3NcWPetyxVlgMfh/dsoznpI3lMnplz6V7PCUU=", - "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-cn8ae2UddF8Pru6i3fSG2Wki5sf1DmWKD2FmKMsoeAA=", - "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": [ @@ -653,8 +534,8 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1704167711, @@ -672,50 +553,35 @@ }, "systems": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, "systems_2": { "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_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -730,7 +596,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -745,7 +611,7 @@ "type": "github" } }, - "systems_6": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -783,7 +649,7 @@ }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index 21c1e91..5601c62 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/qutebrowser/serverpage/default.nix b/home/apps/qutebrowser/serverpage/default.nix index 5963370..151ea3f 100644 --- a/home/apps/qutebrowser/serverpage/default.nix +++ b/home/apps/qutebrowser/serverpage/default.nix @@ -1,17 +1,27 @@ { config, ... }: let bookmarks = '' - Services: [ + Apps: [ {text: "TrueNAS", url: "https://heaven", icon: ""}, {text: "Nextcloud", url: "https://cloud.anotherhadi.com/", icon: ""}, {text: "Vaultwarden", url: "https://vault.anotherhadi.com/", icon: "󰟵"}, - {text: "PiHole", url: "http://heaven:20720/admin", icon: "󰷱"}, + {text: "Vaultwarden", url: "https://vault.anotherhadi.com/", icon: "󰟵"}, + {text: "Jellyfin", url: "https://media.anotherhadi.com", icon: "󰕧"}, + ], + Media: [ + {text: "Overseerr", url: "https://heaven:30023", icon: "O"}, + {text: "Radarr", url: "https://heaven:30025", icon: "R"}, + {text: "Sonarr", url: "https://heaven:30027", icon: "S"}, + {text: "Bazarr", url: "https://heaven:30046", icon: "B"}, + {text: "Prowlarr", url: "https://heaven:30050", icon: "P"}, ], Admin: [ {text: "Vaultwarden", url: "https://vault.anotherhadi.com/admin", icon: "󰟵"}, {text: "Cloudflare One", url: "https://one.dash.cloudflare.com/", icon: ""}, {text: "Cloudflare", url: "https://cloudflare.com/", icon: ""}, {text: "Tailscale", url: "https://login.tailscale.com/admin/machines", icon: "󰖂"}, + {text: "PiHole", url: "http://heaven:20720/admin", icon: "󰷱"}, + {text: "Unifi", url: "https://heaven:30072", icon: "󰌗"}, ], ''; in { diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index d15ccee..50448f5 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: let variable = import ../../variables.nix; - baseImports = [ ./hardware-configuration.nix ./tailscale.nix ]; + baseImports = [ ./hardware-configuration.nix ]; extraImports = [ (if variable.enableNvidia then ./nvidia.nix else null) diff --git a/hosts/laptop/fonts.nix b/hosts/laptop/fonts.nix index cdbf34b..758f1d1 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 ];