alarsyo/nixos-config
alarsyo/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

flake: switch back entire config to unstable

Browse source 
Mixing stable and unstable brought me weird problems, so I'm switching
back to unstable entirely until it breaks hard enough to convince me to
go back to stable. :)
This commit is contained in:
Antoine Martin 2021-08-19 23:34:41 +02:00
parent 12c60e9d2e
commit bdd0748620
8 changed files with 24 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
base/gui-programs.nix
View file

@ -3,20 +3,20 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
element-desktop element-desktop
feh feh
firefox
gimp gimp
gnome.nautilus gnome.nautilus
imagemagick imagemagick
mpv mpv
pavucontrol pavucontrol
slack
spotify
tdesktop
teams
thunderbird thunderbird
zathura zathura
unstable.discord unstable.discord
unstable.firefox
unstable.slack
unstable.spotify
unstable.tdesktop
unstable.teams
]; ];
networking.networkmanager.enable = true; networking.networkmanager.enable = true;

18
flake.lock
View file

@ -71,27 +71,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1629271619, "lastModified": 1629292755,
"narHash": "sha256-by9D3OkEKk4rOzJIMbC0uP2wP3Bt81auP5xmbmPg2a8=", "narHash": "sha256-5xMo32NVLnloY9DveqwJO/Cab1+PbTMPqU4WMmawX5M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7bbca9877caed472c6b5866ea09302cfcdce3dbf", "rev": "253aecf69ed7595aaefabde779aa6449195bebb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-21.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable-small": {
"locked": { "locked": {
"lastModified": 1629318195, "lastModified": 1629379651,
"narHash": "sha256-mFqoLruMu3poN6pkbegevDcGYwMVjoiyAexL+KE7DBg=", "narHash": "sha256-k4WWTLqz3tYvCCVt9ANm3Ac7qR/qXi1Uk6Xf9RXO8VM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7c38b03f742a657bf38e9579adeb608fc7cc5f1a", "rev": "14b0f20fa1f56438b74100513c9b1f7c072cf789",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,7 +108,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable-small": "nixpkgs-unstable-small"
} }
} }
}, },

14
flake.nix
View file

@ -5,10 +5,10 @@
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
ref = "nixos-21.05"; ref = "nixos-unstable";
}; };
nixpkgs-unstable = { nixpkgs-unstable-small = {
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
@ -63,7 +63,7 @@
packages = import ./pkgs { pkgs = super; }; packages = import ./pkgs { pkgs = super; };
# packages accessible through pkgs.unstable.package # packages accessible through pkgs.unstable.package
unstable = import inputs.nixpkgs-unstable { unstable = import inputs.nixpkgs-unstable-small {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
@ -110,10 +110,6 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.emacs-overlay.overlay inputs.emacs-overlay.overlay
(self: super: {
steam = self.unstable.steam;
})
# uncomment this to build everything from scratch, fun but takes a # uncomment this to build everything from scratch, fun but takes a
# while # while
# #
@ -140,10 +136,6 @@
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.emacs-overlay.overlay inputs.emacs-overlay.overlay
(self: super: {
steam = self.unstable.steam;
})
] ++ shared_overlays; ] ++ shared_overlays;
} }
]; ];

2
home/firefox.nix
View file

@ -10,7 +10,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.unstable.firefox.override { package = pkgs.firefox.override {
cfg = { cfg = {
enableTridactylNative = true; enableTridactylNative = true;
}; };

4
hosts/boreal/home.nix
View file

@ -19,8 +19,8 @@
# dev # dev
rustup rustup
unstable.beancount beancount
unstable.fava fava
# keyboard goodness # keyboard goodness
chrysalis chrysalis

4
hosts/zephyrus/home.nix
View file

@ -21,8 +21,8 @@
# dev # dev
rustup rustup
unstable.beancount beancount
unstable.fava fava
]; ];
}; };
} }

2
services/fava.nix
View file

@ -38,7 +38,7 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
Environment = []; Environment = [];
ExecStart = "${pkgs.unstable.fava}/bin/fava -H 127.0.0.1 -p ${toString cfg.port} ${cfg.filePath}"; ExecStart = "${pkgs.fava}/bin/fava -H 127.0.0.1 -p ${toString cfg.port} ${cfg.filePath}";
WorkingDirectory = cfg.home; WorkingDirectory = cfg.home;
User = "fava"; User = "fava";
Group = "fava"; Group = "fava";

7
services/tailscale.nix
View file

@ -16,12 +16,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.tailscale = { services.tailscale = {
enable = true; enable = true;
package = pkgs.unstable.tailscale; package = pkgs.tailscale;
};
# FIXME: remove when upgrading to 21.11, added to module by default
systemd.services.tailscaled = {
path = [ pkgs.procps ];
}; };
networking.firewall = { networking.firewall = {