Compare commits

...
Author SHA1 Message Date
58ce29a50a add lockfile changes 2026-07-11 11:45:59 +02:00
f2389c8d8a forgot some changes?? 2026-07-11 11:42:34 +02:00
ee2f468d66 forgot some changes?? 2026-07-11 11:42:01 +02:00
132895b36c fix issues in flake regarding nixpkgs 2026-07-11 11:39:08 +02:00
46bfe9c7cf do shit 2026-07-10 18:00:44 +02:00
9e6394fb64 split config between laptop and pc 2026-07-10 17:36:19 +02:00
6 changed files with 78 additions and 48 deletions

View file

@ -6,8 +6,6 @@
}:
{
imports = [
./hardware-configuration.nix
./easyroam.nix
./stylix.nix
./nixvim/nixvim.nix
];

62
flake.lock generated
View file

@ -264,7 +264,9 @@
},
"home-manager": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1782964450,
@ -328,7 +330,9 @@
},
"nix-easyroam": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1781526487,
@ -348,7 +352,7 @@
"inputs": {
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs",
"nixpkgs-nixcord": "nixpkgs-nixcord"
},
"locked": {
@ -367,16 +371,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1782175435,
"narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=",
"lastModified": 1783549019,
"narHash": "sha256-0XnckG4ZhBmAsYa9mLuEIFowBG0fDGPLHduQGsbMS4A=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "89570f24e97e614aa34aa9ab1c927b6578a43775",
"rev": "74cc63f702f7d60a557e152a57b40fb1fd0f72ac",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
@ -413,38 +417,6 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1735268880,
"narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1781216227,
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1782918843,
"narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=",
@ -460,13 +432,13 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_3": {
"locked": {
"lastModified": 1781607440,
"narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=",
"lastModified": 1783604885,
"narHash": "sha256-tzMgSkV7kljEkqIjlgV6F+n+xD+/a35Db8bs7a4BFAo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3e41b24abd260e8f71dbe2f5737d24122f972158",
"rev": "767b0d3ec98a143ad9ed7dfc0d5553510ac27133",
"type": "github"
},
"original": {
@ -479,7 +451,7 @@
"nixvim": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_3",
"systems": "systems_2"
},
"locked": {
@ -551,7 +523,7 @@
"late-sh": "late-sh",
"nix-easyroam": "nix-easyroam",
"nixcord": "nixcord",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_2",
"nixvim": "nixvim",
"stylix": "stylix"
}

View file

@ -5,9 +5,11 @@
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-easyroam = {
url = "github:0x5a4/nix-easyroam";
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
url = "github:nix-community/nixvim";
@ -42,6 +44,7 @@
{
nixosConfigurations.seele = nixpkgs.lib.nixosSystem {
modules = [
./easyroam.nix
./configuration.nix
./nixvim/nixvim.nix
nix-easyroam.nixosModules.nix-easyroam
@ -56,6 +59,10 @@
}
({ lib, ... }: {
networking.hostName = lib.mkForce "seele";
imports = [
./hardware-configuration-laptop.nix
];
})
];
@ -75,9 +82,11 @@
home-manager.useGlobalPkgs = true;
home-manager.extraSpecialArgs = { inherit inputs; };
}
lanzaboote.nixosModules.lanzaboote
({ pkgs, lib, ... }: {
imports = [
./hardware-configuration-desktop.nix
];
networking.hostName = lib.mkForce "nerv";
environment.systemPackages = [
# For debugging and troubleshooting Secure Boot.

View file

@ -0,0 +1,50 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [
"nvme"
"ahci"
"xhci_pci"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/64a37727-0c5f-41d4-afac-dc26978916c1";
fsType = "xfs";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/F424-0E3E";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia.open = true; # see the note above
boot.loader.systemd-boot.configurationLimit = 5;
}

View file

@ -1,4 +1,5 @@
{
inputs,
config,
lib,
pkgs,