daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-30 12:10:43 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:8f51affe7c7c86c6560a473998884b8438465258
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:c740020fa8294ace63f976403279ed16f6980733
Branches Tags
daylin:flake-lock
daylin:main

No commits in common. "8f51affe7c7c86c6560a473998884b8438465258" and "c740020fa8294ace63f976403279ed16f6980733" have entirely different histories.
8f51affe7c ... c740020fa8

10 changed files with 83 additions and 52 deletions
Show stats Expand all files Collapse all files

89
flake.lock
View file

@ -233,11 +233,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1715526061, "lastModified": 1715342341,
"narHash": "sha256-cVhbpdH8ln4ybFAG3yJFDTbKYTATok8cEkOM94IM0cU=", "narHash": "sha256-o7KB55Nd2QC7eOThktD8uOeE5JseK1aFUPE8o0/j2ZI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "fd35b35000fa11ce540d944966ff17c71c31fd27", "rev": "38911d6df4977b6b00557cc887eb151d032e505b",
"revCount": 4678, "revCount": 4661,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -361,11 +361,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1715515815, "lastModified": 1714910950,
"narHash": "sha256-yaLScMHNFCH6SbB0HSA/8DWDgK0PyOhCXoFTdHlWkhk=", "narHash": "sha256-gaq5bphSsY+htEXFDkImOrH3MVCkxFTvCiwdCJj096E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "09883ca828e8cfaacdb09e29190a7b84ad1d9925", "rev": "26fabca301e1133abd3d9192b1bcb6fb45b30f1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -403,11 +403,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715442723, "lastModified": 1715278311,
"narHash": "sha256-pXMH7lqr5bT2FjH/3tEdTT/+1+hKx+15WkcGKycWWSM=", "narHash": "sha256-Z787hdZuwBhQCQOeOmln5j9cCKxDWql7tbF1ukKDFZU=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "87b7b7e4bd936301b139e472589d1966b136f45f", "rev": "c8ab1e79ba0140bc75731c75177242089506260b",
"revCount": 76, "revCount": 75,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@ -466,11 +466,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715483403, "lastModified": 1714878592,
"narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "f9027322f48b427da23746aa359a6510dfcd0228", "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,11 +497,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1715474941, "lastModified": 1714870069,
"narHash": "sha256-CNCqCGOHdxuiVnVkhTpp2WcqSSmSfeQjubhDOcgwGjU=", "narHash": "sha256-CNCqCGOHdxuiVnVkhTpp2WcqSSmSfeQjubhDOcgwGjU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "58e03b95f65dfdca21979a081aa62db0eed6b1d8", "rev": "4b620020fd73bdd5104e32c702e65b60b6869426",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -518,11 +518,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1715538104, "lastModified": 1715365274,
"narHash": "sha256-946VdjryiaVe1ePENF/JMl0nTjKJYTkvo8Rr4sBpbZM=", "narHash": "sha256-aUt+LN/Qo8roTsXQJgop1JJOwRTg/gtjFj49llQSGA4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "1ed4e32c216c6c36e350a5de3c7c48ad7ebc2aea", "rev": "3c6a8f4c7d1f8cc6d2a6b6ae33f6ec5cda66ba99",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -565,11 +565,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1715499532, "lastModified": 1715220225,
"narHash": "sha256-9UJLb8rdi2VokYcfOBQHUzP3iNxOPNWcbK++ENElpk0=", "narHash": "sha256-X0xvboLSjfC5s/M1yuPdSdc6yzKV8536hTTWCSKF5Xc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "af8b9db5c00f1a8e4b83578acc578ff7d823b786", "rev": "ac34158a823c7596e0106c806d0b7df47885fa73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -597,11 +597,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1715447595, "lastModified": 1715266358,
"narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -611,6 +611,26 @@
"type": "github" "type": "github"
} }
}, },
"pinix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1709390347,
"narHash": "sha256-C7RDQ1xPktZGf8eSDUeZ2ZKetHtM2VJA0C10z0d8tkw=",
"owner": "remi-dupre",
"repo": "pinix",
"rev": "6f7dc0fccb0e48176629d061b07576d092a5d09c",
"type": "github"
},
"original": {
"owner": "remi-dupre",
"repo": "pinix",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"f1multiviewer": "f1multiviewer", "f1multiviewer": "f1multiviewer",
@ -621,6 +641,7 @@
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"pinix": "pinix",
"stable": "stable", "stable": "stable",
"tsm": "tsm", "tsm": "tsm",
"zig2nix": "zig2nix", "zig2nix": "zig2nix",
@ -629,11 +650,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1715395895, "lastModified": 1715218190,
"narHash": "sha256-DreMqi6+qa21ffLQqhMQL2XRUkAGt3N7iVB5FhJKie4=", "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "71bae31b7dbc335528ca7e96f479ec93462323ff", "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -823,11 +844,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715476823, "lastModified": 1715303741,
"narHash": "sha256-Fcx4MS1Kzv7gZd3N3GL6hzJSkOjxpctyFzezxbunhlk=", "narHash": "sha256-Th3zcwyCIQCv2OV8ga1eQ+sEPnMayqf2x45cMU7tedI=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "6dfdf5edbfeee0a93802a81c9fc4c03a4e24f35c", "rev": "4b9a155fd573d1402730ef6350098b502c2f7f91",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -847,11 +868,11 @@
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
}, },
"locked": { "locked": {
"lastModified": 1715376937, "lastModified": 1715175539,
"narHash": "sha256-fXZmddq7ZrEaX0rT4n+46f+qpwMbOdhoY+fCRj70xts=", "narHash": "sha256-HyhR3wu/hupcCD0k3GDASh6WUJrcr6ShjHQVICeW8sU=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "bb19beeb38a8c3df9a2408b8e15664415b8347ef", "rev": "354f83306c1922e2eabe7fdd008c5aa9c72db66d",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -23,6 +23,9 @@
hyprland-contrib.url = "github:hyprwm/contrib"; hyprland-contrib.url = "github:hyprwm/contrib";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
pinix.url = "github:remi-dupre/pinix";
pinix.inputs.nixpkgs.follows = "nixpkgs";
nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.url = "github:nix-community/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs";

3
hosts/algiz/system.nix
View file

@ -8,6 +8,9 @@
bantime = "24h"; bantime = "24h";
}; };
time.timeZone = "America/Chicago";
networking.hostName = "algiz";
# # added to make using `pip install` work in docker build # # added to make using `pip install` work in docker build
# networking.nameservers = [ "8.8.8.8"]; # networking.nameservers = [ "8.8.8.8"];

