noe/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

awa

Browse source
This commit is contained in:
41666 2025-03-28 15:42:30 -07:00
parent c5c87f75d0
commit d4375b84a8
8 changed files with 76 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
flake.lock generated
View file

@ -7,11 +7,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1738646237, "lastModified": 1742098834,
"narHash": "sha256-++0dXoZO9l5oceiGQsJmtUI5WXlPMw6QKjpg7vGPl3w=", "narHash": "sha256-l98XVpNXW6hr0AsxCeQZbdf6EGT8OpHdkWBi7sdel4s=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "3d1c6c27b14c4b8fcbdaec779e715f30cb72ed15", "rev": "8457960249bcfd34c22838e20eaa7d8261428688",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -296,11 +296,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740845322, "lastModified": 1741955947,
"narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=", "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d", "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -447,15 +447,15 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737234286, "lastModified": 1741509550,
"narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", "narHash": "sha256-O7+c7MYOvKnGhE5qwRqV+q0NePEtiz6spM1Mfu/Heck=",
"rev": "2837da71ec1588c1187d2e554719b15904a46c8b", "rev": "0d1f794178d42bfa1ef40ecb80be514139779184",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/0d1f794178d42bfa1ef40ecb80be514139779184.tar.gz?rev=0d1f794178d42bfa1ef40ecb80be514139779184"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" "url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz"
} }
}, },
"lix-module": { "lix-module": {
@ -468,15 +468,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737237494, "lastModified": 1741892773,
"narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", "narHash": "sha256-8oUT6D7VlsuLkms3zBsUaPBUoxucmFq62QdtyVpjq0Y=",
"rev": "b90bf629bbd835e61f1317b99e12f8c831017006", "rev": "ed7a2fa83145868ecb830d6b3c73ebfd81a9e911",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/ed7a2fa83145868ecb830d6b3c73ebfd81a9e911.tar.gz?rev=ed7a2fa83145868ecb830d6b3c73ebfd81a9e911"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-1.tar.gz"
} }
}, },
"nixlib": { "nixlib": {
@ -515,11 +515,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1740646007, "lastModified": 1741792691,
"narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "rev": "e1f12151258b12c567f456d8248e4694e9390613",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -531,11 +531,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738410390, "lastModified": 1741851582,
"narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -607,11 +607,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1741037377, "lastModified": 1742158671,
"narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "narHash": "sha256-ygAipZPx9TsvIyDTjW9egkdyTicKpD8CoVBJUk9Xm5s=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "02032da4af073d0f6110540c8677f16d4be0117f", "rev": "178d364c0fb576b2b116e3b7b0705943eacf25f8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -623,11 +623,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1740932899, "lastModified": 1741862977,
"narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=", "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347", "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -639,11 +639,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1741010256, "lastModified": 1742069588,
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -703,11 +703,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1741010256, "lastModified": 1742069588,
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -719,11 +719,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1731763621, "lastModified": 1741708242,
"narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", "narHash": "sha256-cNRqdQD4sZpN7JLqxVOze4+WsWTmv2DGH0wNCOVwrWc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", "rev": "b62d2a95c72fb068aecd374a7262b37ed92df82b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -742,11 +742,11 @@
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch"
}, },
"locked": { "locked": {
"lastModified": 1740520037, "lastModified": 1741814789,
"narHash": "sha256-TpZMYjOre+6GhKDVHFwoW2iBWqpNQppQTuqIAo+OBV8=", "narHash": "sha256-NbHsnnNwiYUcUaS4z8XK2tYpo3G8NXEKxaKkzMgMiLk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "6f8d8f7aee84f377f52c8bb58385015f9168a666", "rev": "33097dcf776d1fad0ff3842096c4e3546312f251",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -937,11 +937,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1739262228, "lastModified": 1741861888,
"narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", "narHash": "sha256-ynOgXAyToeE1UdLNfrUn/hL7MN0OpIS2BtNdLjpjPf0=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", "rev": "d016ce0365b87d848a57c12ffcfdc71da7a2b55f",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -3,7 +3,7 @@
inputs = { inputs = {
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs-master"; inputs.nixpkgs.follows = "nixpkgs-master";
}; };
@ -114,7 +114,7 @@
]; ];
mkNixos = modules: nixpkgs.lib.nixosSystem { mkNixos = modules: nixpkgs.lib.nixosSystem {
modules = [ lix-module.nixosModules.lixFromNixpkgs ] ++ modules; modules = [ lix-module.nixosModules.default ] ++ modules;
specialArgs = { inherit inputs outputs; }; specialArgs = { inherit inputs outputs; };
}; };

