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

Compare commits

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

No commits in common. "0a57bf37ef19ca7961089a584f86741b16f08a9a" and "1cd941d447dc2adbf67ce94aea0e4f30d84ea4e4" have entirely different histories.
0a57bf37ef ... 1cd941d447

6 changed files with 32 additions and 36 deletions
Show stats Expand all files Collapse all files

52
flake.lock
View file

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

6
flake.nix
View file

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

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

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

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

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

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

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

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

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