diff --git a/configuration.nix b/configuration.nix index c377074..4dd7aef 100644 --- a/configuration.nix +++ b/configuration.nix @@ -38,24 +38,29 @@ }) helix bruno - chromium + # chromium kdePackages.kdenlive antigravity zed-editor devenv nixd inputs.pano-scrobbler.packages.${pkgs.stdenv.hostPlatform.system}.default - inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default - simplex-chat-desktop + # inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default + # simplex-chat-desktop inputs.helium.packages.${pkgs.stdenv.hostPlatform.system}.default - ayugram-desktop + # ayugram-desktop ente-desktop mpv + cloudflare-warp + materialgram + # ytm-player + fprintd + # telegram-bot-api + # tdl ]; fonts.packages = with pkgs; [ andika - nerd-fonts.iosevka - nerd-fonts.jetbrains-mono + agave ]; } diff --git a/flake.lock b/flake.lock index 72d460f..296d599 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,116 @@ { "nodes": { + "apple-fonts": { + "inputs": { + "ci": "ci", + "nixpkgs": "nixpkgs", + "ny": "ny", + "sf-arabic": "sf-arabic", + "sf-armenian": "sf-armenian", + "sf-compact": "sf-compact", + "sf-georgian": "sf-georgian", + "sf-hebrew": "sf-hebrew", + "sf-mono": "sf-mono", + "sf-pro": "sf-pro" + }, + "locked": { + "lastModified": 1781881853, + "narHash": "sha256-JawESccafFrnpr1YPYc2Xd7WaBJvbE+4FLZzWY3AfJU=", + "owner": "Lyndeno", + "repo": "apple-fonts.nix", + "rev": "bb4d5244052c1f6cae543baea793bf44f3f8bfb4", + "type": "github" + }, + "original": { + "owner": "Lyndeno", + "repo": "apple-fonts.nix", + "type": "github" + } + }, + "blueprint": { + "inputs": { + "nixpkgs": [ + "apple-fonts", + "ci", + "nixpkgs" + ], + "systems": [ + "apple-fonts", + "ci" + ] + }, + "locked": { + "lastModified": 1776249299, + "narHash": "sha256-Dt9t1TGRmJFc0xVYhttNBD6QsAgHOHCArqGa0AyjrJY=", + "owner": "numtide", + "repo": "blueprint", + "rev": "56131e8628f173d24a27f6d27c0215eff57e40dd", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "blueprint", + "type": "github" + } + }, + "ci": { + "inputs": { + "blueprint": "blueprint", + "nixpkgs": [ + "apple-fonts", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1779849193, + "narHash": "sha256-Bc80n+fA3NtxqYHWcdb1XFuYLaV+yX2xnvDRnwAv4ak=", + "owner": "Lyndeno", + "repo": "ci", + "rev": "38cfa6f01bdaf91bc4ce44176b322bab2bb208a0", + "type": "github" + }, + "original": { + "owner": "Lyndeno", + "repo": "ci", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "helium": { "inputs": { "nixpkgs": [ @@ -8,11 +119,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1781095007, - "narHash": "sha256-/ayRnFWUJZiQqMBpjklkMmbvEOsCZg2l0p8/MY3yQsg=", + "lastModified": 1782360192, + "narHash": "sha256-2CXgBN1AU05W6nHjHI53iDcji/dPBo8K7bOmGBgz6qw=", "owner": "schembriaiden", "repo": "helium-browser-nix-flake", - "rev": "280a3440288256e54448221860fe89e82bfcfca0", + "rev": "217e4d83d820bc4cc8fd364babb2296340d2b3ae", "type": "github" }, "original": { @@ -28,11 +139,11 @@ ] }, "locked": { - "lastModified": 1779726825, - "narHash": "sha256-RUkMrREjKDQrA+dA9+xZviGAxM5W1aVdyOr/bSYpHrE=", + "lastModified": 1781981105, + "narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=", "owner": "nix-community", "repo": "home-manager", - "rev": "b179bde238977f7d4454fc770b1a727eaf55111c", + "rev": "7bfff44b465909f69a442701293bc0badcf476dc", "type": "github" }, "original": { @@ -50,11 +161,11 @@ ] }, "locked": { - "lastModified": 1780515920, - "narHash": "sha256-8KX2hEeOX6KP3hBBJJI8dGWVrzbOOf1rBPmg/GUG24U=", + "lastModified": 1781497404, + "narHash": "sha256-9GAF8sSsnkyCVCWkomXR0T+zdSxyUlfPt6neQidimdg=", "owner": "nix-community", "repo": "home-manager", - "rev": "4c5c1e8ba14f1c7475fa31ff11bc1c19cd220974", + "rev": "1285cd3d6882a9847f2d56ed5541b3350c8a6162", "type": "github" }, "original": { @@ -70,11 +181,11 @@ ] }, "locked": { - "lastModified": 1779398417, - "narHash": "sha256-eTya6Y7dw/otqohgYZudkqrcI50740jFUTe4Lyd6GKc=", + "lastModified": 1781804251, + "narHash": "sha256-F+gmENjOqFb284tChvZgprjVVssDGN31Sl+93+i5INo=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "e01464ab9e0bcd42c1550e74a64f2574c14d2d27", + "rev": "a568321a7a08db8f6bdd262efc6b0355532820ce", "type": "github" }, "original": { @@ -85,27 +196,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779971959, - "narHash": "sha256-R5nauXyqyfRUFiZycFFZdkF7wl6eaUpPLst35+2nJQY=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ec942ba042dad5ef097e2ef3a3effc034241f011", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -115,6 +210,65 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1782233679, + "narHash": "sha256-QyuGP5+QOtmXpy4i2X4DhBVBaySBdDKQEhqKcphcp34=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "667d5cf1c59585031d743c78b394b0a647537c35", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "ny": { + "flake": false, + "locked": { + "narHash": "sha256-3257NAH4qlan2YHVLpNRy7x8IJqR2pal3OzFo/ykqXs=", + "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" + } + }, "pano-scrobbler": { "inputs": { "nixpkgs": [ @@ -122,11 +276,11 @@ ] }, "locked": { - "lastModified": 1779270916, - "narHash": "sha256-OEVnC5U5zeTcw6Br5YHEfOO+2/4U+dUMVByLF2hFYOU=", + "lastModified": 1780965838, + "narHash": "sha256-1EOSIB1VK4yiRuoJS+5BkHsy36hbnuBG6s3B/8bBZKM=", "owner": "kawaiiDango", "repo": "pano-scrobbler-flake", - "rev": "299c8dcec11254928e7df9dbd92c0888ea7eed47", + "rev": "058c1ec28d8033cf5be7315b7502e0583a600ddc", "type": "github" }, "original": { @@ -137,16 +291,103 @@ }, "root": { "inputs": { + "apple-fonts": "apple-fonts", + "flake-parts": "flake-parts", "helium": "helium", "home-manager": "home-manager", "moonlight": "moonlight", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "pano-scrobbler": "pano-scrobbler", "sops-nix": "sops-nix", + "ytm-player": "ytm-player", "zen-browser": "zen-browser" } }, + "sf-arabic": { + "flake": false, + "locked": { + "narHash": "sha256-/0gjRimqvZyE60xYxxPdlU+7Q2LJnnvtbmwOP0YmS9U=", + "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-armenian": { + "flake": false, + "locked": { + "narHash": "sha256-rRoDkbNMYkzOHZmQm96Zv80TZvRlAeoxkv4pMHP5nUg=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Armenian.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Armenian.dmg" + } + }, + "sf-compact": { + "flake": false, + "locked": { + "narHash": "sha256-C2TR3mVBorgBfdP7+L0YDq1ctefH62+iEBi19zlEpLU=", + "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-georgian": { + "flake": false, + "locked": { + "narHash": "sha256-IevVNOC28IiR45YfI3PsZzXLMRxuB5u7UiE53Zn6tRU=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Georgian.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Georgian.dmg" + } + }, + "sf-hebrew": { + "flake": false, + "locked": { + "narHash": "sha256-Dw84kYwMpCtKKKqm8cZcQ9TZ7GayU5MO7W0LJw0Rcwk=", + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Hebrew.dmg" + }, + "original": { + "type": "file", + "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Hebrew.dmg" + } + }, + "sf-mono": { + "flake": false, + "locked": { + "narHash": "sha256-ICdHRFdNL7PM/fXJUzS7LgZxZiqcyIuCMHLze4En4vg=", + "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-56SORX7J5qTO9xrd4Zvgfwr8GBUrIzLc6pzg5C0c+zU=", + "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": [ @@ -154,11 +395,11 @@ ] }, "locked": { - "lastModified": 1777944972, - "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", + "lastModified": 1782165805, + "narHash": "sha256-478kKQBvK6SYTOdN2h9jhKJv94nbXRbFMfuL1WshErg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", + "rev": "56b24064fdcaedca53553b1a6d607fd23b613a24", "type": "github" }, "original": { @@ -182,6 +423,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems" @@ -200,6 +456,27 @@ "type": "github" } }, + "ytm-player": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782066329, + "narHash": "sha256-1N/jIiO4NezbDCFDygzo1sJ/PxgEQgyAXDZSr2mNTCc=", + "owner": "peternaame-boop", + "repo": "ytm-player", + "rev": "72de1f33afd210b265c531c78ec25b6b20e24457", + "type": "github" + }, + "original": { + "owner": "peternaame-boop", + "repo": "ytm-player", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -208,11 +485,11 @@ ] }, "locked": { - "lastModified": 1780567926, - "narHash": "sha256-LVaiAnBwgr2YotaIlrcwCgmbwHsE2ccegRztLjur/d4=", + "lastModified": 1782460457, + "narHash": "sha256-R3EXRxLmv1uqMtacBi0L8gUCOWC6EpCPSXebf8e+vac=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "eea9ae34eb9011aee9b8ce8ee2bc2dd111ee8285", + "rev": "563e515460b6c3bb68552979e3abbca447f8aaf1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f0a4526..5243a0e 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,8 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + flake-parts.url = "github:hercules-ci/flake-parts"; + apple-fonts.url= "github:Lyndeno/apple-fonts.nix"; home-manager = { url = "github:nix-community/home-manager/release-26.05"; @@ -36,6 +38,11 @@ url = "github:schembriaiden/helium-browser-nix-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + + ytm-player = { + url = "github:peternaame-boop/ytm-player"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { nixpkgs, home-manager, ... } @ inputs: { diff --git a/home/programs/zed.nix b/home/programs/zed.nix index 1ed22f4..bc41033 100644 --- a/home/programs/zed.nix +++ b/home/programs/zed.nix @@ -6,9 +6,9 @@ extensions = ["crimson-theme"]; userSettings = { ui_font_size = 20; - ui_font_family = "Andika"; + ui_font_family = "Agave"; buffer_font_size = 20; - buffer_font_family = "JetBrainsMono Nerd Font"; + buffer_font_family = "Agave"; autosave = { after_delay = { milliseconds = 1000; }; }; diff --git a/services/cups.nix b/services/cups.nix index 57e943e..2eab481 100644 --- a/services/cups.nix +++ b/services/cups.nix @@ -3,5 +3,5 @@ { services.printing.enable = true; services.printing.cups-pdf.enable = true; - services.printing.drivers = with pkgs; [ hplip ]; + services.printing.drivers = with pkgs; [ hplip canon-cups-ufr2 ]; } diff --git a/services/default.nix b/services/default.nix index 2fea9b3..356b7de 100644 --- a/services/default.nix +++ b/services/default.nix @@ -18,4 +18,6 @@ services.flatpak.enable = true; services.gnome.gnome-keyring.enable = true; + # services.cloudflare-warp.enable = true; + # services.tailscale.enable = true; } diff --git a/services/pipewire.nix b/services/pipewire.nix index 3dc61d4..8eac537 100644 --- a/services/pipewire.nix +++ b/services/pipewire.nix @@ -4,7 +4,7 @@ services.pipewire = { enable = true; alsa.enable = true; - alsa.support32Bit = true; + alsa.support32Bit = false; pulse.enable = true; extraLadspaPackages = [ pkgs.rnnoise-plugin.ladspa ]; }; diff --git a/system/overlays.nix b/system/overlays.nix index 11b07e9..063d33b 100644 --- a/system/overlays.nix +++ b/system/overlays.nix @@ -2,6 +2,7 @@ { nixpkgs.overlays = [ + # inputs.ytm-player.overlays.default (final: prev: let unstable-pkgs = import inputs.nixpkgs-unstable {