ar/nibylandia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: ar:f028e2170be8b8c607c85ce0dbdd70a611328bd1
Branches Tags
ar:main
...
compare: ar:de7b9c7a10653cfe448f2f25553912b1f5eee3c6
Branches Tags
ar:main

6 commits
f028e2170b ... de7b9c7a10

Author SHA1 Message Date
Ari Gato
de7b9c7a10 chore: flake lock updates
All checks were successful
CI / x86_64-linux (push) Successful in 1m1s
Details
CI / aarch64-linux (push) Successful in 1m30s
Details
2024-07-02 13:15:07 +02:00
Ari Gato
ce855f5939 chore: flake lock updates 2024-07-02 11:32:58 +02:00
Ari Gato
97b2b06455 .: remove things i never ended up using 2024-07-02 11:07:56 +02:00
Ari Gato
3ffd0f5979 .: hardware.opengl -> hardware.graphics 2024-07-01 13:07:58 +02:00
Ari Gato
8ba041d53f chore: flake lock updates 2024-07-01 12:02:53 +02:00
Ari Gato
6d73d0ad2b p/nix-top: silly mistake 2024-07-01 12:02:36 +02:00
8 changed files with 20 additions and 233 deletions
Show stats Expand all files Collapse all files

208
flake.lock
View file

