harald/nixcfg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: harald:1cd941d447dc2adbf67ce94aea0e4f30d84ea4e4
Branches Tags
harald:main
harald:b24.05
..
compare: harald:0a57bf37ef19ca7961089a584f86741b16f08a9a
Branches Tags
harald:main
harald:b24.05

5 commits
1cd941d447 ... 0a57bf37ef

Author SHA1 Message Date
Harald Hoyer
0a57bf37ef feat: 24.05 for everyone 
Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
 2024-06-11 10:15:15 +02:00
Harald Hoyer
a7484b3891 feat: Move kernel package override to specific system configs 
This commit moves the kernel package version override from the base nixos service to specific system configurations. Now, the latest linux packages will be used only in the system configurations where the override has been explicitly added. This approach gives us more flexibility to handle different kernel package versions for different systems.
 2024-06-03 13:21:50 +02:00
Harald Hoyer
9c50d1379a feat: all besides mx to 24.05 2024-06-03 11:41:14 +02:00
Harald Hoyer
6331eb6277 feat: sgx-nixos to 24.05 2024-06-03 11:14:24 +02:00
Harald Hoyer
40ee6ff1f2 feat: nixos 24.05 
Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
 2024-06-03 11:06:26 +02:00
6 changed files with 36 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

52
flake.lock generated
View file

@ -328,11 +328,11 @@
]
},
"locked": {
"lastModified": 1715901937,
"narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=",
"lastModified": 1716993688,
"narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8",
"rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
"type": "github"
},
"original": {
@ -397,11 +397,11 @@
]
},
"locked": {
"lastModified": 1715872464,
"narHash": "sha256-mkZ3hrPG7d+qL7B6pQcrNfPh2mnQEJR3FHK93qCp6Uk=",
"lastModified": 1717378144,
"narHash": "sha256-gwx3rVXnt2jNxl8L2DybYv41fA8QhWVGebe932pa2nw=",
"owner": "nix-community",
"repo": "disko",
"rev": "5f6dbcce99d60dd77f96dfc66d06bbea149a40e1",
"rev": "39cd5a1fcd6d7a476eac2894b09122ead99f6efc",
"type": "github"
},
"original": {
@ -858,16 +858,16 @@
]
},
"locked": {
"lastModified": 1715381426,
"narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
"lastModified": 1716736833,
"narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
"rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
@ -1393,11 +1393,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1715458492,
"narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=",
"lastModified": 1717265169,
"narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8e47858badee5594292921c2668c11004c3b0142",
"rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc",
"type": "github"
},
"original": {
@ -1441,16 +1441,16 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1715668745,
"narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=",
"lastModified": 1717144377,
"narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843",
"rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
@ -1477,11 +1477,11 @@
"snowfall-lib": "snowfall-lib"
},
"locked": {
"lastModified": 1715612543,
"narHash": "sha256-6mOnzd+TFLel9vxxbkUjzwKZWHZko9h6DbxXK86VukI=",
"lastModified": 1716280284,
"narHash": "sha256-rofvtPgaYEW01OnKsD3DJv2B2j9QovRTWbw8h5lGjkE=",
"owner": "matter-labs",
"repo": "nixsgx",
"rev": "b792d5ea46a8600b9a03c2a3bf51dc106f8bcfdd",
"rev": "7151f63b1549b65633503f505df1e2a0b5ee844f",
"type": "github"
},
"original": {
@ -2281,11 +2281,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1715482972,
"narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=",
"lastModified": 1717297459,
"narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e",
"rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075",
"type": "github"
},
"original": {
@ -2556,11 +2556,11 @@
},
"unstable": {
"locked": {
"lastModified": 1715787315,
"narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
"lastModified": 1717196966,
"narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
"rev": "57610d2f8f0937f39dbd72251e9614b1561942d8",
"type": "github"
},
"original": {

6
flake.nix
View file

@ -2,7 +2,7 @@
description = "Harald Hoyer's Nix Configurations";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
# NixPkgs Unstable (nixos-unstable)
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
@ -21,7 +21,7 @@
darwin.url = "github:lnl7/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.url = "github:nix-community/home-manager/release-24.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
neovim-flake.url = "github:notashelf/neovim-flake/v0.5";
@ -38,7 +38,7 @@
# inputs.nixpkgs.follows = "nixpkgs";
};
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11";
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs";
};

5
modules/nixos/services/base/default.nix
View file

@ -134,7 +134,6 @@ in
timeout = 2;
};
initrd.systemd.enable = true;
kernelPackages = lib.mkOverride 0 pkgs.linuxPackages_latest;
};
system.autoUpgrade = {
@ -145,10 +144,12 @@ in
"unstable"
"--update-input"
"nixsgx-flake"
"--update-input"
"home-manager"
"--no-write-lock-file"
"-L"
];
flake = "git+https://git.hoyer.xyz/harald/nixcfg";
flake = lib.mkDefault "git+https://git.hoyer.xyz/harald/nixcfg";
};
systemd.services.nixos-upgrade = {
path = [ pkgs.metacfg.rot8000 ];

2
modules/nixos/services/gui/default.nix
View file

@ -96,7 +96,7 @@ in
opensc
pasystray
#pcsctools
pinentry-gnome
pinentry-gnome3
pkg-config
pstree
ripgrep

2
systems/x86_64-linux/sgx-nixos/default.nix
View file

@ -5,6 +5,8 @@ with lib.metacfg;
imports = [ ./hardware-configuration.nix ];
boot.kernel.sysctl."net.ipv4.conf.all.route_localnet" = 1;
boot.kernelPackages = lib.mkOverride 0 pkgs.linuxPackages_latest;
networking.firewall.extraCommands = ''
iptables -t nat -A OUTPUT -o lo -p tcp --dport 8081 -j DNAT --to-destination 192.168.122.1:8081
iptables -t nat -A POSTROUTING -j MASQUERADE

1
systems/x86_64-linux/x1/hardware-configuration.nix
View file

@ -10,6 +10,7 @@
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "uas" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelPackages = lib.mkOverride 0 pkgs.linuxPackages_latest;
boot.kernelModules = [ "kvm-intel" ];
boot.kernelParams = [
"lockdown=confidentiality"