4
hosts/mannaz/default.nix
View file

@ -1,5 +1,7 @@
{ enabled, ... }: { self, enabled, ... }:
{ {
imports = with self.nixosModules; [ nix-ld ];
oizys = { oizys = {
desktop = enabled; desktop = enabled;
nix-ld = enabled; nix-ld = enabled;

3
hosts/mannaz/system.nix
View file

@ -59,8 +59,10 @@
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.stable;
}; };
programs.nix-ld = enabled;
services.openssh = enabled; services.openssh = enabled;
networking.hostName = "mannaz";
# networking.wireless.enable = true; # networking.wireless.enable = true;
# networking.networkmanager.enable = true; # networking.networkmanager.enable = true;
@ -69,6 +71,7 @@
7860 7860
]; ];
time.timeZone = "America/Chicago";
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
# don't delete this you foo bar # don't delete this you foo bar

3
hosts/othalan/system.nix
View file

@ -23,6 +23,9 @@
environment.systemPackages = with pkgs; [ pamixer ]; environment.systemPackages = with pkgs; [ pamixer ];
networking.hostName = "othalan";
time.timeZone = "US/Central";
# catppuccin/tty move to "module" # catppuccin/tty move to "module"
boot.kernelParams = [ boot.kernelParams = [
"vt.default_red=30,243,166,249,137,245,148,186,88,243,166,249,137,245,148,166" "vt.default_red=30,243,166,249,137,245,148,186,88,243,166,249,137,245,148,166"

17
lib/default.nix
View file

@ -29,14 +29,18 @@ rec {
nixosModules = listToAttrs (findModulesList ../modules); nixosModules = listToAttrs (findModulesList ../modules);
mkSystem = mkSystem =
hostName: hostname:
nixosSystem { nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules =
../modules/oizys.nix [
../overlays ../modules/oizys.nix
inputs.lix-module.nixosModules.default ../overlays
] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostName}")); inputs.lix-module.nixosModules.default
]
++ filter
isNixFile
(listFilesRecursive (../. + "/hosts/${hostname}"));
specialArgs = { specialArgs = {
inherit inherit
@ -46,7 +50,6 @@ rec {
mkDefaultOizysModule mkDefaultOizysModule
mkOizysModule mkOizysModule
enabled enabled
hostName
; ;
}; };
}; };

1
modules/nix.nix
View file

@ -24,6 +24,7 @@
pkgs.nixd pkgs.nixd
pkgs.nixfmt-rfc-style pkgs.nixfmt-rfc-style
self.packages.${pkgs.system}.default self.packages.${pkgs.system}.default
inputs.pinix.packages.${pkgs.system}.default
]; ];
programs.nix-index-database.comma.enable = true; programs.nix-index-database.comma.enable = true;

11
modules/oizys.nix
View file

@ -1,9 +1,4 @@
{ { lib, self, ... }:
lib,
self,
hostName,
...
}:
let let
inherit (lib) mkEnableOption; inherit (lib) mkEnableOption;
in in
@ -40,8 +35,4 @@ in
]; ];
options.oizys.desktop.enable = mkEnableOption "is desktop"; options.oizys.desktop.enable = mkEnableOption "is desktop";
config = {
networking.hostName = hostName;
time.timeZone = "US/Central";
};
} }

1
modules/runes/default.nix
View file

@ -65,6 +65,7 @@ in
number = "2"; # todo: autogenerate based on hostname? number = "2"; # todo: autogenerate based on hostname?
name = cfg.name; name = cfg.name;
}; };
}) })
]; ];
} }