Grimmauld/grimm-nixos-laptop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update

Browse source
This commit is contained in:
Grimmauld 2025-02-19 23:30:28 +01:00
parent 6c9de2273d
commit 31e1aba73f
No known key found for this signature in database
13 changed files with 67 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/printing.nix
View file

@ -10,8 +10,8 @@ in
{ {
config = lib.mkIf (enable && config.services.printing.enable) { config = lib.mkIf (enable && config.services.printing.enable) {
services.printing.drivers = with pkgs; [ services.printing.drivers = with pkgs; [
brgenml1lpr # brgenml1lpr
brgenml1cupswrapper # brgenml1cupswrapper
]; ];
services.avahi = { services.avahi = {
# enable = true; # enable = true;

7
common/tooling/default.nix
View file

@ -63,6 +63,7 @@ in
undollar undollar
openssl openssl
android-tools
] ]
++ optionals graphical [ ++ optionals graphical [
wev wev
@ -90,6 +91,12 @@ in
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;
# zramSwap.enable = false; # zramSwap.enable = false;
services.udev.packages = [
pkgs.android-udev-rules
];
programs.adb.enable = true;
}; };
options.grimmShared.tooling = { options.grimmShared.tooling = {

3
common/tooling/rust.nix
View file

@ -22,8 +22,9 @@ in
[ [
pkg-config pkg-config
cargo cargo
rustup
] ]
++ optionals graphical [ jetbrains.clion ]; ++ optionals graphical [ jetbrains.clion jetbrains.rust-rover ];
grimmShared.tooling.lang_servers = [ grimmShared.tooling.lang_servers = [
{ {

3
custom/deskwhich/package.nix
View file

@ -15,7 +15,8 @@ rustPlatform.buildRustPackage {
hash = "sha256-uSXxUehZY1Sp08X3khSQtQc8AT00jJTAsQ+OfTTTkss="; hash = "sha256-uSXxUehZY1Sp08X3khSQtQc8AT00jJTAsQ+OfTTTkss=";
}; };
cargoHash = "sha256-x0ARqeMdmnjMF0o2oZlxHnUUj9hEdqg4a+Z/WYax2Co="; useFetchCargoVendor = true;
cargoHash = "sha256-e4wWQ0QOl0vDRbOFs7eN49sQJXBiJGsHiDLE68NiK8Y=";
meta = { meta = {
description = "tool to find the path of desktop entries"; description = "tool to find the path of desktop entries";

48
flake.lock generated
View file

@ -10,11 +10,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1737538029, "lastModified": 1739727446,
"narHash": "sha256-I4mWZEWV1c+sPb5f8liQxYdEjRxMR0UzY6dgP5zj2Kc=", "narHash": "sha256-t+KH1NoR/HauQlYgKaNKkxCoSQ4PwPdp5r6nGc3K/tE=",
"owner": "LordGrimmauld", "owner": "LordGrimmauld",
"repo": "aa-alias-manager", "repo": "aa-alias-manager",
"rev": "14b4d3f64c06f6c4457a1d117bb201410422009d", "rev": "cf56427c87bf93537f0c4f9896beef2da146860b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -141,11 +141,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737973837, "lastModified": 1739809963,
"narHash": "sha256-LrM+QVWUZhPKbjm2I5EkypupivGHjr/AM4rCaNbCFfE=", "narHash": "sha256-h591Geqwg7uum8gj06OUZqbu9PGwUixDqgTRTcAkPxc=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "f19af140dacd0e211a25cf907be46356347e190f", "rev": "fed54798c45c0729877c5e5b9091da83ab509fa7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,11 +202,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1737268357, "lastModified": 1739687593,
"narHash": "sha256-J3At8JDKpQGDeDUcz1eh0h5yFwNH7fPfm+N95TxiOq4=", "narHash": "sha256-K7+n5+W2OrqEjeVb4422YxwNw1m4lCfnd+QWCnm+Dgs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "f9662e6ea6020671e1e17102bd20d6692bb38aba", "rev": "a712b739a49e10fe73de366a42a43b2714e41bfc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -365,11 +365,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737221749, "lastModified": 1739802995,
"narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", "narHash": "sha256-kZv0upOigS/4sUEgZuZd6/uO6s8X8oYOLk9/sGMsl+c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "97d7946b5e107dd03cc82f21165251d4e0159655", "rev": "9d0d48f4c3d2fb1a8c8607da143bb567a741d914",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -407,11 +407,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737126697, "lastModified": 1739640234,
"narHash": "sha256-k1YhjONkiKBHzbjNy4ZsjysBac5UJSolCVq9cTKLeKM=", "narHash": "sha256-+o3AWAC0GICcvdn+vXGmQ5hXJSALdD3rgnt+SZLRQKU=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "27a0ddac1a14e10ba98530f59db728951495f2ce", "rev": "dc10b4ba56665c66562a5e993c9734fe89c29c65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -495,11 +495,11 @@
"nixpkgs-24_11": "nixpkgs-24_11" "nixpkgs-24_11": "nixpkgs-24_11"
}, },
"locked": { "locked": {
"lastModified": 1737736848, "lastModified": 1739121270,
"narHash": "sha256-VrUfCXBXYV+YmQ2OvVTeML9EnmaPRtH+POrNIcJp6yo=", "narHash": "sha256-EmJhpy9U8sVlepl2QPjG019VfG67HcucsQNItTqW6cA=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "6b425d13f5a9d73cb63973d3609acacef4d1e261", "rev": "8c1c4640b878c692dd3d8055e8cdea0a2bbd8cf3",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -531,11 +531,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738142207, "lastModified": 1739736696,
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -599,11 +599,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737215993, "lastModified": 1739512757,
"narHash": "sha256-W8xioeq+h9dzGvtXPlQAn2nXtgNDN6C8uA1/9F2JP5I=", "narHash": "sha256-QfmtsyySvQSEKLuB850AmyqpNQRP+T57vuZnGIpmGD4=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "248bd511aee2c1c1cb2d5314649521d6d93b854a", "rev": "40e4f9130f4e44f20961a7cf4ade46325126698b",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
hardening/apparmor/apparmor-d-package.nix
View file

@ -6,18 +6,19 @@
}: }:
buildGoModule { buildGoModule {
pname = "apparmor-d"; pname = "apparmor-d";
version = "unstable-2025-01-19"; version = "unstable-2025-02-18";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "e41c5f6055197b3ad0985f5af735b7d272148360"; rev = "af85db9148b17bb37b4d73454e78d4efec4c2db9";
owner = "roddhjav"; owner = "roddhjav";
repo = "apparmor.d"; repo = "apparmor.d";
hash = "sha256-Dyn8aMh63VIBb7mhyP/bEp3NhmIlDZs1WHse8jgi5o4="; hash = "sha256-mCc1DQXQvzeeA+sq67zK5o18tKByaB5dITmC77j9uEM=";
}; };
vendorHash = null; vendorHash = null;
doCheck = false; doCheck = false;
dontCheckForBrokenSymlinks = true;
patches = [ patches = [
./apparmor-d-prebuild.patch ./apparmor-d-prebuild.patch

1
hardening/default.nix
View file

@ -72,6 +72,7 @@
security.unprivilegedUsernsClone = true; security.unprivilegedUsernsClone = true;
security.apparmor.enable = true; security.apparmor.enable = true;
security.allowSimultaneousMultithreading = true; security.allowSimultaneousMultithreading = true;
security.pam.services.systemd-run0 = {};
environment.defaultPackages = lib.mkForce [ ]; environment.defaultPackages = lib.mkForce [ ];
environment.systemPackages = with pkgs; [ nano clamav linux-bench ]; environment.systemPackages = with pkgs; [ nano clamav linux-bench ];
} }

2
hardening/systemd/default.nix
View file

@ -13,7 +13,7 @@ let
in in
{ {
imports = [ imports = [
./NetworkManager.nix # ./NetworkManager.nix
./wpa_supplicant.nix ./wpa_supplicant.nix
./auditd.nix ./auditd.nix
./acpid.nix ./acpid.nix

4
hm/common/default.nix
View file

@ -41,10 +41,12 @@ in
# kicad # kicad
prusa-slicer prusa-slicer
# freecad freecad
openscad openscad
iamb iamb
confy confy
authenticator
signal-desktop
vlc vlc
# blender # blender

8
overlays/default.nix
View file

@ -2,6 +2,7 @@
config, config,
lib, lib,
inputs, inputs,
options,
... ...
}: }:
{ {
@ -11,7 +12,7 @@
#]; #];
nixpkgs.overlays = nixpkgs.overlays =
map (map
( (
f: f:
( (
@ -35,5 +36,8 @@
./ranger.nix ./ranger.nix
./vesktop.nix ./vesktop.nix
# ./grpcio-tools.nix # ./grpcio-tools.nix
]; ]
)
++ [ (import ./global/overlays.nix) ];
nix.nixPath = options.nix.nixPath.default ++ [ "nixpkgs-overlays=${./global}" ];
} }

3
overlays/global/overlays.nix Normal file
View file

@ -0,0 +1,3 @@
final: prev: {
devenv = builtins.throw "no devenv for you!";
}

12
specific/grimm-nixos-ssd/filesystems.nix
View file

@ -48,7 +48,7 @@ in
"rw" "rw"
"relatime" "relatime"
"mode=1777" "mode=1777"
"noexec" # "noexec"
"nosuid" "nosuid"
"nodev" "nodev"
]; ];
@ -97,6 +97,16 @@ in
]; ];
}; };
fileSystems."/etc/NetworkManager/vpn-certs" = {
device = "${persist}/etc/NetworkManager/vpn-certs";
options = [
"bind"
"noexec"
"nosuid"
"nodev"
];
};
fileSystems."/nix" = { fileSystems."/nix" = {
device = "zpool/nix"; device = "zpool/nix";
fsType = "zfs"; fsType = "zfs";

1
users.nix
View file

@ -29,6 +29,7 @@
"gamemode" "gamemode"
"systemd-journal" "systemd-journal"
"i2c" "i2c"
"adbusers"
]; # only add to groups that actually exist on this system ]; # only add to groups that actually exist on this system
# syncPaths = [ # syncPaths = [