commit 128928a7f09f286ed1a95b46ce9e8f478785bbcf
parent 2dc682721b1978bbf8676e411a74b1dcbff96929
Author: Milutin Popovic <milutin@popovic.xyz>
Date: Sun, 8 Mar 2026 21:51:54 +0000
fix linux build
Diffstat:
6 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -8,11 +8,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1765765778,
- "narHash": "sha256-w7nVSCFHEcTcrbQEzVdx5MaE+7iTaAtLHjV2jfOTSCI=",
+ "lastModified": 1772718834,
+ "narHash": "sha256-/RtaLou67cDUWO1ewGrEOfvCi3tuz7TjIcawqGHxAcM=",
"owner": "HeitorAugustoLN",
"repo": "betterfox-nix",
- "rev": "b3dae410c6f9e632955c67d77791ae231a7dd3c3",
+ "rev": "4bd94674fbe4949b14207b2c4b7d832760b920e3",
"type": "github"
},
"original": {
@@ -28,11 +28,11 @@
]
},
"locked": {
- "lastModified": 1766150702,
- "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
+ "lastModified": 1772867152,
+ "narHash": "sha256-RIFgZ4O6Eg+5ysZ8Tqb3YvcqiRaNy440GEY22ltjRrs=",
"owner": "nix-community",
"repo": "disko",
- "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
+ "rev": "eaafb89b56e948661d618eefd4757d9ea8d77514",
"type": "github"
},
"original": {
@@ -69,11 +69,11 @@
]
},
"locked": {
- "lastModified": 1772845525,
- "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=",
+ "lastModified": 1772985285,
+ "narHash": "sha256-wEEmvfqJcl9J0wyMgMrj1TixOgInBW/6tLPhWGoZE3s=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0",
+ "rev": "5be5d8245cbc7bc0c09fbb5f38f23f223c543f85",
"type": "github"
},
"original": {
@@ -104,11 +104,11 @@
]
},
"locked": {
- "lastModified": 1772379624,
- "narHash": "sha256-NG9LLTWlz4YiaTAiRGChbrzbVxBfX+Auq4Ab/SWmk4A=",
+ "lastModified": 1773000227,
+ "narHash": "sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE=",
"owner": "nix-darwin",
"repo": "nix-darwin",
- "rev": "52d061516108769656a8bd9c6e811c677ec5b462",
+ "rev": "da529ac9e46f25ed5616fd634079a5f3c579135f",
"type": "github"
},
"original": {
@@ -135,11 +135,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1767185284,
- "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
+ "lastModified": 1772972630,
+ "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
+ "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
"type": "github"
},
"original": {
@@ -166,11 +166,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1767379071,
- "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+ "lastModified": 1772773019,
+ "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+ "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
"type": "github"
},
"original": {
@@ -181,11 +181,11 @@
},
"nixpkgs_stable": {
"locked": {
- "lastModified": 1767325753,
- "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=",
+ "lastModified": 1772822230,
+ "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "64049ca74d63e971b627b5f3178d95642e61cedd",
+ "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
"type": "github"
},
"original": {
@@ -214,11 +214,11 @@
]
},
"locked": {
- "lastModified": 1766894905,
- "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=",
+ "lastModified": 1772944399,
+ "narHash": "sha256-xTzsSd3r5HBeufSZ3fszAn0ldfKctvsYG7tT2YJg5gY=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7",
+ "rev": "c8e69670b316d6788e435a3aa0bda74eb1b82cc0",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
@@ -46,7 +46,11 @@
pkgsLinux = nixpkgs.legacyPackages.${linuxSystem};
pkgsDarwin = nixpkgs.legacyPackages.${darwinSystem};
in {
- nixosConfigurations = {
+ nixosConfigurations =
+ let
+ isDarwin = false;
+ in
+ {
nixos-frame =
let
hostName = "nixos-frame";
@@ -55,7 +59,7 @@
nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {
- inherit inputs hostName system;
+ inherit inputs hostName system isDarwin;
};
modules = [
nixos-hardware.nixosModules.framework-13-7040-amd
@@ -68,7 +72,7 @@
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {
- inherit system inputs;
+ inherit system inputs isDarwin;
standalone = false;
};
users.mika = import ./users/mika.nix;
@@ -85,7 +89,7 @@
nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {
- inherit inputs hostName system;
+ inherit inputs hostName system isDarwin;
};
modules = [
home-manager.nixosModules.home-manager
@@ -96,7 +100,7 @@
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {
- inherit system inputs;
+ inherit system inputs isDarwin;
standalone = false;
};
users.mika = import ./users/mika.nix;
diff --git a/justfile b/justfile
@@ -2,7 +2,7 @@ hostname := `hostname`
user := `whoami`
os:
- sudo nixos-rebuild switch --flake ./#{{hostname}} --impure
+ sudo nixos-rebuild switch --flake ./#{{hostname}} --impure --show-trace
darwin:
sudo darwin-rebuild switch --flake ./#{{hostname}} --impure
diff --git a/modules/packages.nix b/modules/packages.nix
@@ -7,8 +7,8 @@ let
suckless = with pkgs; {
dwm = dwm.overrideAttrs (old: {
- src = fetchSucklessRepo "dwm" "sha256-Yp70Juv/5V23PY+55Qa1JCudtoygFHrcTuhFHQgWGWo=";
- buildInputs = old.buildInputs ++ [ xorg.libxcb ];
+ src = fetchSucklessRepo "dwm" "sha256-fOYOM/FX5sTcy5DeYNYRfFj64RL7VcE13jCWYymhZ5w=";
+ buildInputs = old.buildInputs ++ [ libxcb ];
});
st = st.overrideAttrs (old: {
@@ -21,7 +21,7 @@ let
slock = slock.overrideAttrs (old: {
src = fetchSucklessRepo "slock" "sha256-3FWgl5IfiiCCXmM5b2eIEV6lAX4ioLjCdOp5vKrsjZg=";
- buildInputs = old.buildInputs ++ (with xorg; [ libXinerama imlib2 libxft ]);
+ buildInputs = old.buildInputs ++ (with xorg; [ libxinerama imlib2 libxft ]);
});
dwmblocks = dwmblocks.overrideAttrs (old: {
diff --git a/system/host/host-frame.nix b/system/host/host-frame.nix
@@ -124,9 +124,9 @@
};
- systemd.sleep.extraConfig = ''
- HibernateDelaySec=20m
- '';
+ systemd.sleep.settings.Sleep = {
+ HibernateDelaySec = "20m";
+ };
systemd.network.links."10-wlan0" = {
matchConfig.MACAddress = "14:AC:60:29:82:AB";
diff --git a/users/mika.nix b/users/mika.nix
@@ -56,7 +56,7 @@ in
};
};
} // lib.optionalAttrs (!isDarwin || standalone){
- homeDirectory = if isDarwin then "/Users/mika" else "/home/mika/";
+ homeDirectory = if isDarwin then "/Users/mika" else "/home/mika";
};
programs.kitty = lib.mkIf isDarwin {
