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

Compare commits

base: 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
...
compare: Lillian-Violet:237f66d10e1280636136039135f645fa578a59b8
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

8 commits
f35891bd67 ... 237f66d10e

Author SHA1 Message Date
Lillian Violet 237f66d10e update flake lock 2024-07-04 16:44:54 +02:00
Lillian Violet 3f149efae6 update flake lock 2024-07-02 11:26:00 +02:00
Lillian Violet 7bc03653c3 Add ffz plugin 2024-06-30 23:13:59 +02:00
Lillian Violet 2a95e688c0 Need jq as well 2024-06-28 23:29:19 +02:00
Lillian Violet 569a253534 Need util-linux for flock 2024-06-28 23:26:41 +02:00
Lillian Violet 62c771d947 Need to add that package 2024-06-28 23:20:37 +02:00
Lillian Violet 67cdc3600e Let's see if this makes auto-mount work now 2024-06-28 23:18:11 +02:00
Lillian Violet bc7c3f803a Queen has been fixed! (also flake lock update, and some small tweaks to reduce errors) 2024-06-26 15:26:00 +02:00
8 changed files with 247 additions and 156 deletions
Show stats Expand all files Collapse all files

353
flake.lock
View file

@ -32,11 +32,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1711742460, "lastModified": 1717279440,
"narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", "rev": "717cc95983cdc357bc347d70be20ced21f935843",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1718887932, "lastModified": 1719676503,
"narHash": "sha256-eo1B6mUPNlRMCe9dgt1bzXinUlD+cD1DdVFj1fxwZnU=", "narHash": "sha256-5ER4843mn9Am8FKsUovaPFzwBIc2LOFvmcd+iUr8P9g=",
"owner": "koverstreet", "owner": "koverstreet",
"repo": "bcachefs-tools", "repo": "bcachefs-tools",
"rev": "411df4e53fdc58cfca2e473e54c1bed9cf17740d", "rev": "755788e2d6065ac35e680a23c48125a5cd63f7b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,11 +97,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1717420532, "lastModified": 1719923519,
"narHash": "sha256-OCCmI69EMaA4BcxRKrXJsx5Ozua2f/PKEy4aJbE7ziM=", "narHash": "sha256-7Rhljj2fsklFRsu+eq7N683Z9qukmreMEj5C1GqCrSA=",
"owner": "cachix", "owner": "cachix",
"repo": "cachix", "repo": "cachix",
"rev": "5727f0676f08a4b41ed13d403ec64dcce989f6e5", "rev": "4e9e71f78b9500fa6210cf1eaa4d75bdbab777c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -111,13 +111,49 @@
"type": "github" "type": "github"
} }
}, },
"cachix_2": {
"inputs": {
"devenv": "devenv_2",
"flake-compat": [
"conduwuit",
"cachix",
"devenv",
"flake-compat"
],
"nixpkgs": [
"conduwuit",
"cachix",
"devenv",
"nixpkgs"
],
"pre-commit-hooks": [
"conduwuit",
"cachix",
"devenv",
"pre-commit-hooks"
]
},
"locked": {
"lastModified": 1712055811,
"narHash": "sha256-7FcfMm5A/f02yyzuavJe06zLa9hcMHsagE28ADcmQvk=",
"owner": "cachix",
"repo": "cachix",
"rev": "02e38da89851ec7fec3356a5c04bc8349cae0e30",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "cachix",
"type": "github"
}
},
"catppuccin": { "catppuccin": {
"locked": { "locked": {
"lastModified": 1719311390, "lastModified": 1719915848,
"narHash": "sha256-eP+SydN7alV3ln7a1BrGhDoLVTBa6RaHxYZ9bTHAQIA=", "narHash": "sha256-zq+CMkdT8A9z74HonwspXp8HsX4OvP4uaVdD98AO6as=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "1adbfeb44a54be0ae79eca751ba948a6faa3bb0f", "rev": "9345073d27d91ab66c1b6ab65df322906992aa59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,11 +182,11 @@
"complement_2": { "complement_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1715700731, "lastModified": 1719903368,
"narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=", "narHash": "sha256-PPzgxM4Bir+Zh9FUV/v+RBxEYeJxYVmi/BYo3uqt268=",
"owner": "matrix-org", "owner": "matrix-org",
"repo": "complement", "repo": "complement",
"rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5", "rev": "bc97f1ddc1cd7485faf80c8935ee2641f3e1b57c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,7 +228,7 @@
"crane": "crane_5", "crane": "crane_5",
"fenix": "fenix_3", "fenix": "fenix_3",
"flake-compat": "flake-compat_8", "flake-compat": "flake-compat_8",
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_5",
"liburing": "liburing", "liburing": "liburing",
"nix-filter": "nix-filter_2", "nix-filter": "nix-filter_2",
"nixpkgs": [ "nixpkgs": [
@ -201,11 +237,11 @@
"rocksdb": "rocksdb_2" "rocksdb": "rocksdb_2"
}, },
"locked": { "locked": {
"lastModified": 1719159653, "lastModified": 1720072522,
"narHash": "sha256-nLl9hKldeNuViMK/fvf2YEirlbcWeQrZXhUQORWt16w=", "narHash": "sha256-ZHYStZaFXB28CjKmk3bHtLTMXFj0OVs84GpFJJIzggs=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "conduwuit", "repo": "conduwuit",
"rev": "6f9d7b5667c9d4ae62712d4c8e6622c97bcf93c8", "rev": "9a0ffd55da7ebc530040be6f0cc2b64c70447bfa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -288,11 +324,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1702918879, "lastModified": 1717025063,
"narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", "narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", "rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,17 +403,55 @@
}, },
"devenv": { "devenv": {
"inputs": { "inputs": {
"cachix": "cachix_2",
"flake-compat": [ "flake-compat": [
"conduwuit", "conduwuit",
"cachix", "cachix",
"flake-compat" "flake-compat"
], ],
"nix": "nix_2",
"nixpkgs": [
"conduwuit",
"cachix",
"nixpkgs"
],
"pre-commit-hooks": [
"conduwuit",
"cachix",
"pre-commit-hooks"
]
},
"locked": {
"lastModified": 1719759336,
"narHash": "sha256-3a34VL/QnHprl5gMy9xlx6d8J+iNp+W88Ex8smkgH9M=",
"owner": "cachix",
"repo": "devenv",
"rev": "bb32aa986f2f695385e54428d0eaf7d05b31466e",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "devenv",
"type": "github"
}
},
"devenv_2": {
"inputs": {
"flake-compat": [
"conduwuit",
"cachix",
"devenv",
"cachix",
"flake-compat"
],
"nix": "nix", "nix": "nix",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"poetry2nix": "poetry2nix", "poetry2nix": "poetry2nix",
"pre-commit-hooks": [ "pre-commit-hooks": [
"conduwuit", "conduwuit",
"cachix", "cachix",
"devenv",
"cachix",
"pre-commit-hooks" "pre-commit-hooks"
] ]
}, },
@ -403,11 +477,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719236180, "lastModified": 1720056646,
"narHash": "sha256-VZAfBk2Lo8hQy/NQ4XVSpTICT0ownXBUi1QvGfdlxaM=", "narHash": "sha256-BymcV4HWtx2VFuabDCM4/nEJcfivCx0S02wUCz11mAY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "dd4d1663ccf7fbdb32361b9afe9e71206584cd4c", "rev": "64679cd7f318c9b6595902b47d4585b1d51d5f9e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -653,11 +727,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717285511, "lastModified": 1719994518,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -768,6 +842,7 @@
}, },
"original": { "original": {
"owner": "numtide", "owner": "numtide",
"ref": "main",
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
@ -786,7 +861,6 @@
}, },
"original": { "original": {
"owner": "numtide", "owner": "numtide",
"ref": "main",
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
@ -827,24 +901,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_9": {
"inputs": {
"systems": "systems_7"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -897,11 +953,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719180626, "lastModified": 1720045378,
"narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "rev": "0a30138c694ab3b048ac300794c2eb599dc40266",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -917,11 +973,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1719292813, "lastModified": 1720025282,
"narHash": "sha256-6w/buoRKo4ijH9O4D/0KjNtiWjtrJebuV7djTEEa0+k=", "narHash": "sha256-I70ARXPm1YjGJ0efykd5zsapUZtmVZ/sIgwJ0F0j17w=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "d6222e7818aa5528f8369afe84bc53556a57c329", "rev": "8dd0f8383bd60b8ed66cd27c1b49cdbf7be4ad9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -935,17 +991,17 @@
"crane": "crane_6", "crane": "crane_6",
"flake-compat": "flake-compat_9", "flake-compat": "flake-compat_9",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_8", "flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_7",
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1718782018, "lastModified": 1719818887,
"narHash": "sha256-8SBmf7Sx5xMLzL4VGEU0fe8cuq0yMumdkXgOPXXD3Bo=", "narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "6fa7bc0522f71d3906a3788bbd80c344cd9c4523", "rev": "0e6457c98547ec8866714d4222545e7e8c1ae429",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -957,11 +1013,11 @@
"liburing": { "liburing": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716565485, "lastModified": 1719025212,
"narHash": "sha256-4R19aJNQYs6vb0/Hz4bWT56YN1P1DkFL/sxdE4Yj0CE=", "narHash": "sha256-kD0yhjNStqC6uFqC1AxBwUpc/HlSFtiKrV+gwDyroDc=",
"owner": "axboe", "owner": "axboe",
"repo": "liburing", "repo": "liburing",
"rev": "b90c0e670a93caabbebe2d9e24ff85cece4cfe0e", "rev": "7b3245583069bd481190c9da18f22e9fc8c3a805",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -978,16 +1034,18 @@
"conduwuit", "conduwuit",
"cachix", "cachix",
"devenv", "devenv",
"cachix",
"devenv",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1708577783, "lastModified": 1712911606,
"narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", "narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=",
"owner": "domenkozar", "owner": "domenkozar",
"repo": "nix", "repo": "nix",
"rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", "rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1035,6 +1093,8 @@
"conduwuit", "conduwuit",
"cachix", "cachix",
"devenv", "devenv",
"cachix",
"devenv",
"poetry2nix", "poetry2nix",
"nixpkgs" "nixpkgs"
] ]
@ -1082,11 +1142,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719111455, "lastModified": 1719832725,
"narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", "rev": "2917972ed34ce292309b3a4976286f8b5c08db27",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1095,13 +1155,44 @@
"type": "github" "type": "github"
} }
}, },
"nix_2": {
"inputs": {
"flake-compat": [
"conduwuit",
"cachix",
"devenv",
"flake-compat"
],
"nixpkgs": [
"conduwuit",
"cachix",
"devenv",
"nixpkgs"
],
"nixpkgs-regression": "nixpkgs-regression_2"
},
"locked": {
"lastModified": 1712911606,
"narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=",
"owner": "domenkozar",
"repo": "nix",
"rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12",
"type": "github"
},
"original": {
"owner": "domenkozar",
"ref": "devenv-2.21",
"repo": "nix",
"type": "github"
}
},
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1712450863, "lastModified": 1719708727,
"narHash": "sha256-K6IkdtMtq9xktmYPj0uaYc8NsIqHuaAoRBaMgu9Fvrw=", "narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "3c62b6a12571c9a7f65ab037173ee153d539905f", "rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1118,11 +1209,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718025593, "lastModified": 1720055043,
"narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", "narHash": "sha256-SKizewU4UeYrkZWPUjur8EoxscGoNb0pGcrNL4YzAIg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", "rev": "168b220231a70e47cc1f0919048fa5914415fb18",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1133,11 +1224,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1719145664, "lastModified": 1719895800,
"narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1180,11 +1271,11 @@
}, },
"nixpkgs-edge": { "nixpkgs-edge": {
"locked": { "locked": {
"lastModified": 1719313272, "lastModified": 1720104015,
"narHash": "sha256-0YOLZ8BslZZVfpWw/fOE/zn/QKeKOdS87UjuGzI4ciQ=", "narHash": "sha256-jOP2BID6nd4prNl5AXwEX97WIB9TqvcE/+scdKVfNug=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "736555406c2a59499046a31827a1470b6c29402d", "rev": "30a4d0f448db4f73897abdb32fcdc6092a050bd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1209,6 +1300,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-regression_2": {
"locked": {
"lastModified": 1643052045,
"narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1711460390, "lastModified": 1711460390,
@ -1243,11 +1350,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1710695816, "lastModified": 1718811006,
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "614b4613980a522ba49f0d194531beddbb7220d3", "rev": "03d771e513ce90147b65fe922d87d3a0356fc125",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1275,11 +1382,11 @@
}, },
"nixpkgs-stable_5": { "nixpkgs-stable_5": {
"locked": { "locked": {
"lastModified": 1719099622, "lastModified": 1719663039,
"narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1291,11 +1398,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1719075281, "lastModified": 1719848872,
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1307,11 +1414,11 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1718983919, "lastModified": 1719468428,
"narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90338afd6177fc683a04d934199d693708c85a3b", "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1387,11 +1494,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1715534503, "lastModified": 1719848872,
"narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2057814051972fa1453ddfb0d98badbea9b83c06", "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1435,11 +1542,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1719075281, "lastModified": 1719848872,
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1474,11 +1581,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719302143, "lastModified": 1719875930,
"narHash": "sha256-PMtSsKvbgfoI5+rb7UBIBfIwQ4Zvjt1iChWwQL+BkGo=", "narHash": "sha256-jQmdWLxRP6BzOxRF8hQEhDD7UKw7UrnYbmaAPOSaXWY=",
"owner": "pjones", "owner": "pjones",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "a3b881f62eb3aabb97e4fc68041ef34e8029e186", "rev": "7e062fcd669e261fb06cf54fe0ef2e46c3db8e83",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1495,6 +1602,8 @@
"conduwuit", "conduwuit",
"cachix", "cachix",
"devenv", "devenv",
"cachix",
"devenv",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -1515,7 +1624,6 @@
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_7", "flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_5",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"conduwuit", "conduwuit",
@ -1525,11 +1633,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1715609711, "lastModified": 1719259945,
"narHash": "sha256-/5u29K0c+4jyQ8x7dUIEUWlz2BoTSZWUP2quPwFCE7M=", "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "c182c876690380f8d3b9557c4609472ebfa1b141", "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1585,16 +1693,16 @@
"rocksdb_2": { "rocksdb_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716773462, "lastModified": 1719949653,
"narHash": "sha256-5kUH+XK+2lbFfUgbxuNy3YMLHbp6scfWPdtc8za1wDM=", "narHash": "sha256-DYx7XHH2GEh17GukKhXs6laM6l+eugCmRkF0adpi9wk=",
"owner": "girlbossceo", "owner": "girlbossceo",
"repo": "rocksdb", "repo": "rocksdb",
"rev": "c8a1450231e9c608edf535538dbe8ca1a8d2f3bc", "rev": "a935c0273e1ba44eacf88ce3685a9b9831486155",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "girlbossceo", "owner": "girlbossceo",
"ref": "v9.2.1", "ref": "v9.3.1",
"repo": "rocksdb", "repo": "rocksdb",
"type": "github" "type": "github"
} }
@ -1607,7 +1715,7 @@
"conduwuit": "conduwuit", "conduwuit": "conduwuit",
"disko": "disko", "disko": "disko",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_6",
"home-manager": "home-manager", "home-manager": "home-manager",
"jovian": "jovian", "jovian": "jovian",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
@ -1748,11 +1856,11 @@
"nixpkgs-stable": "nixpkgs-stable_5" "nixpkgs-stable": "nixpkgs-stable_5"
}, },
"locked": { "locked": {
"lastModified": 1719268571, "lastModified": 1719873517,
"narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=", "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3", "rev": "a11224af8d824935f363928074b4717ca2e280db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1851,21 +1959,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1890,16 +1983,16 @@
"zjstatus": { "zjstatus": {
"inputs": { "inputs": {
"crane": "crane_7", "crane": "crane_7",
"flake-utils": "flake-utils_9", "flake-utils": "flake-utils_8",
"nixpkgs": "nixpkgs_11", "nixpkgs": "nixpkgs_11",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1719140798, "lastModified": 1719650330,
"narHash": "sha256-3Zo8kD/NQhHTkeVSRCSXYX86fnZyk/EJ15pH365tZY0=", "narHash": "sha256-spoLPg8Ty7LvypwM4JpuWA06B/TUcIzyjs+N1nzGha4=",
"owner": "dj95", "owner": "dj95",
"repo": "zjstatus", "repo": "zjstatus",
"rev": "2f0a24cb31ce94be568e4f57051d98a9318049b9", "rev": "f5fd92d8ebd3152b0db4c85c6ff7b638c6f52d14",
"type": "github" "type": "github"
}, },
"original": { "original": {

15
flake.nix
View file

@ -79,24 +79,11 @@
# 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,

4
nixos/desktop/package-configs/firefox/default.nix
View file

@ -118,6 +118,10 @@
install_url = "https://addons.mozilla.org/firefox/downloads/file/4047136/wayback_machine_new-3.2.xpi"; install_url = "https://addons.mozilla.org/firefox/downloads/file/4047136/wayback_machine_new-3.2.xpi";
installation_mode = "force_installed"; installation_mode = "force_installed";
}; };
"frankerfacez@frankerfacez.com" = {
install_url = "https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi";
installation_mode = "force_installed";
};
}; };
FirefoxHome = { FirefoxHome = {
Search = true; Search = true;

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; [jq coreutils udisks bash util-linux toybox auto-mount steam]; path = with pkgs; [util-linux udisks bash auto-mount steam jq];
enable = true; enable = true;
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i"; ExecStart = "${pkgs.auto-mount}/bin/auto-mount add %i";

4
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;
@ -49,7 +49,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Custom tools # Custom tools
# auto-mount auto-mount
#System: #System:
btrfs-progs btrfs-progs

14
nixos/shared/default.nix
View file

@ -34,8 +34,18 @@
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 = ["https://cache.lix.systems"]; extra-substituters = [
trusted-public-keys = ["cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="]; "https://cache.lix.systems"
"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,11 +3,8 @@
stdenv, stdenv,
system, system,
pkgs, pkgs,
jq,
coreutils,
udisks,
toybox,
util-linux, util-linux,
jq,
writeShellApplication, writeShellApplication,
}: }:
writeShellApplication writeShellApplication
@ -16,7 +13,7 @@ writeShellApplication
name = "auto-mount"; name = "auto-mount";
runtimeInputs = [jq coreutils udisks util-linux toybox pkgs.steam pkgs.extest]; runtimeInputs = [pkgs.steam];
text = '' text = ''
set -euo pipefail set -euo pipefail
@ -76,7 +73,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 "export LD_PRELOAD=${pkgs.extest}/lib/libextest.so:$LD_PRELOAD ${pkgs.steam}/bin/steam steam://''${command}/''${encoded@Q}" systemd-run -M 1000@ --user --collect --wait sh -c "${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

2
pkgs/default.nix
View file

@ -12,6 +12,6 @@ pkgs: {
upgrade = pkgs.callPackage ./upgrade {}; upgrade = pkgs.callPackage ./upgrade {};
restart = pkgs.callPackage ./restart {}; restart = pkgs.callPackage ./restart {};
phanpy = pkgs.callPackage ./phanpy {}; phanpy = pkgs.callPackage ./phanpy {};
# auto-mount = pkgs.callPackage ./auto-mount {}; auto-mount = pkgs.callPackage ./auto-mount {};
simple-completion-language-server = pkgs.callPackage ./simple-completion-language-server {}; simple-completion-language-server = pkgs.callPackage ./simple-completion-language-server {};
} }