nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use beta firefox

This commit is contained in:
Nathan McCarty 2022-01-26 16:53:39 -05:00
parent b77c482d63
commit 5553b32d53
Signed by: thatonelutenist
GPG Key ID: D70DA3DD4D1E9F96
4 changed files with 67 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desktop.nix
View File

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { { pkgs, lib, unstable, ... }: {
## Boot, drivers, and host name ## Boot, drivers, and host name
# Use grub # Use grub
boot.loader = { boot.loader = {
@ -44,6 +44,6 @@
}; };
## Left over uncategorized packages ## Left over uncategorized packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
firefox-wayland firefox unstable.firefox-beta-bin
]; ];
} }

79
flake.lock
View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"emacs": { "emacs": {
"locked": { "locked": {
"lastModified": 1642761284, "lastModified": 1643222610,
"narHash": "sha256-kGmyiBd3F4qmQyz4UjolCyFA1bo+w5ix+IDAhjjkMc0=", "narHash": "sha256-EnR5nypyGCRgRcox2bhiMcWWFv/DviJEcfDJCJBaghc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "0cee2f8b2e0f21ec1e120ffed9fb9de195f332ca", "rev": "e4f09393c327bf56be25476ccd0f7628637445bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,17 +17,15 @@
}, },
"fenix": { "fenix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs",
"nixpkgs-unstable"
],
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1642746228, "lastModified": 1643178253,
"narHash": "sha256-H17bCeS39UVsUxn3qq/zZ3WuxsJPsTgh5YK+rpgg/ug=", "narHash": "sha256-8E2Gv9d8iZWChZ1EdXeDkNrXTJCn5vvBKVvocZTdoC0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "55acc3d46535c2732d96dd439aa76a9ad3f0f0d2", "rev": "d81537d2ea5cd1e9866f8e58a7b756a4b2a5070c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -36,29 +34,45 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "mozilla": {
"flake": false,
"locked": { "locked": {
"lastModified": 1642707142, "lastModified": 1638887313,
"narHash": "sha256-BzH6xhnkn52yF4+A8C8slWFQRMInS5VYlzrH/rN1bnA=", "narHash": "sha256-FMYV6rVtvSIfthgC1sK1xugh3y7muoQcvduMdriz4ag=",
"owner": "NixOS", "owner": "mozilla",
"repo": "nixpkgs", "repo": "nixpkgs-mozilla",
"rev": "6f07605b6916abee5435ea1145a7541299a87c1b", "rev": "7c1e8b1dd6ed0043fb4ee0b12b815256b0b9de6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "mozilla",
"ref": "nixos-21.11", "repo": "nixpkgs-mozilla",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1643080866,
"narHash": "sha256-iO3Z6jw0HEiie8UnXVpq1SxphprDYBXrVzubEa5D4eE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c07b471b52be8fbc49a7dc194e9b37a6e19ee04d",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1642635915, "lastModified": 1643080866,
"narHash": "sha256-vabPA32j81xBO5m3+qXndWp5aqepe+vu96Wkd9UnngM=", "narHash": "sha256-iO3Z6jw0HEiie8UnXVpq1SxphprDYBXrVzubEa5D4eE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6d8215281b2f87a5af9ed7425a26ac575da0438f", "rev": "c07b471b52be8fbc49a7dc194e9b37a6e19ee04d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -68,22 +82,39 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1643148353,
"narHash": "sha256-VMX2quZAFjCoAFzQX23ALsLNA7Y6d6qSNIvz1ySj2iY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b3d86c56c786ad9530f1400adbd4dfac3c42877b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"emacs": "emacs", "emacs": "emacs",
"fenix": "fenix", "fenix": "fenix",
"nixpkgs": "nixpkgs", "mozilla": "mozilla",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1642622501, "lastModified": 1643126615,
"narHash": "sha256-FUd86eWQuu2k4S9hA1/6km4dfGtWs0TgT8AkT1oNjTs=", "narHash": "sha256-H1CZ9b0GckNeRNxwzuRZUVKmb6TF1q44wfyQlmuQlEY=",
"owner": "rust-analyzer", "owner": "rust-analyzer",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "df5340386365b2b16c4e9bbae546504b97564c41", "rev": "2cb85c14b622002767c66881c6a316a94e0f0be4",
"type": "github" "type": "github"
}, },
"original": { "original": {

11
flake.nix
View File

@ -6,15 +6,17 @@
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
fenix = { fenix = {
url = "github:nix-community/fenix"; url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };
emacs = { emacs = {
url = "github:nix-community/emacs-overlay"; url = "github:nix-community/emacs-overlay";
inputs.nixpkgs.follows = "nixpkgs-unstable"; };
mozilla = {
url = "github:mozilla/nixpkgs-mozilla";
flake = false;
}; };
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, fenix, emacs }: outputs = { self, nixpkgs, nixpkgs-unstable, fenix, emacs, mozilla }:
let let
coreModules = [ coreModules = [
./modules/user.nix ./modules/user.nix
@ -39,6 +41,7 @@
./applications/syncthing.nix ./applications/syncthing.nix
./desktop.nix ./desktop.nix
]; ];
mozillaOverlay = import "${mozilla}";
in in
{ {
nixosConfigurations.levitation = nixpkgs.lib.nixosSystem { nixosConfigurations.levitation = nixpkgs.lib.nixosSystem {
@ -46,7 +49,7 @@
specialArgs = { specialArgs = {
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {
config = { allowUnfree = true; }; config = { allowUnfree = true; };
overlays = [ emacs.overlay ]; overlays = [ emacs.overlay mozillaOverlay ];
system = "x86_64-linux"; system = "x86_64-linux";
}; };
fenix = fenix.packages.x86_64-linux; fenix = fenix.packages.x86_64-linux;

3
modules/sway.nix
View File

@ -70,6 +70,9 @@
export QT_QPA_PLATFORMTHEME="qt5ct" export QT_QPA_PLATFORMTHEME="qt5ct"
# Make pipewire present a pulse audio tcp port # Make pipewire present a pulse audio tcp port
pactl load-module module-native-protocol-tcp pactl load-module module-native-protocol-tcp
# Make firefox use wayland
export MOZ_ENABLE_WAYLAND=1
export XDG_CURRENT_DESKTOP="sway"
''; '';
}; };