@ -21,22 +21,6 @@
"type": "github"
}
},
"base16-schemes": {
"flake": false,
"locked": {
"lastModified": 1696158499,
"narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=",
"owner": "tinted-theming",
"repo": "base16-schemes",
"rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-schemes",
"type": "github"
}
},
"blobs": {
"flake": false,
"locked": {
@ -254,24 +238,6 @@
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
@ -330,26 +296,6 @@
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1719180626,
"narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"impermanence": {
"locked": {
"lastModified": 1719091691,
@ -373,11 +319,11 @@
]
},
"locked": {
"lastModified": 1719292813,
"narHash": "sha256-6w/buoRKo4ijH9O4D/0KjNtiWjtrJebuV7djTEEa0+k=",
"lastModified": 1719631702,
"narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "d6222e7818aa5528f8369afe84bc53556a57c329",
"rev": "2f9668e19aff06550cd154c87c0af120735a56a4",
"type": "github"
},
"original": {
@ -399,11 +345,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1718782018,
"narHash": "sha256-8SBmf7Sx5xMLzL4VGEU0fe8cuq0yMumdkXgOPXXD3Bo=",
"lastModified": 1719818887,
"narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=",
"owner": "nix-community",
"repo": "lanzaboote",
"rev": "6fa7bc0522f71d3906a3788bbd80c344cd9c4523",
"rev": "0e6457c98547ec8866714d4222545e7e8c1ae429",
"type": "github"
},
"original": {
@ -441,11 +387,11 @@
]
},
"locked": {
"lastModified": 1718778751,
"narHash": "sha256-DdcMvX9r29uHMlz7P1Shgs5xZw9WkZ4ObMGYzwROAiw=",
"lastModified": 1719353937,
"narHash": "sha256-86NBqDxAP20ET/UoKX0WvSItblNQ97czXb2q7lkMrwk=",
"ref": "refs/heads/main",
"rev": "909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8",
"revCount": 90,
"rev": "5d9d94089fb1ca96222a34bfe245ef5c5ebefd37",
"revCount": 92,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
@ -454,47 +400,6 @@
"url": "https://git.lix.systems/lix-project/nixos-module"
}
},
"microvm": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs"
],
"spectrum": "spectrum"
},
"locked": {
"lastModified": 1719185120,
"narHash": "sha256-xsdESZDwOs0o96VlZNxThfLG8HW+qT2c7dYypGGUYXg=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "146fec824fe8e06454e211a14ce29b5f692ad078",
"type": "github"
},
"original": {
"owner": "astro",
"repo": "microvm.nix",
"type": "github"
}
},
"nix-colors": {
"inputs": {
"base16-schemes": "base16-schemes",
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1707825078,
"narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=",
"owner": "misterio77",
"repo": "nix-colors",
"rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1",
"type": "github"
},
"original": {
"owner": "misterio77",
"repo": "nix-colors",
"type": "github"
}
},
"nix-formatter-pack": {
"inputs": {
"nixpkgs": "nixpkgs_3",
@ -537,42 +442,6 @@
"type": "github"
}
},
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1719111455,
"narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
"type": "github"
},
"original": {
"owner": "Mic92",
"repo": "nix-index-database",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1719322773,
"narHash": "sha256-BqPxtFwXrpJQDh65NOIHX99pz2rtIMshG9Mt2xnnc5c=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "caabc425565bbd5c8640630b0bf6974961a49242",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1703013332,
@ -604,21 +473,6 @@
"type": "indirect"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1697935651,
"narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1710695816,
@ -669,11 +523,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1719322817,
"narHash": "sha256-Uv4sSqcIBguggDv2I8i7ksHKIhpL3SuLy5SsAOUxHQc=",
"lastModified": 1719918800,
"narHash": "sha256-9UoMK9d1PiJZJrInbMONscA7QN8C6kZIX9FUyHp6UqQ=",
"owner": "arachnist",
"repo": "nixpkgs",
"rev": "00baa6e33c3aa3e0f938bb4fa80fe89fcc4a9dbf",
"rev": "02e10f7e99522cef9909f78312ffbbd2d96e59c3",
"type": "github"
},
"original": {
@ -747,17 +601,12 @@
"agenix": "agenix",
"colmena": "colmena",
"deploy-rs": "deploy-rs",
"home-manager": "home-manager_2",
"impermanence": "impermanence",
"jovian-nixos": "jovian-nixos",
"lanzaboote": "lanzaboote",
"lix": "lix",
"lix-module": "lix-module",
"microvm": "microvm",
"nix-colors": "nix-colors",
"nix-formatter-pack": "nix-formatter-pack",
"nix-index-database": "nix-index-database",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_4",
"simple-nixos-mailserver": "simple-nixos-mailserver"
}
@ -810,22 +659,6 @@
"type": "gitlab"
}
},
"spectrum": {
"flake": false,
"locked": {
"lastModified": 1708358594,
"narHash": "sha256-e71YOotu2FYA67HoC/voJDTFsiPpZNRwmiQb4f94OxQ=",
"ref": "refs/heads/main",
"rev": "6d0e73864d28794cdbd26ab7b37259ab0e1e044c",
"revCount": 614,
"type": "git",
"url": "https://spectrum-os.org/git/spectrum"
},
"original": {
"type": "git",
"url": "https://spectrum-os.org/git/spectrum"
}
},
"stable": {
"locked": {
"lastModified": 1696039360,
@ -902,21 +735,6 @@
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems_2"

8
flake.nix
View file

@ -3,15 +3,8 @@
inputs = {
nixpkgs.url = "github:arachnist/nixpkgs/ar-patchset-unstable";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
nix-colors.url = "github:misterio77/nix-colors";
nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack";
nix-index-database.url = "github:Mic92/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
deploy-rs.url = "github:serokell/deploy-rs";
microvm.url = "github:astro/microvm.nix";
microvm.inputs.nixpkgs.follows = "nixpkgs";
impermanence.url = "github:nix-community/impermanence";
colmena = {
url = "github:zhaofengli/colmena/main";
@ -33,7 +26,6 @@
url = "github:Jovian-Experiments/Jovian-NixOS";
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
lix = {
url =
"git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90.0-rc1";

7
modules/common.nix
View file

@ -3,11 +3,8 @@
let meta = import ../meta.nix;
in {
imports = with inputs; [
nix-index-database.nixosModules.nix-index
agenix.nixosModules.default
microvm.nixosModules.host
self.nixosModules.boot
];
@ -188,10 +185,6 @@ in {
[ { Address = "10.0.0.1/24"; } { Address = "fd12:3456:789a::1/64"; } ];
ipv6Prefixes = [{ Prefix = "fd12:3456:789a::/64"; }];
};
networks.microvm-eth0 = {
matchConfig.Name = "vm-*";
networkConfig.Bridge = "virbr0";
};
};
services.chrony.enable = true;

16
modules/graphical.nix
View file

@ -17,18 +17,10 @@ let
${util-linux}/bin/rfkill unblock 0
'';
in {
imports = [ inputs.self.nixosModules.common inputs.home-manager.nixosModule ];
imports = [ inputs.self.nixosModules.common ];
nix.registry = nixRegistry;
home-manager.users.ar = {
home.username = "ar";
home.homeDirectory = "/home/ar";
home.stateVersion = config.system.stateVersion;
};
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
boot = {
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
extraModprobeConfig = ''
@ -51,8 +43,6 @@ in {
pulse.enable = true;
};
home-manager.users.ar.services.easyeffects.enable = true;
networking.networkmanager.enable = true;
networking.networkmanager.wifi.backend = "wpa_supplicant";
systemd.network.wait-online.enable = false;
@ -66,9 +56,9 @@ in {
enable = true;
package = pkgs.bluez;
};
hardware.opengl = {
hardware.graphics = {
enable = true;
driSupport32Bit = true;
enable32Bit = true;
};
security.wrappers.bt-unfuck = {

4
nixos/akamanto/default.nix
View file

@ -144,8 +144,6 @@ in {
environment.etc."wifi-secrets".text = ci-secrets.wifi;
microvm.host.enable = false;
systemd.network.enable = lib.mkForce false;
networking = {
useDHCP = true;
@ -185,7 +183,7 @@ in {
services.openssh.settings.PasswordAuthentication = lib.mkForce true;
services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
hardware.opengl.enable = true;
hardware.graphics.enable = true;
# strictly for shits and giggles
sound.enable = true;

4
nixos/kamaitachi/default.nix
View file

@ -112,8 +112,6 @@ in {
environment.etc."wifi-secrets".text = ci-secrets.wifi;
microvm.host.enable = false;
systemd.network.enable = lib.mkForce false;
networking = {
useDHCP = true;
@ -155,7 +153,7 @@ in {
services.openssh.settings.PasswordAuthentication = lib.mkForce true;
services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
hardware.opengl.enable = true;
hardware.graphics.enable = true;
# strictly for shits and giggles
sound.enable = true;

4
nixos/tsukumogami/default.nix
View file

@ -111,8 +111,6 @@ in {
environment.etc."wifi-secrets".text = ci-secrets.wifi;
microvm.host.enable = false;
systemd.network.enable = lib.mkForce false;
networking = {
useDHCP = true;
@ -158,7 +156,7 @@ in {
services.openssh.settings.PasswordAuthentication = lib.mkForce true;
services.openssh.settings.PermitRootLogin = lib.mkForce "yes";
hardware.opengl.enable = true;
hardware.graphics.enable = true;
# strictly for shits and giggles
sound.enable = true;

2
pkgs/nix-top/nix-top
View file

@ -1,4 +1,4 @@
#!/nix/store/c4bdx4dja3h06xg1ksv3f51alp5a44li-ruby-3.1.5/bin/ruby
#!/usr/bin/env ruby
require "shellwords"
require "optparse"