Compare commits

..

No commits in common. "19bedee269be8a4cc5ca62e793477c87cd9f35db" and "5efba3d0fe2358d6bed95f7c78f6b8cde8ff66f3" have entirely different histories.

6 changed files with 10 additions and 56 deletions

View file

@ -85,7 +85,7 @@ in
services.dbus.implementation = "broker"; services.dbus.implementation = "broker";
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;
# zramSwap.enable = false; zramSwap.enable = false;
}; };
options.grimmShared.tooling = { options.grimmShared.tooling = {

13
flake.lock generated
View file

@ -362,17 +362,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736941558, "dirtyRev": "0d7908bd09165db6699908b7e3970f137327cbf0-dirty",
"narHash": "sha256-Q7o9lUoKqw94IhmlhwguhPZX9AJNLnkVb56XHa0W5/I=", "dirtyShortRev": "0d7908bd-dirty",
"ref": "refs/heads/master", "lastModified": 1736013363,
"rev": "1ffbc5166cf74f9e5342fca7e3f2257c8d96b5df", "narHash": "sha256-1UN8758BA6XDgte9AfHu5fZ35zqVPPq3GGuca3JJOZU=",
"revCount": 3997,
"type": "git", "type": "git",
"url": "https://git.grimmauld.de/Grimmauld/home-manager" "url": "file:///home/grimmauld/coding/home-manager"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://git.grimmauld.de/Grimmauld/home-manager" "url": "file:///home/grimmauld/coding/home-manager"
} }
}, },
"jovian": { "jovian": {

View file

@ -44,8 +44,7 @@
# https://github.com/nix-community/home-manager/issues/3415 # https://github.com/nix-community/home-manager/issues/3415
# https://github.com/nix-community/home-manager/pull/2548 # https://github.com/nix-community/home-manager/pull/2548
# url = "github:nix-community/home-manager"; # url = "github:nix-community/home-manager";
# url = "git+file:///home/grimmauld/coding/home-manager"; url = "git+file:///home/grimmauld/coding/home-manager";
url = "git+https://git.grimmauld.de/Grimmauld/home-manager";
# url = "github:pasqui23/home-manager/nixos-late-start"; # url = "github:pasqui23/home-manager/nixos-late-start";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -151,21 +150,6 @@
./modules ./modules
]; ];
}; };
grimm-nixos-server-2 = customNixosSystem "x86_64-linux" {
modules = [
agenix.nixosModules.default
# agenix.nixosModules.default
# nixos-matrix-modules.nixosModules.default
# nixos-mailserver.nixosModules.default
./configuration.nix
./specific/grimm-nixos-server-2/configuration.nix
# ./modules
home-manager.nixosModules.home-manager
./hm
];
};
}; };
}; };
} }

View file

@ -7,8 +7,8 @@ in
inherit username; inherit username;
homeDirectory = "/home/${username}"; homeDirectory = "/home/${username}";
# file.".ssh/id_ed25519_sk".source = ../../ssh/id_ed25519_sk; file.".ssh/id_ed25519_sk".source = ../../ssh/id_ed25519_sk;
# file.".ssh/id_ed25519_sk.pub".source = ../../ssh/id_ed25519_sk.pub; file.".ssh/id_ed25519_sk.pub".source = ../../ssh/id_ed25519_sk.pub;
file.".cups/lpoptions".text = "Default pdf\n"; file.".cups/lpoptions".text = "Default pdf\n";
}; };
}; };

View file

@ -1,20 +0,0 @@
{ pkgs, lib, ... }: {
imports = [
./hardware-configuration.nix
];
environment.systemPackages = with pkgs; [
helix
];
programs.git.enable = true;
programs.nh.flake = lib.mkForce "/home/grimmauld/grimm-nixos-laptop";
boot.tmp.cleanOnBoot = true;
zramSwap.enable = true;
networking.hostName = "grimm-nixos-server-2";
networking.domain = "grimmauld.de";
services.openssh.enable = true;
users.users.root.openssh.authorizedKeys.keys = [''sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIMgGKExPve3tsl0/kjV5rCo5wb46CapnUaA1ZdZWpgXTAAAAC3NzaDpnZW5lcmFs grimmauld@grimm-nixos-ssd'' ];
system.stateVersion = "23.11";
}

View file

@ -1,9 +0,0 @@
{ modulesPath, ... }:
{
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot.loader.grub.device = "/dev/sda";
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi" ];
boot.initrd.kernelModules = [ "nvme" ];
fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
}