shelvacu/nix-stuff
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wip-devver' of git.uninsane.org:shelvacu/nix-stuff into wip-devver

Browse Source
This commit is contained in:
Shelvacu
2024-06-11 14:25:47 -07:00
parent 8ed5433048 3831a0bda0
commit 3c20bcbdab
5 changed files with 50 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common-nixos-config.nix
View File

@@ -56,10 +56,12 @@
nix.settings.trusted-users = [ "shelvacu" ];
security.sudo.wheelNeedsPassword = lib.mkDefault false;
programs.screen.screenrc = ''
defscrollback 10000
termcapinfo xterm* ti@:te@
'';
programs.screen = {
screenrc = ''
defscrollback 10000
termcapinfo xterm* ti@:te@
'';
} // (if config.system.nixos.release == "23.11" then {} else { enable = true; });
programs.tmux.enable = true;
programs.tmux.extraConfig = "setw mouse";

39
devver/default.nix
View File

@@ -8,41 +8,24 @@
];
system.nixos.tags = [ "host-${config.networking.hostName}" ];
networking.hostName = "devver";
# # blegghh, this should all be in triple-dezert config
# microvm.hypervisor = "qemu";
# microvm.vcpu = 16;
# microvm.mem = 1000;
# microvm.balloonMem = 7000;
# microvm.interfaces = [{
# type = "bridge";
# bridge = inputs.self.nixosConfigurations.triple-dezert.config.vacu.network.lan_bridge;
# id = "vm-devver";
# mac = "02:19:07:A2:15:72";
# }];
# microvm.shares = [{
# tag = "root";
# source = "/trip/devver-vm/root";
# mountPoint = "/";
# securityModel = "mapped";
# proto = "9p";
# } {
# source = "/trip/devver-vm/nix-store";
# mountPoint = "/nix/store";
# securityModel = "mapped";
# proto = "9p";
# }];
# microvm.storeOnDisk = true;
boot.loader.external.enable = true;
boot.loader.external.installHook = pkgs.writeScript "vacuDirectBootInstaller" ''
#TODO: probably copy kernel/initrd to root
(echo "vacuDirectBootInstaller"; for a in "$@";do echo "$a";done) 1>&2
exit 0
'';
fileSystems.root = {
fileSystems."/" = {
fsType = "9p";
device = "root";
options = [ "trans=virtio" "msize=104857600" "access=any" "version=9p2000.L" ];
options = [
"trans=virtio"
"msize=104857600"
"access=any"
"version=9p2000.L"
"posixacl"
"cache=mmap"
];
};
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
@@ -50,4 +33,4 @@
services.openssh.enable = true;
system.stateVersion = "23.11";
}
}

54
flake.lock generated
View File

