c8h4/nixos-config
1
0
Fork 0
Code Issues Actions Activity

flake: bump nixpkgs, home-manager, et al. to ~30-06-2024
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source 
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
This commit is contained in:
Christoph Heiss 2024-07-03 16:56:59 +02:00
parent c160e506be
commit c9780f9f01
Signed by: c8h4
GPG key ID: 73D5E7FDEE3DE49A
4 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.prettierrc.json
View file

@ -1,3 +1,3 @@
{ {
"singleQuote": true "singleQuote": true
} }

29
flake.nix
View file

@ -7,26 +7,26 @@
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
rev = rev =
"0de0253ffbd88526af1b15ab281bd4cc17ef0d4f"; # nixos-unstable; 31-05-2024 "3b93a4d28af851867c4321b2b0d3bc20107a0920"; # nixos-unstable; 30-06-2024
}; };
home-manager = { home-manager = {
type = "github"; type = "github";
owner = "nix-community"; owner = "nix-community";
repo = "home-manager"; repo = "home-manager";
rev = "9b53a10f4c91892f5af87cf55d08fba59ca086af"; # master; 02-06-2024 rev = "59ce796b2563e19821361abbe2067c3bb4143a7d"; # master; 01-07-2024
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware = { nixos-hardware = {
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixos-hardware"; repo = "nixos-hardware";
rev = "7b49d3967613d9aacac5b340ef158d493906ba79"; # master; 01-06-2024 rev = "a59f00f5ac65b19382617ba00f360f8bc07ed3ac"; # master; 29-06-2024
}; };
# Can be removed when we pull in # Can be removed when we pull in
# https://github.com/NixOS/nixpkgs/commit/af4ac075a3e97cb239078e187112afdf380cd47b
# and
# https://github.com/NixOS/nixpkgs/commit/7f993cdf26ccef564eabf31fdb40d140821e12bc # https://github.com/NixOS/nixpkgs/commit/7f993cdf26ccef564eabf31fdb40d140821e12bc
# through regular nixpkgs # and
# https://github.com/NixOS/nixpkgs/commit/cba702ada89fe0bdb92e9e9c080a4502ddd8e90f
# through regular nixpkgs above
nixpkgs-latest.url = "github:NixOS/nixpkgs?ref=master"; nixpkgs-latest.url = "github:NixOS/nixpkgs?ref=master";
simple-nixos-mailserver = { simple-nixos-mailserver = {
type = "gitlab"; type = "gitlab";
@ -56,7 +56,7 @@
type = "github"; type = "github";
owner = "Mic92"; owner = "Mic92";
repo = "sops-nix"; repo = "sops-nix";
rev = "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075"; # master; 02-06-2024 rev = "b5974d4331fb6c893e808977a2e1a6d34b3162d6"; # master; 30-06-2024
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "nixpkgs"; inputs.nixpkgs-stable.follows = "nixpkgs";
}; };
@ -154,22 +154,21 @@
packages = (import ./pkgs) null pkgs; packages = (import ./pkgs) null pkgs;
}) // (let }) // (let
overlays = [ overlays = system: [
(import ./pkgs) (import ./pkgs)
(self: super: { (self: super: {
vimPlugins = super.vimPlugins vimPlugins = super.vimPlugins
// (import ./pkgs/vim-plugins.nix self super); // (import ./pkgs/vim-plugins.nix self super);
inherit (import nixpkgs-latest { inherit (super) system; }) inherit (import nixpkgs-latest { inherit system; }) openssh;
forgejo openssh;
}) })
]; ];
machines = { machines = {
back = { }; back = { };
fort = { }; fort = { };
tank.extraModules = [{ tank.extraModules = [{
disabledModules = [ "services/misc/forgejo.nix" ]; disabledModules = [ "system/boot/initrd-ssh.nix" ];
imports = imports =
[ "${nixpkgs-latest}/nixos/modules/services/misc/forgejo.nix" ]; [ "${nixpkgs-latest}/nixos/modules/system/boot/initrd-ssh.nix" ];
}]; }];
trek.extraModules = trek.extraModules =
[ nixos-hardware.nixosModules.framework-12th-gen-intel ]; [ nixos-hardware.nixosModules.framework-12th-gen-intel ];
@ -198,7 +197,7 @@
}; };
imports = [ (./machines + "/${name}.nix") ]; imports = [ (./machines + "/${name}.nix") ];
nixpkgs = { inherit overlays; }; nixpkgs = { overlays = overlays system; };
networking.hostName = name; networking.hostName = name;
sops.age = { sops.age = {
sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
@ -210,9 +209,9 @@
}; };
in { in {
homeConfigurations.maui = home-manager.lib.homeManagerConfiguration { homeConfigurations.maui = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs { pkgs = import nixpkgs rec {
system = "x86_64-linux"; system = "x86_64-linux";
overlays = overlays ++ [ nixgl.overlay ]; overlays = (overlays system) ++ [ nixgl.overlay ];
}; };
modules = [ ./machines/maui.nix lix-module.nixosModules.default ]; modules = [ ./machines/maui.nix lix-module.nixosModules.default ];

2
system/desktop.nix
View file

@ -20,7 +20,7 @@
fonts.enableDefaultPackages = true; fonts.enableDefaultPackages = true;
hardware.keyboard.zsa.enable = true; hardware.keyboard.zsa.enable = true;
hardware.opengl.enable = true; hardware.graphics.enable = true;
home-manager.users.christoph.imports = [ ./home-manager/desktop.nix ]; home-manager.users.christoph.imports = [ ./home-manager/desktop.nix ];

12
system/home-manager/common.nix
View file

@ -30,7 +30,7 @@ let
in { in {
home.stateVersion = "23.05"; home.stateVersion = "23.05";
# `programs.home-manager.enable = true` does not seem to work correcly .. # `programs.home-manager.enable = true` does not seem to work correctly ..
home.packages = with pkgs; [ home.packages = with pkgs; [
bc bc
bmon bmon
@ -96,16 +96,6 @@ in {
programs.tmux = { programs.tmux = {
enable = true; enable = true;
package = pkgs.tmux.overrideAttrs (oldAttrs: {
patches = oldAttrs.patches ++ [
# Fix for https://github.com/tmux/tmux/issues/3983
(pkgs.fetchpatch {
url =
"https://github.com/tmux/tmux/commit/aa17f0e0c1c8b3f1d6fc8617613c74f07de66fae.patch";
hash = "sha256-jhWGnC9tsGqTTA5tU+i4G3wlwZ7HGz4P0UHl17dVRU4=";
})
];
});
aggressiveResize = true; aggressiveResize = true;
baseIndex = 1; baseIndex = 1;
escapeTime = 0; escapeTime = 0;