diff --git a/dots/hyprland.nix b/dots/hyprland.nix index 2cd5bb8..be1d994 100755 --- a/dots/hyprland.nix +++ b/dots/hyprland.nix @@ -8,11 +8,11 @@ ... }: let - caelestia-cli = inputs.caelestia-cli.packages.${pkgs.system}.caelestia-cli; - hypr-package = inputs.hyprland.packages.${pkgs.system}.hyprland; - hypr-portal = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; - hypr-split = inputs.hyprland-hyprsplit.packages.${pkgs.system}.split-monitor-workspaces; - #hyprscrolling = inputs.hyprland-plugins.packages.${pkgs.system}.hyprscrolling; + caelestia-cli = inputs.caelestia-cli.packages.${pkgs.stdenv.hostPlatform.system}.caelestia-cli; + hypr-package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + hypr-portal = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + hypr-split = inputs.hyprland-hyprsplit.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces; + #hyprscrolling = inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprscrolling; mod = "Alt"; terminal = "footclient"; fileManager = "dolphin"; diff --git a/dots/nixcord.nix b/dots/nixcord.nix index a8f1f29..a4d832d 100755 --- a/dots/nixcord.nix +++ b/dots/nixcord.nix @@ -42,7 +42,7 @@ biggerStreamPreview = { enable = true; }; - clearURLs = { + clearUrLs = { enable = true; }; copyFileContents = { diff --git a/dots/xdg.nix b/dots/xdg.nix index a233c93..bc88a4f 100755 --- a/dots/xdg.nix +++ b/dots/xdg.nix @@ -26,7 +26,7 @@ extraPortals = with pkgs; [ xdg-desktop-portal-wlr xdg-desktop-portal-gtk - inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland + inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland kdePackages.xdg-desktop-portal-kde ]; }; diff --git a/flake.lock b/flake.lock index 75e5f7e..e73f1a2 100644 --- a/flake.lock +++ b/flake.lock @@ -754,6 +754,27 @@ "type": "github" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1765365489, + "narHash": "sha256-L0uvs+o8P5JzEcTPe2WPA48+0ZiO6+8nlfh7XSjQql4=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "ddf5db234397043a8af5c38433b5ae933d660f27", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "nix-alien": { "inputs": { "flake-compat": "flake-compat_2", @@ -810,6 +831,28 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -1122,6 +1165,7 @@ "hyprland": "hyprland", "hyprland-hyprsplit": "hyprland-hyprsplit", "hyprland-plugins": "hyprland-plugins", + "jovian": "jovian", "nix-alien": "nix-alien", "nix-colors": "nix-colors", "nix-index-database": "nix-index-database_2", diff --git a/home/game.nix b/home/game.nix index 935c5fa..0e714f4 100755 --- a/home/game.nix +++ b/home/game.nix @@ -61,7 +61,7 @@ in ############################ # Experimental (inputs) ############################ - # inputs.ladybird.packages."${pkgs.system}".ladybird + # inputs.ladybird.packages."${pkgs.stdenv.hostPlatform.system}".ladybird # ########################## # Examples (disabled) diff --git a/home/homePkgs.nix b/home/homePkgs.nix index 4a0fc1b..4fefb43 100755 --- a/home/homePkgs.nix +++ b/home/homePkgs.nix @@ -86,7 +86,7 @@ in # }; #}; #extensions = [ - # (inputs.vicinae.mkVicinaeExtension.${pkgs.system} { + # (inputs.vicinae.mkVicinaeExtension.${pkgs.stdenv.hostPlatform.system} { # inherit pkgs; # name = "extension-name"; # src = pkgs.fetchFromGitHub { @@ -211,8 +211,8 @@ in zed-editor # Language tooling from inputs - #inputs.qs-qml.packages.${pkgs.system}.qml-ts-mode - #inputs.qs-qml.packages.${pkgs.system}.tree-sitter-qmljs + #inputs.qs-qml.packages.${pkgs.stdenv.hostPlatform.system}.qml-ts-mode + #inputs.qs-qml.packages.${pkgs.stdenv.hostPlatform.system}.tree-sitter-qmljs ############################ # Game Dev / Engines @@ -273,13 +273,13 @@ in ############################ # Experimental (inputs) ############################ - #inputs.ladybird.packages."${pkgs.system}".ladybird - #inputs.hyprlauncher.packages.${pkgs.system}.default + #inputs.ladybird.packages."${pkgs.stdenv.hostPlatform.system}".ladybird + #inputs.hyprlauncher.packages.${pkgs.stdenv.hostPlatform.system}.default ############################ # Blockchain (inputs) ############################ - #inputs.caelestia-cli.packages.${pkgs.system}.caelestia-cli - #inputs.caelestia.packages.${pkgs.system}.caelestia-shell + #inputs.caelestia-cli.packages.${pkgs.stdenv.hostPlatform.system}.caelestia-cli + #inputs.caelestia.packages.${pkgs.stdenv.hostPlatform.system}.caelestia-shell ]; } diff --git a/home/mrfluffy.nix b/home/mrfluffy.nix index 1dd6a3b..0b10351 100755 --- a/home/mrfluffy.nix +++ b/home/mrfluffy.nix @@ -67,7 +67,7 @@ in ############################ # Experimental (inputs) ############################ - # inputs.ladybird.packages."${pkgs.system}".ladybird + # inputs.ladybird.packages."${pkgs.stdenv.hostPlatform.system}".ladybird # ########################## # Examples (disabled) diff --git a/home/services.nix b/home/services.nix index 9b261ab..d6797fc 100644 --- a/home/services.nix +++ b/home/services.nix @@ -7,7 +7,7 @@ ... }: let - #quickshellPackage = inputs.caelestia.packages.${pkgs.system}.caelestia-shell; + #quickshellPackage = inputs.caelestia.packages.${pkgs.stdenv.hostPlatform.system}.caelestia-shell; in { #systemd.user.services.quickshell = lib.mkIf (window_manager == "hyprland") { diff --git a/home/work.nix b/home/work.nix index 0243b1c..9480db7 100755 --- a/home/work.nix +++ b/home/work.nix @@ -76,7 +76,7 @@ in # swaynotificationcenter - # inputs.ladybird.packages."${pkgs.system}".ladybird + # inputs.ladybird.packages."${pkgs.stdenv.hostPlatform.system}".ladybird # pkgs.hello # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) diff --git a/system/boot.nix b/system/boot.nix index 2f4d115..c27cd66 100755 --- a/system/boot.nix +++ b/system/boot.nix @@ -55,10 +55,5 @@ extraInstallCommands = '' options v4l2loopback devices=2 video_nr=1,0 card_label="OBS Cam","phone cam" exclusive_caps=1,1 ''; - plymouth = { - enable = false; - themePackages = [ pkgs.plymouth-matrix-theme ]; - theme = "matrix"; - }; }; } diff --git a/system/nixOSPkgs.nix b/system/nixOSPkgs.nix index 5a04487..437b266 100755 --- a/system/nixOSPkgs.nix +++ b/system/nixOSPkgs.nix @@ -173,7 +173,7 @@ in # --- Nix tooling --- nil nixfmt-rfc-style - inputs.nix-alien.packages.${pkgs.system}.nix-alien + inputs.nix-alien.packages.${pkgs.stdenv.hostPlatform.system}.nix-alien # --- Wayland / Desktop --- foot