2
home-manager/noe/hosts/aerial.nix
View file

@ -6,7 +6,6 @@
../../features/kitty.nix ../../features/kitty.nix
../../features/vesktop ../../features/vesktop
../../features/retroarch.nix ../../features/retroarch.nix
../../features/wine.nix
]; ];
home.packages = with pkgs; let home.packages = with pkgs; let
@ -38,6 +37,7 @@
obsidian obsidian
lutris lutris
local-pkgs.beyond-all-reason local-pkgs.beyond-all-reason
local-pkgs.mspaint
]; ];
programs.vscode = { programs.vscode = {

1
nixos/features/nas0.nix
View file

@ -48,6 +48,7 @@ in {
in [ in [
"${automount_opts},x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s" "${automount_opts},x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"
"X-mount.mkdir" "X-mount.mkdir"
"x-systemd.requires=tailscaled.service"
typeOptions typeOptions
]; ];
}; };

20
nixos/hosts/aerial/default.nix
View file

@ -3,18 +3,19 @@
./hardware-configuration.nix ./hardware-configuration.nix
../../client.nix ../../client.nix
../../features/plasma6.nix
../../features/tailscale.nix
../../features/sound
../../features/nvidia.nix
../../features/nvidia-no-vrr.nix
../../features/steam.nix
../../features/podman.nix
../../features/bluetooth.nix ../../features/bluetooth.nix
../../features/no-rgb.nix
../../features/telemetry
../../features/nas0.nix ../../features/nas0.nix
../../features/no-rgb.nix
../../features/nvidia-no-vrr.nix
../../features/nvidia.nix
../../features/plasma6.nix
../../features/podman.nix
../../features/protonvpn.nix ../../features/protonvpn.nix
../../features/sound
../../features/steam.nix
../../features/tailscale.nix
../../features/telemetry
../../features/wine.nix
]; ];
home-manager.users.noe = import ../../../home-manager/noe/hosts/aerial.nix; home-manager.users.noe = import ../../../home-manager/noe/hosts/aerial.nix;
@ -32,6 +33,7 @@
}; };
internal.nas0.useSMB = true; internal.nas0.useSMB = true;
internal.wine = pkgs.wine;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
python3 python3

15
nixos/stacks/ps2.live/saerro.nix
View file

@ -76,4 +76,19 @@ in {
OnUnitActiveSec = "420m"; OnUnitActiveSec = "420m";
}; };
}; };
systemd.services.start-saerro-if-stopped = {
serviceConfig.Type = "oneshot";
script = ''
systemctl start podman-saerro_ws
'';
};
systemd.timers.start-saerro-if-stopped = {
wantedBy = [ "timers.target" ];
timerConfig = {
Unit = "start-saerro-if-stopped.service";
OnUnitActiveSec = "15m";
};
};
} }

2
nixpkgs.nix
View file

@ -1,7 +1,7 @@
# A nixpkgs instance that is grabbed from the pinned nixpkgs commit in the lock file # A nixpkgs instance that is grabbed from the pinned nixpkgs commit in the lock file
# This is useful to avoid using channels when using legacy nix commands # This is useful to avoid using channels when using legacy nix commands
let let
lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked; lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs-master.locked;
in import (fetchTarball { in import (fetchTarball {
url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz"; url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";
sha256 = lock.narHash; sha256 = lock.narHash;

2
overlays/default.nix
View file

@ -32,4 +32,6 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
lix = inputs.lix-module.overlays.default;
} }