Lillian-Violet/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Lillian-Violet:67cdc3600ea98cb81e392e625d5b83f812a50e63
Branches Tags
Lillian-Violet:main
Lillian-Violet:Desktop-changes
Lillian-Violet:bcachefs-update-broken-queen
Lillian-Violet:fcast
Lillian-Violet:2.0
Lillian-Violet:v1.0
..
compare: Lillian-Violet:f35891bd676e3e114f48578cf099b6895c36ee97
Branches Tags
Lillian-Violet:main
Lillian-Violet:Desktop-changes
Lillian-Violet:bcachefs-update-broken-queen
Lillian-Violet:fcast
Lillian-Violet:2.0
Lillian-Violet:v1.0

No commits in common. "67cdc3600ea98cb81e392e625d5b83f812a50e63" and "f35891bd676e3e114f48578cf099b6895c36ee97" have entirely different histories.
67cdc3600e ... f35891bd67

6 changed files with 49 additions and 41 deletions
Show stats Expand all files Collapse all files

48
flake.lock
View file

@ -403,11 +403,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719401812, "lastModified": 1719236180,
"narHash": "sha256-QONBQ/arBsKZNJuSd3sMIkSYFlBoRJpvf1jGlMfcOuI=", "narHash": "sha256-VZAfBk2Lo8hQy/NQ4XVSpTICT0ownXBUi1QvGfdlxaM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "b6a1262796b2990ec3cc60bb2ec23583f35b2f43", "rev": "dd4d1663ccf7fbdb32361b9afe9e71206584cd4c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -897,11 +897,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719385710, "lastModified": 1719180626,
"narHash": "sha256-0yb5D0wCEtXoTi4ssNZxwvLTrahTwlHYPtx252FZ1MU=", "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "92a26bf6df1f00cbbed16a99d2547531ff4b3a83", "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -917,11 +917,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1719380852, "lastModified": 1719292813,
"narHash": "sha256-Li7zNOomyu0FVtm3TyyeUUCZex6L8QpGAJtiFQKGZGw=", "narHash": "sha256-6w/buoRKo4ijH9O4D/0KjNtiWjtrJebuV7djTEEa0+k=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "fd232b7d5d328619b21b867199b31ce799ae29f3", "rev": "d6222e7818aa5528f8369afe84bc53556a57c329",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1133,11 +1133,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1719391814, "lastModified": 1719145664,
"narHash": "sha256-zlRvpIUQrxMSOi+1lVFuJNvIJt9LB93c05tYQ1KSdRg=", "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "aab67495e34365045f9dfbe58725cc6fa03607b7", "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1180,11 +1180,11 @@
}, },
"nixpkgs-edge": { "nixpkgs-edge": {
"locked": { "locked": {
"lastModified": 1719407708, "lastModified": 1719313272,
"narHash": "sha256-EipdX6SC6uVY/5kdNnDbYQiKoJoeFZHKEet8c34IWsc=", "narHash": "sha256-0YOLZ8BslZZVfpWw/fOE/zn/QKeKOdS87UjuGzI4ciQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "aaa950d4f20622b00dbab53bf7b26c3d9a34939a", "rev": "736555406c2a59499046a31827a1470b6c29402d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1291,11 +1291,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1719254875, "lastModified": 1719075281,
"narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1435,11 +1435,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1719254875, "lastModified": 1719075281,
"narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1474,11 +1474,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719340029, "lastModified": 1719302143,
"narHash": "sha256-j++6RRMNvw+aYwI9qC2svfRwNj/2EEnaty552VIAFX0=", "narHash": "sha256-PMtSsKvbgfoI5+rb7UBIBfIwQ4Zvjt1iChWwQL+BkGo=",
"owner": "pjones", "owner": "pjones",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "004923027388062be53d5b489be51c59c114d857", "rev": "a3b881f62eb3aabb97e4fc68041ef34e8029e186",
"type": "github" "type": "github"
}, },
"original": { "original": {

15
flake.nix
View file

@ -79,11 +79,24 @@
# Add any other flake you might need # Add any other flake you might need
# hardware.url = "github:nixos/nixos-hardware"; # hardware.url = "github:nixos/nixos-hardware";
}; };
nixConfig = {
extra-substituters = [
"https://nix-community.cachix.org"
"https://nixpkgs-unfree.cachix.org"
"https://0uptime.cachix.org"
"https://cache.lix.systems"
];
extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
"0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE="
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
];
};
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
flake-utils,
nixpkgs-edge, nixpkgs-edge,
nixos-generators, nixos-generators,
catppuccin, catppuccin,

2
nixos/hosts/shodan/auto-mount.nix
View file

@ -16,7 +16,7 @@
''; '';
systemd.services."external-drive-mount@" = { systemd.services."external-drive-mount@" = {
path = with pkgs; [udisks bash auto-mount steam]; path = with pkgs; [jq coreutils udisks bash util-linux toybox auto-mount steam];
enable = true; enable = true;
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i"; ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i";

2
nixos/hosts/shodan/configuration.nix
View file

@ -25,7 +25,7 @@
../../../disko/shodan ../../../disko/shodan
./auto-mount.nix # ./auto-mount.nix
]; ];
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;

14
nixos/shared/default.nix
View file

@ -34,18 +34,8 @@
experimental-features = "nix-command flakes"; experimental-features = "nix-command flakes";
# Deduplicate and optimize nix store # Deduplicate and optimize nix store
auto-optimise-store = true; auto-optimise-store = true;
extra-substituters = [ extra-substituters = ["https://cache.lix.systems"];
"https://cache.lix.systems" trusted-public-keys = ["cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="];
"https://nix-community.cachix.org"
"https://nixpkgs-unfree.cachix.org"
"https://0uptime.cachix.org"
];
trusted-public-keys = [
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
"0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE="
];
}; };
}; };

9
pkgs/auto-mount/default.nix
View file

@ -3,6 +3,11 @@
stdenv, stdenv,
system, system,
pkgs, pkgs,
jq,
coreutils,
udisks,
toybox,
util-linux,
writeShellApplication, writeShellApplication,
}: }:
writeShellApplication writeShellApplication
@ -11,7 +16,7 @@ writeShellApplication
name = "auto-mount"; name = "auto-mount";
runtimeInputs = [pkgs.steam]; runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam pkgs.extest];
text = '' text = ''
set -euo pipefail set -euo pipefail
@ -71,7 +76,7 @@ writeShellApplication
# TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent # TODO use -ifrunning and check return value - if there was a steam process and it returns -1, the message wasn't sent
# need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess # need to retry until either steam process is gone or -ifrunning returns 0, or timeout i guess
echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" >> /home/lillian/steam.txt echo "Sent URL to steam: steam://''${command}/''${arg} (steam://''${command}/''${encoded})" >> /home/lillian/steam.txt
systemd-run -M 1000@ --user --collect --wait sh -c "${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" systemd-run -M 1000@ --user --collect --wait sh -c "export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD ${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}"
else else
echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running" echo "Could not send steam URL steam://''${command}/''${arg} (steam://''${command}/''${encoded}) -- steam not running"
fi fi