diff --git a/home-manager/home.nix b/home-manager/home.nix index 33b3def..1bc36a5 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -2,7 +2,7 @@ let y-firefox = pkgs.wrapFirefox pkgs.latest.firefox-beta-bin.unwrapped { forceWayland = true; - browserName = "firefox"; + applicationName = "firefox"; }; thefuck-alias = shell: pkgs.runCommand "thefuck-alias" { TF_SHELL = shell; @@ -178,6 +178,11 @@ in { user = "yorick.van.pelt"; port = 4222; }; + rpibuild4 = { + hostname = "rpibuild4.lumi.guide"; + user = "yorick.van.pelt"; + port = 4222; + }; styx = lumigod "10.110.0.1"; "*.lumi.guide" = { user = "yorick.van.pelt"; }; zeus = lumigod "zeus.lumi.guide"; diff --git a/nix/sources.json b/nix/sources.json index 2086561..8aa56a8 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "50f1ef189623aad54410bc935e6f4b4a3aed98cf", - "sha256": "0wyn326n7q0g6xdqpw3ch5n8fv77w185nvxvyj7cblbim0ma3h1f", + "rev": "8a47765478628f684b09d7f7aa5960e697309c74", + "sha256": "1jz065nsyfkdn8mksh5vmfirp7n1dlhg10h8zzfgpfij1vya1c2l", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/50f1ef189623aad54410bc935e6f4b4a3aed98cf.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/8a47765478628f684b09d7f7aa5960e697309c74.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "home-manager": { @@ -17,10 +17,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "59be1f4983ee3689de3172716a6c7e95a6a37bb7", - "sha256": "1q9q5aagmhmnjdx0smf7x5jw7m8fp0vxb948xn9946vkxxya7d4c", + "rev": "60ebc273c92edae796931649e83bf753e72b3ef4", + "sha256": "1kxd70mrr295pd355g4s19jkiz5gh7nhkbis987qrx5ircpmpjqm", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/59be1f4983ee3689de3172716a6c7e95a6a37bb7.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/60ebc273c92edae796931649e83bf753e72b3ef4.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "niv": { @@ -29,10 +29,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "e0ca65c81a2d7a4d82a189f1e23a48d59ad42070", - "sha256": "1pq9nh1d8nn3xvbdny8fafzw87mj7gsmp6pxkdl65w2g18rmcmzx", + "rev": "65a61b147f307d24bfd0a5cd56ce7d7b7cc61d2e", + "sha256": "17mirpsx5wyw262fpsd6n6m47jcgw8k2bwcp1iwdnrlzy4dhcgqh", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/e0ca65c81a2d7a4d82a189f1e23a48d59ad42070.tar.gz", + "url": "https://github.com/nmattia/niv/archive/65a61b147f307d24bfd0a5cd56ce7d7b7cc61d2e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixos-hardware": { @@ -41,10 +41,10 @@ "homepage": "", "owner": "nixos", "repo": "nixos-hardware", - "rev": "8296b88560d8ac07a885452e094cd454de90ea9b", - "sha256": "07s1p1qj5knh71lq3nzkxs3mhh5n9dbf6qi87dhkkngp85fjv9il", + "rev": "0a8b8054c9920368a3c15e6d766188fdf04b736f", + "sha256": "1vg43gvqav4p31awk82ax5710cvp0lizqbhgmg3j1qvdspxv7nj8", "type": "tarball", - "url": "https://github.com/nixos/nixos-hardware/archive/8296b88560d8ac07a885452e094cd454de90ea9b.tar.gz", + "url": "https://github.com/nixos/nixos-hardware/archive/0a8b8054c9920368a3c15e6d766188fdf04b736f.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixos-mailserver": { @@ -61,10 +61,10 @@ "homepage": "https://github.com/NixOS/nixpkgs", "owner": "nixos", "repo": "nixpkgs", - "rev": "439b1605227b8adb1357b55ce8529d541abbe9eb", - "sha256": "1jmlia9670lq89ic241zvif5q68qsqhqzm68pbdacxjmdrr0ahqf", + "rev": "14aef06d9b3ad1d07626bdbb16083b83f92dc6c1", + "sha256": "1rfsfaaa1lbrvhdpdnqg4fg5v7bnal1s8xd1sm66pl2vh0dhjzyg", "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/439b1605227b8adb1357b55ce8529d541abbe9eb.tar.gz", + "url": "https://github.com/nixos/nixpkgs/archive/14aef06d9b3ad1d07626bdbb16083b83f92dc6c1.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-mozilla": { @@ -73,22 +73,22 @@ "homepage": "", "owner": "mozilla", "repo": "nixpkgs-mozilla", - "rev": "b1001ed670666ca4ce1c1b064481f88694315c1d", - "sha256": "1hpig8z4pzdwc2vazr6hg7qyxllbgznsaivaigjnmrdszlxz55zz", + "rev": "0510159186dd2ef46e5464484fbdf119393afa58", + "sha256": "1c6r5ldkh71v6acsfhni7f9sxvi7xrqzshcwd8w0hl2rrqyzi58w", "type": "tarball", - "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/b1001ed670666ca4ce1c1b064481f88694315c1d.tar.gz", + "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/0510159186dd2ef46e5464484fbdf119393afa58.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-wayland": { "branch": "master", "description": "Automated, pre-built packages for Wayland (sway/wlroots) tools for NixOS.", "homepage": "", - "owner": "colemickens", + "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "4d0b4b2d0687221ffcb0c1954688607591d4fd27", - "sha256": "1p5qjnv2gsnvlj7hf6fxhz7rfp565zwqyyglwk7xng87x1vqh2fm", + "rev": "020bba7daedf53bea157e44fe989831244cf6bd9", + "sha256": "1rhvmyyzl82vqcdy6hhm4qm3im2508nqlvx9xizaaxpnzqzzp8rh", "type": "tarball", - "url": "https://github.com/colemickens/nixpkgs-wayland/archive/4d0b4b2d0687221ffcb0c1954688607591d4fd27.tar.gz", + "url": "https://github.com/nix-community/nixpkgs-wayland/archive/020bba7daedf53bea157e44fe989831244cf6bd9.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/overlays.nix b/overlays.nix index af0da1b..be76006 100644 --- a/overlays.nix +++ b/overlays.nix @@ -1,6 +1,6 @@ let sources = import ./nix/sources.nix; in [ - (import sources.nixpkgs-wayland) + (import "${sources.nixpkgs-wayland}/overlay.nix") (import sources.nixpkgs-mozilla) (import sources.emacs-overlay) (import ./pkgs) diff --git a/pkgs/envs.nix b/pkgs/envs.nix index 8bfa399..8570bee 100644 --- a/pkgs/envs.nix +++ b/pkgs/envs.nix @@ -56,10 +56,11 @@ in { media = mkEnv "y-media" [ streamlink - py3.youtube-dl + yt-dlp mpv aria2 js.peerflix + castnow ]; coins = mkEnv "y-coins" [