@@ -24,11 +24,11 @@
]
},
"locked": {
"lastModified": 1717378144,
"narHash": "sha256-gwx3rVXnt2jNxl8L2DybYv41fA8QhWVGebe932pa2nw=",
"lastModified": 1717915259,
"narHash": "sha256-VsGPboaleIlPELHY5cNTrXK4jHVmgUra8uC6h7KVC5c=",
"owner": "nix-community",
"repo": "disko",
"rev": "39cd5a1fcd6d7a476eac2894b09122ead99f6efc",
"rev": "1bbdb06f14e2621290b250e631cf3d8948e4d19b",
"type": "github"
},
"original": {
@@ -182,11 +182,11 @@
]
},
"locked": {
"lastModified": 1717316182,
"narHash": "sha256-Xi0EpZcu39N0eW7apLjFfUOR9y80toyjYizez7J1wMI=",
"lastModified": 1717931644,
"narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9b53a10f4c91892f5af87cf55d08fba59ca086af",
"rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
"type": "github"
},
"original": {
@@ -204,11 +204,11 @@
]
},
"locked": {
"lastModified": 1717012808,
"narHash": "sha256-Wn0fbjqmpIiuPUWnvxu85a9sPYtSd/2tcPDhAYW54RM=",
"lastModified": 1717685136,
"narHash": "sha256-S+C/DX5HOhlhJAmcGxbB+Tv6oqZOkr3z/WzPuydXI14=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "a8e6557f29fa0cbcc2c54d15f9664c14ae2a3e98",
"rev": "fd13986ede9b94c50e84aecb2c88863e297bbb52",
"type": "github"
},
"original": {
@@ -226,11 +226,11 @@
"spectrum": "spectrum"
},
"locked": {
"lastModified": 1717281900,
"narHash": "sha256-NBwB16qOv8TKaPg62UXfy+RojsDC+DLZPtohUqUyIM4=",
"lastModified": 1717441449,
"narHash": "sha256-juxjgmLnFbl+/hhIO2cVtIa6caCO4pLKlZWUMwAOznM=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "16ec47e1fae62bcc2a76e164b7101152ad98849c",
"rev": "e3a4dd5b381fb580804105594cc9c71dc45abdb5",
"type": "github"
},
"original": {
@@ -397,11 +397,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1709961763,
"narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
"lastModified": 1717786204,
"narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
"type": "github"
},
"original": {
@@ -429,11 +429,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1717265169,
"narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=",
"lastModified": 1717880976,
"narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc",
"rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
"type": "github"
},
"original": {
@@ -445,11 +445,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1716948383,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"lastModified": 1717786204,
"narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
"type": "github"
},
"original": {
@@ -460,11 +460,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1717248198,
"narHash": "sha256-JPsNlWwbUgvuBOYg/eE0k0nUHgYkTTNrAnuhEavv0kE=",
"lastModified": 1717861563,
"narHash": "sha256-qekkLNkKoTJkk9IUJ1wizquB1d1FHWaZP3NQTLorFdI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9da9e3a0d885d33401722727bc52f957e4727f60",
"rev": "a6c3bf2daa3bf17c0e76597c36e221ed7dcb2413",
"type": "github"
},
"original": {
@@ -689,11 +689,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1717297459,
"narHash": "sha256-cZC2f68w5UrJ1f+2NWGV9Gx0dEYmxwomWN2B0lx0QRA=",
"lastModified": 1717902109,
"narHash": "sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w+mFd3X0jJs6wiA=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "ab2a43b0d21d1d37d4d5726a892f714eaeb4b075",
"rev": "f0922ad001829b400f0160ba85b47d252fa3d925",
"type": "github"
},
"original": {

13
flake.nix
View File

@@ -4,7 +4,6 @@
inputs = {
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; #todo: put this back to -small once jovian-nixos is fixed
nixpkgs.url = "nixpkgs/nixos-23.11-small";
# nix run github:bluskript/nix-inspect -- --expr 'builtins.getFlake "path:'$PWD'"'
nix-inspect = {
url = "github:bluskript/nix-inspect";
#inputs.nixpkgs.follows = "nixpkgs";
@@ -79,13 +78,11 @@
specialArgs = { inherit inputs; };
};
# nixosConfigurations.devver = nixpkgs.lib.nixosSystem {
# system = "x86_64-linux";
# modules = [ ./devver ];
# specialArgs = { inherit inputs; };
# };
# nixosConfigurations.devver2 = self.nixosConfigurations.devver;
nixosConfigurations.devver = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./devver ];
specialArgs = { inherit inputs; };
};
nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
modules = [ ./nix-on-droid.nix ];

4
triple-dezert/devver-host.nix
View File

@@ -71,20 +71,18 @@ in {
};
tapConfig = {
User = config.users.users.devver.name;
Group = config.users.groups.devver.name;
PacketInfo = true;
# KeepCarrier = true;
};
};
systemd.network.networks."02-vm-devver".extraConfig = ''
DHCP = no
LLMNR = no
Bridge = ${config.vacu.network.lan_bridge}
[Match]
Name = ${tapdev}
[Link]
MACAddress = 02:19:07:A2:15:72
RequiredForOnline = no
'';
}