Nebucatnetzer
/
nixos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade to 22.11

This commit is contained in:
Andreas Zweili 2022-12-01 22:43:09 +01:00
parent cdf2690c69
commit 2a95bd97ea
7 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
flake.lock
View File

@ -24,30 +24,31 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
]
],
"utils": "utils"
},
"locked": {
"lastModified": 1667907331,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
"lastModified": 1669724862,
"narHash": "sha256-GwLonjmyhnTGQRNfKcUCgMSKYj49ZehjjJulaM/yH18=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
"rev": "e891b060e7d11bb8f7dedb86a41d804891a6f5a9",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-22.05",
"ref": "release-22.11",
"repo": "home-manager",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1669146234,
"narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=",
"lastModified": 1669650994,
"narHash": "sha256-uwASLUfedIQ5q01TtMwZDEV2HCZr5nVPZjzVgCG+D5I=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d",
"rev": "7883883d135ce5b7eae5dce4bfa12262b85c1c46",
"type": "github"
},
"original": {
@ -58,27 +59,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1669418739,
"narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=",
"lastModified": 1669834992,
"narHash": "sha256-YnhZGHgb4C3Q7DSGisO/stc50jFb9F/MzHeKS4giotg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "695b3515251873e0a7e2021add4bba643c56cde3",
"rev": "596a8e828c5dfa504f91918d0fa4152db3ab5502",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-22.05",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1669542132,
"narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=",
"lastModified": 1669791787,
"narHash": "sha256-KBfoA2fOI5+wCrm7PR+j7jHqXeTkVRPQ0m5fcKchyuU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a115bb9bd56831941be3776c8a94005867f316a7",
"rev": "e76c78d20685a043d23f5f9e0ccd2203997f1fb1",
"type": "github"
},
"original": {
@ -96,6 +97,21 @@
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable"
}
},
"utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
}
},
"root": "root",

4
flake.nix
View File

@ -2,7 +2,7 @@
description = "Andreas Zweili's Nixos configuration";
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";
# look here for the hardware options https://github.com/NixOS/nixos-hardware/blob/master/flake.nix#L5
@ -14,7 +14,7 @@
};
home-manager = {
url = "github:nix-community/home-manager/release-22.05";
url = "github:nix-community/home-manager/release-22.11";
inputs.nixpkgs.follows = "nixpkgs";
};
};

1
home-manager/common/default.nix
View File

@ -4,5 +4,6 @@
# paths it should manage.
home.username = custom.username;
home.homeDirectory = "/home/${custom.username}";
home.stateVersion = custom.version;
programs.home-manager.enable = true;
}

1
home-manager/software/emacs/default.nix
View File

@ -7,7 +7,6 @@
programs.emacs = {
enable = true;
package = pkgs.emacs28NativeComp;
extraConfig = ''
(setq languagetool-java-arguments '("-Dfile.encoding=UTF-8"
"-cp" "${pkgs.languagetool}/share/")

14
modules/common/default.nix
View File

@ -83,19 +83,19 @@
nix-config.flake = custom.inputs.self;
};
autoOptimiseStore = true;
package = pkgs.nixFlakes;
extraOptions = ''
experimental-features = nix-command flakes
warn-dirty = false
'';
package = pkgs.nix;
settings = {
warn-dirty = false;
auto-optimise-store = true;
experimental-features = [ "nix-command" "flakes" ];
trusted-users = [ "root" "@wheel" ];
};
# enable garbage collection
gc = {
automatic = true;
dates = "daily";
options = "--delete-older-than 30d";
};
trustedUsers = [ "root" "@wheel" ];
};
environment.variables = {

1
modules/desktop/default.nix
View File

@ -38,7 +38,6 @@
layout = "us";
xkbOptions = "compose:ralt";
libinput.enable = true;
useGlamor = true;
};
fonts.fonts = with pkgs; [

4
systems/raspi4/init_config.nix
View File

@ -25,7 +25,9 @@
experimental-features = nix-command flakes
warn-dirty = false
'';
trustedUsers = [ "root" "@wheel" ];
settings = {
trusted-users = [ "root" "@wheel" ];
};
};
users = {