From 2633f087964276f1056c12c9091840d069f814ab Mon Sep 17 00:00:00 2001 From: emily Date: Sun, 17 Nov 2024 20:00:46 +0100 Subject: [PATCH] ryuuko: add firefox custom build --- config/common/users/emily/default.nix | 1 + flake.lock | 200 +++++++++++++++++++++----- flake.nix | 4 + modules/graphical/hyprland.nix | 4 +- 4 files changed, 174 insertions(+), 35 deletions(-) diff --git a/config/common/users/emily/default.nix b/config/common/users/emily/default.nix index 4086a05..de2181e 100644 --- a/config/common/users/emily/default.nix +++ b/config/common/users/emily/default.nix @@ -37,6 +37,7 @@ pavucontrol signal-desktop element-desktop + inputs.firefox.packages.${pkgs.system}.firefox nixfmt-classic wl-clipboard diff --git a/flake.lock b/flake.lock index e78b0ae..dc457d7 100644 --- a/flake.lock +++ b/flake.lock @@ -214,6 +214,27 @@ "type": "github" } }, + "firefox": { + "inputs": { + "neoidiosyn": "neoidiosyn", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731867603, + "narHash": "sha256-07612Ws2V4iFQAGLEoZVIefA3rM9JP3B/qo/z4tu1Kg=", + "ref": "refs/heads/main", + "rev": "022ec0becb1ca7b96ddb9bdd046617075357c2cb", + "revCount": 3, + "type": "git", + "url": "https://woof.rip/mikael/firefox.git" + }, + "original": { + "type": "git", + "url": "https://woof.rip/mikael/firefox.git" + } + }, "flake-compat": { "flake": false, "locked": { @@ -344,6 +365,24 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -358,9 +397,9 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -376,9 +415,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1726560853, @@ -394,7 +433,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { "systems": [ "stylix", @@ -430,6 +469,21 @@ "type": "github" } }, + "flakey-profile_2": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "florp-about": { "inputs": { "nixpkgs": [ @@ -671,6 +725,68 @@ } }, "lix": { + "flake": false, + "locked": { + "lastModified": 1731683711, + "narHash": "sha256-bq21I1EjXJa/s5Rra9J9ot2NkPCnI0F5uNPurwYLdpE=", + "rev": "c859d03013712b349d82ee6223948d6d03e63a8d", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c859d03013712b349d82ee6223948d6d03e63a8d.tar.gz?rev=c859d03013712b349d82ee6223948d6d03e63a8d" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils", + "flakey-profile": "flakey-profile", + "lix": [ + "firefox", + "neoidiosyn", + "lix" + ], + "nixpkgs": [ + "firefox", + "neoidiosyn", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731185731, + "narHash": "sha256-RNaIu43b9PoXEhW4OqXUNZKY/jezQyCYWwdv1M0VjsA=", + "rev": "691193879d96bdfd1e6ab5ebcca2fadc7604cf34", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/691193879d96bdfd1e6ab5ebcca2fadc7604cf34.tar.gz?rev=691193879d96bdfd1e6ab5ebcca2fadc7604cf34" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" + } + }, + "lix-module_2": { + "inputs": { + "flake-utils": "flake-utils_3", + "flakey-profile": "flakey-profile_2", + "lix": "lix_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723510904, + "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=", + "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz" + } + }, + "lix_2": { "inputs": { "flake-compat": "flake-compat_2", "nix2container": "nix2container", @@ -690,28 +806,7 @@ "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz" } }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_2", - "flakey-profile": "flakey-profile", - "lix": "lix_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1723510904, - "narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=", - "rev": "622a2253a071a1fb97a4d3c8103a91114acc1140", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz" - } - }, - "lix_2": { + "lix_3": { "flake": false, "locked": { "lastModified": 1723503926, @@ -725,6 +820,29 @@ "url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz" } }, + "neoidiosyn": { + "inputs": { + "lix": "lix", + "lix-module": "lix-module", + "nixpkgs": [ + "firefox", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1731867586, + "narHash": "sha256-6anSWv1Vw83RKMAFMHOCv/9pp23ExzscEKFAe+GbAmU=", + "ref": "refs/heads/main", + "rev": "86605e5489fb5045f4dee48de2a69082e17c033b", + "revCount": 1, + "type": "git", + "url": "https://woof.rip/mikael/neoidiosyn.git" + }, + "original": { + "type": "git", + "url": "https://woof.rip/mikael/neoidiosyn.git" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -1012,7 +1130,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1055,15 +1173,16 @@ "disko": "disko", "dns": "dns", "fernglas": "fernglas", - "flake-utils": "flake-utils", + "firefox": "firefox", + "flake-utils": "flake-utils_2", "florp-about": "florp-about", "florp-branding": "florp-branding", "florp-moderation": "florp-moderation", "home-manager": "home-manager", "hydra": "hydra", "kyouma-www": "kyouma-www", - "lix": "lix", - "lix-module": "lix-module", + "lix": "lix_2", + "lix-module": "lix-module_2", "nixos-hardware": "nixos-hardware", "nixos-needsreboot": "nixos-needsreboot", "nixpkgs": "nixpkgs_4", @@ -1100,7 +1219,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" @@ -1108,7 +1227,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -1187,6 +1306,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index df0cbed..583df84 100644 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,10 @@ url = "github:wobcom/fernglas"; inputs.flake-utils.follows = "flake-utils"; }; + firefox = { + url = "git+https://woof.rip/mikael/firefox.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; florp-about = { url = "git+https://woof.rip/florp/about.git"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/graphical/hyprland.nix b/modules/graphical/hyprland.nix index 96dafe6..fbc1dbf 100644 --- a/modules/graphical/hyprland.nix +++ b/modules/graphical/hyprland.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: { +{ config, inputs, lib, pkgs, ... }: { config.home-manager.users.emily = lib.mkIf (config.kyouma.graphical.compositor == "hyprland") { wayland.windowManager.hyprland = { enable = true; @@ -8,7 +8,7 @@ playerctl = "${pkgs.playerctl}/bin/playerctl"; notifysend = "${pkgs.libnotify}/bin/notify-send"; dolphin = "${pkgs.libsForQt5.dolphin}/bin/dolphin"; - firefox = "${pkgs.firefox}/bin/firefox"; + firefox = "${inputs.firefox.packages.${pkgs.system}.firefox}/bin/firefox"; brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl"; screenshot = "~/.local/bin/hypr/screenshot.sh"; rofi = "${pkgs.rofi-wayland}/bin/rofi";