1
0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-20 09:39:39 +01:00

Compare commits

..

No commits in common. "1447fa7ec50c34af362957553b526611c998159d" and "4bd547123a3659a672d678d422e2ba9e3b38153b" have entirely different histories.

3 changed files with 17 additions and 18 deletions

30
flake.lock generated
View File

@ -71,11 +71,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1677147771, "lastModified": 1676884243,
"narHash": "sha256-n6Tw83jRF66LU6lrr6h+pctjJFh/3IL49sVu82GChx8=", "narHash": "sha256-OHwZKq2slEpwLW6rI5pu4VrpoNch99AXzYD9XnT/UF0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "ef717aed7e04c59930dda17f78a699ebce38f006", "rev": "2b807c388a5600d9f4e98f743306834de5dd03a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +229,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1676924492, "lastModified": 1676886000,
"narHash": "sha256-78278eyP55JRFe7UCpmFwdkrTY6H2arzTpVeteWo8kM=", "narHash": "sha256-t7nxEvJb4ISR7u54YADZiZi9EaKHJKbXQjyyf00Q8TA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d24ea777c57b69c6b143cf11d83184ef71b0dbbf", "rev": "26c9dbdc92abc370510be78889942f38a272d705",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -308,11 +308,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1677063315, "lastModified": 1676721149,
"narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", "narHash": "sha256-mN2EpTGxxVNnFZLoLWRwh6f7UWhXy4qE+wO2CZyrXps=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "988cc958c57ce4350ec248d2d53087777f9e1949", "rev": "5f4e07deb7c44f27d498f8df9c5f34750acf52d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1677075010, "lastModified": 1676817468,
"narHash": "sha256-X+UmR1AkdR//lPVcShmLy8p1n857IGf7y+cyCArp8bU=", "narHash": "sha256-ovuJ1jQOC2/EEibufBkXmSN/O9mLx80Wh7aDmHmHAhA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c95bf18beba4290af25c60cbaaceea1110d0f727", "rev": "0cf4274b5d06325bd16dbf879a30981bc283e58a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -384,11 +384,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1676959847, "lastModified": 1676776227,
"narHash": "sha256-KZS6sIsMXiNyN7jW45MrEo95iEXj6nMLKvxgxO181no=", "narHash": "sha256-CSBeyGiDMYDw/nmafLfuu0ErVu7rzGoWIQwm2NkQQKY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2c5828439d718a6cddd9a511997d9ac7626a4aff", "rev": "1da7257baa1d6801c45d9d3dedae7ce79c0e6498",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -17,8 +17,7 @@ with lib; {
jitsi-meet-electron jitsi-meet-electron
signal-desktop signal-desktop
skypeforlinux skypeforlinux
#remove teams as MS has removed the linux packages from their servers teams
#teams
zoom-us zoom-us
]; ];
}; };

View File

@ -12,7 +12,7 @@ with lib; {
in in
mkIf cfg.enable { mkIf cfg.enable {
environment.systemPackages = [ environment.systemPackages = [
(pkgs.unstable.steam.override {extraPkgs = pkgs: [pkgs.jdk8];}).run (pkgs.unstable.steam.override {withJava = true;}).run
]; ];
}; };
} }