Daholli/nixos-config
1
0
Fork 0
Code Issues 3 Pull requests Releases Packages Activity Actions

update locks, use one password for signing, move deprecated options

Browse source
This commit is contained in:
Christoph Hollizeck 2024-04-14 10:11:30 +02:00
parent 5c80e6ba80
commit d7b0c7cdee
Signed by: Daholli
GPG key ID: 249300664F2AF2C7
9 changed files with 62 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -382,11 +382,11 @@
]
},
"locked": {
"lastModified": 1712759992,
"narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
"lastModified": 1713077896,
"narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
"rev": "630a0992b3627c64e34f179fab68e3d48c6991c0",
"type": "github"
},
"original": {
@ -462,11 +462,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1712760404,
"narHash": "sha256-4zhaEW1nB+nGbCNMjOggWeY5nXs/H0Y71q0+h+jdxoU=",
"lastModified": 1712909959,
"narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "e1c4bac14beb8c409d0534382cf967171706b9d9",
"rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f",
"type": "github"
},
"original": {
@ -477,11 +477,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1712608508,
"narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
"lastModified": 1712791164,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
"type": "github"
},
"original": {
@ -518,11 +518,11 @@
"unstable": "unstable"
},
"locked": {
"lastModified": 1712824851,
"narHash": "sha256-tIBMbfhxwJEdE9uXxAmBP3mRs1QHwvqzMTEPyhYmKv8=",
"lastModified": 1713081618,
"narHash": "sha256-N7ic3r74gHw07qrritWf9as6QA5x3eaFXsimRYRVXbo=",
"owner": "Daholli",
"repo": "nixvim",
"rev": "ccb92e757675ccca4de8d3dec6e271a0bdcf1f8a",
"rev": "ad16feef46f530368e5f8aa511076898fef264cc",
"type": "github"
},
"original": {
@ -809,11 +809,11 @@
},
"unstable_2": {
"locked": {
"lastModified": 1712608508,
"narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
"lastModified": 1712791164,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
"type": "github"
},
"original": {

4
modules/home/tools/git/default.nix
View file

@ -16,7 +16,9 @@ in
enable = mkBoolOpt true "Enable Git (Default true)";
userName = mkOpt types.str user.fullName "The name to configure git with.";
userEmail = mkOpt types.str user.email "The email to configure git with.";
signingKey = mkOpt types.str "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4iH29edivUi+k94apb6pasWq8qphfhYo0d6B2GhISf" "The pub key to sign commits with.";
signingKey =
mkOpt types.str "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4iH29edivUi+k94apb6pasWq8qphfhYo0d6B2GhISf"
"The pub key to sign commits with.";
signByDefault = mkOpt types.bool true "Whether to sign commits by default.";
};

1
modules/nixos/submodules/basics/default.nix
View file

@ -50,7 +50,6 @@ in
time = enabled;
xkb = enabled;
};
};
};
}

8
modules/nixos/submodules/graphical-interface/default.nix
View file

@ -18,13 +18,15 @@ in
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ ];
services.xserver = {
enable = true;
services = {
xserver = {
enable = true;
};
displayManager.sddm = {
enable = true;
wayland.enable = true;
};
desktopManager.plasma6 = enabled;
};
services.desktopManager.plasma6 = enabled;
};
}

2
modules/nixos/system/boot/default.nix
View file

@ -18,5 +18,7 @@ in
config = mkIf cfg.enable {
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
services.fstrim = enabled;
};
}

6
modules/nixos/system/hardware/audio/default.nix
View file

@ -16,8 +16,10 @@ in
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ noisetorch pavucontrol
];
environment.systemPackages = with pkgs; [
noisetorch
pavucontrol
];
programs.noisetorch.enable = true;

2
modules/nixos/system/hardware/gpu/nvidia/default.nix
View file

@ -32,6 +32,6 @@ in
};
services.xserver.videoDrivers = [ "nvidia" ];
services.xserver.displayManager.sddm.wayland.enable = lib.mkForce false;
services.displayManager.sddm.wayland.enable = lib.mkForce false;
};
}

6
modules/nixos/tools/git/default.nix
View file

@ -16,7 +16,9 @@ in
enable = mkBoolOpt true "Wether or not to enable git (Default enabled)";
userName = mkOpt types.str user.fullName "The name to use git with";
userEmail = mkOpt types.str user.email "The email to use git with";
signingKey = mkOpt types.str "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4iH29edivUi+k94apb6pasWq8qphfhYo0d6B2GhISf" "The key ID to sign commits with.";
signingKey =
mkOpt types.str "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4iH29edivUi+k94apb6pasWq8qphfhYo0d6B2GhISf"
"The key ID to sign commits with.";
};
config = mkIf cfg.enable {
@ -47,7 +49,7 @@ in
safe = {
directory = "${config.users.users.${user.name}.home}/projects/config";
};
gpg ={
gpg = {
format = "ssh";
"ssh".program = "${pkgs._1password-gui}/bin/op-ssh-sign";
};

58
systems/x86_64-linux/yggdrasil/hardware.nix
View file

@ -13,40 +13,38 @@
boot = {
initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usb_storage"
"usbhid"
"sd_mod"
];
initrd.kernelModules = [ ];
kernelModules = [
"kvm-amd"
"btusb"
];
extraModulePackages = [ ];
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/444a9216-59d1-46e0-9643-0b716a42ba0b";
fsType = "ext4";
"nvme"
"xhci_pci"
"ahci"
"usb_storage"
"usbhid"
"sd_mod"
];
initrd.kernelModules = [ ];
kernelModules = [
"kvm-amd"
"btusb"
];
extraModulePackages = [ ];
};
"/boot" = {
device = "/dev/disk/by-uuid/8310-585A";
fsType = "vfat";
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/444a9216-59d1-46e0-9643-0b716a42ba0b";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/8310-585A";
fsType = "vfat";
};
"/storage" = {
device = "/dev/disk/by-uuid/c3c1dec1-7716-4c37-a3f2-bb60f9af84fd";
fsType = "ext4";
};
};
"/storage" = {
device = "/dev/disk/by-uuid/c3c1dec1-7716-4c37-a3f2-bb60f9af84fd";
fsType = "ext4";
};
};
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking