Skip to content

Commit

Permalink
all: upgrade to new nixos-22.11 🎉
Browse files Browse the repository at this point in the history
  • Loading branch information
futile committed Dec 6, 2022
1 parent e319ebe commit 64a7355
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 25 deletions.
2 changes: 1 addition & 1 deletion cachix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ let
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
in {
inherit imports;
nix.binaryCaches = ["https://cache.nixos.org/"];
nix.settings.substituters = ["https://cache.nixos.org/"];
}
6 changes: 3 additions & 3 deletions cachix/nix-community.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

{
nix = {
binaryCaches = [
nix.settings = {
substituters = [
"https://nix-community.cachix.org"
];
binaryCachePublicKeys = [
trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
Expand Down
34 changes: 25 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "Full Flake Panic!";

inputs = {
nixpkgs = { url = "github:nixos/nixpkgs/nixos-22.05"; };
nixpkgs = { url = "github:nixos/nixpkgs/nixos-22.11"; };
nixpkgs-unstable = { url = "github:nixos/nixpkgs/nixos-unstable"; };
nixpkgs-pkgs-unstable = { url = "github:nixos/nixpkgs/nixpkgs-unstable"; };
nixpkgs-master = { url = "github:nixos/nixpkgs/master"; };
Expand All @@ -11,7 +11,7 @@
emacs-overlay = { url = "github:nix-community/emacs-overlay"; };

home-manager = {
url = "github:nix-community/home-manager/release-22.05";
url = "github:nix-community/home-manager/release-22.11";
inputs = { nixpkgs.follows = "nixpkgs"; };
};

Expand Down
4 changes: 2 additions & 2 deletions home-modules/doom-emacs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ let
# python
python-language-server
black
python38Packages.pyflakes
python38Packages.isort
python3Packages.pyflakes
python3Packages.isort

# nix
nixfmt
Expand Down
4 changes: 3 additions & 1 deletion home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ in
programs.nix-index.enable = true;

home = {
stateVersion = "22.05";

packages =
# bound packages
[
Expand All @@ -49,7 +51,7 @@ in
ripgrep
fd
bat
python39
python3
element-desktop # temp stable, until bug resolved
file
procs # TODO move config from `~/.config/procs/config.toml` into this repo # stable, because fish completion on unstable is broken
Expand Down
17 changes: 10 additions & 7 deletions system.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,16 @@
extraOptions = ''
experimental-features = nix-command flakes ca-derivations
'';
trustedUsers = [ "felix" ];

settings = {
trusted-users = [ "felix" ];

# add paths to the nix sandbox
extra-sandbox-paths = [
# ccache needs to be available in the sandbox
config.programs.ccache.cacheDir
];
};
};

imports = [ # Include the results of the hardware scan.
Expand Down Expand Up @@ -214,12 +223,6 @@
];
};

# add paths to the nix sandbox
nix.sandboxPaths = [
# ccache needs to be available in the sandbox
config.programs.ccache.cacheDir
];

# List services that you want to enable:

# Enable the OpenSSH daemon.
Expand Down

0 comments on commit 64a7355

Please sign in to comment.