fabianhauser/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Update to nixos 22.11

Browse source
This commit is contained in:
Fabian Hauser 2022-12-03 15:37:06 +01:00
parent f0be8cc8d8
commit 858c7a1655
14 changed files with 78 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
defaults/base/default.nix
View file

@ -52,7 +52,7 @@ in {
# Package management
nix = {
trustedUsers = [ "root" "@wheel" ];
settings.trusted-users = [ "root" "@wheel" ];
gc = {
automatic = true;
dates = "weekly";

2
defaults/hardware/amd-board.nix
View file

@ -17,7 +17,7 @@
boot.kernelParams = [ "acpi_enforce_resources=lax" ];
hardware.cpu.amd.updateMicrocode = true;
nix.maxJobs = lib.mkDefault 24;
nix.settings.max-jobs = lib.mkDefault 24;
powerManagement.powerUpCommands = let
forceThunderboltOnScript =

2
defaults/hardware/apu.nix
View file

@ -24,5 +24,5 @@
# CPU Configuration
hardware.cpu.amd.updateMicrocode = true;
nix.maxJobs = lib.mkDefault 4;
nix.settings.max-jobs = lib.mkDefault 4;
}

3
defaults/hardware/thinkpad-x1-gen9.nix
View file

@ -12,8 +12,7 @@
boot.initrd.kernelModules =
[ "dm-snapshot" ]; # TODO: This should be moved to defaults
environment.systemPackages = with pkgs; [ modemmanager libmbim ];
environment.systemPackages = with pkgs; [ modemmanager libmbim ];
environment.etc."ModemManager/fcc-unlock.d/1eac:1001" = {
source = "${pkgFccUnlock}/bin/fcc-unlock";

2
defaults/threema

@ -1 +1 @@
Subproject commit 7f194f75d8951b0ecc175077565cf9dd3bd96116
Subproject commit 24ad2174f1e551e18303151f6e73e45ddcaf9699

2
fcc-unlock

@ -1 +1 @@
Subproject commit 2ec601e9851c67913af403162c5346de3702eace
Subproject commit 18db2b965924207f14d3e5da2512f95f1464cf03

90
flake.lock generated
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1665140084,
"narHash": "sha256-3rDi3/DemRvOzsdracVIiDumg7gq5BkzusNyaJdEA68=",
"ref": "HEAD",
"rev": "2ec601e9851c67913af403162c5346de3702eace",
"revCount": 2,
"lastModified": 1670075202,
"narHash": "sha256-LX//k01Y+eyDeBtlgWUwEDUn0eoNst6+rmiXP8x9Q/U=",
"ref": "main",
"rev": "18db2b965924207f14d3e5da2512f95f1464cf03",
"revCount": 3,
"type": "git",
"url": "file:///etc/nixos/fcc-unlock"
},
@ -24,30 +24,31 @@
"inputs": {
"nixpkgs": [
"nixpkgs-stable"
]
],
"utils": "utils"
},
"locked": {
"lastModified": 1667907331,
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
"lastModified": 1670156115,
"narHash": "sha256-L2FKLedprp3AkQ+GS+2Br7CYWeCmLCjt3zUd87p0lNQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
"rev": "e704ef9ec7a8ccf8711bb11ff68da06f1917a26d",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-22.05",
"ref": "release-22.11",
"repo": "home-manager",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1669650994,
"narHash": "sha256-uwASLUfedIQ5q01TtMwZDEV2HCZr5nVPZjzVgCG+D5I=",
"lastModified": 1670174919,
"narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "7883883d135ce5b7eae5dce4bfa12262b85c1c46",
"rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b",
"type": "github"
},
"original": {
@ -56,13 +57,13 @@
"type": "github"
}
},
"nixpkgs-stable": {
"nixpkgs-nixos-2205": {
"locked": {
"lastModified": 1669546925,
"narHash": "sha256-Gvtk9agz88tBgqmCdHl5U7gYttTkiuEd8/Rq1Im0pTg=",
"lastModified": 1668543224,
"narHash": "sha256-wKeb21iBIV7ggdWGcs0y0kXWCJrNfQjpl5k6Q3rikXA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fecf05d4861f3985e8dee73f08bc82668ef75125",
"rev": "814f8f3363cecee7cce314286846e4da5e92d689",
"type": "github"
},
"original": {
@ -72,13 +73,29 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"nixpkgs-stable": {
"locked": {
"lastModified": 1669542132,
"narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=",
"lastModified": 1670104339,
"narHash": "sha256-212aAMSy5uxzrUbHmvUm3oHh8c02wXJ7lyNjDa5NSAM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a115bb9bd56831941be3776c8a94005867f316a7",
"rev": "2d10e73416ec1449ef74aeac7faf2cf8c556ff5a",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1670064435,
"narHash": "sha256-+ELoY30UN+Pl3Yn7RWRPabykwebsVK/kYE9JsIsUMxQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "61a8a98e6d557e6dd7ed0cdb54c3a3e3bbc5e25c",
"type": "github"
},
"original": {
@ -90,9 +107,7 @@
},
"qois-infrastructure": {
"inputs": {
"nixpkgs-nixos-2205": [
"nixpkgs-stable"
],
"nixpkgs-nixos-2205": "nixpkgs-nixos-2205",
"nixpkgs-nixos-unstable": [
"nixpkgs-unstable"
]
@ -100,7 +115,7 @@
"locked": {
"lastModified": 1668780698,
"narHash": "sha256-XcvgI08rrzA71tXj3JK0ZvEofzLLb2DlQVuVjAtS4Kw=",
"ref": "HEAD",
"ref": "master",
"rev": "fe42502147059db67e6b26b9df6da1ae19caf6b0",
"revCount": 241,
"type": "git",
@ -129,11 +144,11 @@
]
},
"locked": {
"lastModified": 1669125114,
"narHash": "sha256-mtQlFmH8DCecV3esl9eGGSfccbUssLCsiImwq9tB/8c=",
"ref": "HEAD",
"rev": "f17b13539cebd5ac3e2b86e1b3a4b06dba87afb6",
"revCount": 39,
"lastModified": 1670078090,
"narHash": "sha256-GK0qqyDv5O8FkKczhWUpUvhUSk01e/gomhLpv79DLA0=",
"ref": "main",
"rev": "24ad2174f1e551e18303151f6e73e45ddcaf9699",
"revCount": 40,
"type": "git",
"url": "file:///etc/nixos/defaults/threema"
},
@ -141,6 +156,21 @@
"type": "git",
"url": "file:///etc/nixos/defaults/threema"
}
},
"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",

10
flake.nix
View file

@ -2,17 +2,17 @@
inputs = {
# Upstream deps
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-22.05";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-22.11";
nixos-hardware.url = "github:NixOS/nixos-hardware";
# Packages
home-manager.url = "github:nix-community/home-manager/release-22.05";
home-manager.url = "github:nix-community/home-manager/release-22.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs-stable";
# Private Deps
qois-infrastructure = {
url = "git+file:///etc/nixos/qois-infrastructure";
inputs.nixpkgs-nixos-2205.follows = "nixpkgs-stable";
inputs.nixpkgs-nixos-2211.follows = "nixpkgs-stable";
inputs.nixpkgs-nixos-unstable.follows = "nixpkgs-unstable";
};
threema.url = "git+file:///etc/nixos/defaults/threema";
@ -74,10 +74,10 @@
in pkgsUnstable.lib.genAttrs hosts mapHostnameToAttr;
# Nix development shell
devShell.${system} = import ./shell.nix { pkgs = pkgsUnstable; };
devShells.${system}.default = import ./shell.nix { pkgs = pkgsUnstable; };
# Run checks and build all hosts as default package
defaultPackage.${system} = with pkgsUnstable.lib;
packages.${system}.default = with pkgsUnstable.lib;
let
checks = attrValues self.checks.${system};
nixosConfigs = mapAttrsToList (n: v: v.config.system.build.toplevel)

2
home/fhauser/applications/firefox.nix
View file

@ -1,7 +1,7 @@
{ pkgs, ... }: {
programs.firefox = {
enable = true;
package = pkgs.firefox-wayland;
package = pkgs.firefox;
};
home.sessionVariables = {
MOZ_ENABLE_WAYLAND = "true";

4
home/fhauser/applications/waybar.nix
View file

@ -26,7 +26,7 @@
];
backlight.format = " {percent}%";
disk.format = " {percentage_used}%";
clock.format = "{:%Y-%2m-%2d %H:%M}";
clock.format = "{:%Y-%m-%d %H:%M}";
"sway/workspaces" = {
disable-scroll-wraparound = true;
enable-bar-scroll = true;
@ -140,7 +140,7 @@
"" # Icon: temperature-full
];
tooltip = "true";
hwmon-path = "/sys/class/hwmon/hwmon2/temp1_input";
hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input";
};
idle_inhibitor = {

2
host/bachtel/default.nix
View file

@ -44,6 +44,6 @@
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.05"; # Did you read the comment?
system.stateVersion = "22.11"; # Did you read the comment?
}

2
host/hummelberg/default.nix
View file

@ -35,5 +35,5 @@
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.05"; # Did you read the comment?
system.stateVersion = "22.11"; # Did you read the comment?
}

2
host/ochsenchopf/default.nix
View file

@ -30,6 +30,6 @@
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.05"; # Did you read the comment?
system.stateVersion = "22.11"; # Did you read the comment?
}

2
host/speer/default.nix
View file

@ -33,6 +33,6 @@
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.05"; # Did you read the comment?
system.stateVersion = "22.11"; # Did you read the comment?
}