dev/nixfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update inputs
Some checks failed
CI / Check, build and cache nixfiles (push) Failing after 6m18s
Details

Browse Source
This commit is contained in:
Jack O'Sullivan
2026-01-20 13:33:38 +00:00
parent 7951c777cb
commit f1dc04ec4b
14 changed files with 95 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devshell/commands.nix
View File

@@ -52,7 +52,7 @@ in
name = "json2nix";
category = "utilities";
help = "Convert JSON to formatted Nix";
command = "nix eval --impure --expr 'builtins.fromJSON (builtins.readFile /dev/stdin)' | ${pkgs.nixfmt-rfc-style}/bin/nixfmt";
command = "nix eval --impure --expr 'builtins.fromJSON (builtins.readFile /dev/stdin)' | ${pkgs.nixfmt}/bin/nixfmt";
}
{

88
flake.lock generated
View File

@@ -75,11 +75,11 @@
]
},
"locked": {
"lastModified": 1764708670,
"narHash": "sha256-Gdo9lD6JwXGMVFJ8ZHCENcxXg30SG72kwsHnxPDCscI=",
"lastModified": 1768786317,
"narHash": "sha256-B+mFBhKQUEd543lxmBnJWiMvN/mbTzwIDmVbI1GlvKk=",
"owner": "9001",
"repo": "copyparty",
"rev": "29925dc22b1f6810768d0af25d9c35ee35d88aa7",
"rev": "78f6855f08a210ded0eeb34da9eafb9cc2de024b",
"type": "github"
},
"original": {
@@ -150,11 +150,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1762286984,
"narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=",
"lastModified": 1766051518,
"narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f",
"rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa",
"type": "github"
},
"original": {
@@ -185,7 +185,7 @@
"devshell-tools": {
"inputs": {
"flake-utils": "flake-utils_9",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1710099997,
@@ -227,11 +227,11 @@
]
},
"locked": {
"lastModified": 1764011051,
"narHash": "sha256-M7SZyPZiqZUR/EiiBJnmyUbOi5oE/03tCeFrTiUZchI=",
"lastModified": 1768818222,
"narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=",
"owner": "numtide",
"repo": "devshell",
"rev": "17ed8d9744ebe70424659b0ef74ad6d41fc87071",
"rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76",
"type": "github"
},
"original": {
@@ -517,11 +517,11 @@
]
},
"locked": {
"lastModified": 1764866045,
"narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
"lastModified": 1768603898,
"narHash": "sha256-vRV1dWJOCpCal3PRr86wE2WTOMfAhTu6G7bSvOsryUo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
"rev": "2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c",
"type": "github"
},
"original": {
@@ -537,11 +537,11 @@
]
},
"locked": {
"lastModified": 1764872372,
"narHash": "sha256-uZuXRz9CzeCHsRbc2MQvKomwoX6GcFC5BUMEk3ouSFU=",
"lastModified": 1768912518,
"narHash": "sha256-FJlof1jnbLIT5RbKxef/NV6RzcOj1GoMzXE4FcBFg5Y=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "05a56dbf24f195c62286e3273a2671d3b4904b00",
"rev": "9c5f8aceb6ef620e881f50fe65cb4a2c6b1e8527",
"type": "github"
},
"original": {
@@ -550,12 +550,18 @@
}
},
"impermanence": {
"inputs": {
"home-manager": [
"home-manager-unstable"
],
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1737831083,
"narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
"lastModified": 1768835187,
"narHash": "sha256-6nY0ixjGjPQCL+/sUC1B1MRiO1LOI3AkRSIywm3i3bE=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
"rev": "0d633a69480bb3a3e2f18c080d34a8fa81da6395",
"type": "github"
},
"original": {
@@ -635,11 +641,11 @@
},
"nixpkgs-mine": {
"locked": {
"lastModified": 1765034197,
"narHash": "sha256-SioIdjObnBC/N78okBChJpcfNns3qLsyXrMaBLx6uio=",
"lastModified": 1768921646,
"narHash": "sha256-o9nEtdFqEbfzgeCG6nsu19c+gqNQEL3ppbKEK4aOZ0I=",
"owner": "devplayer0",
"repo": "nixpkgs",
"rev": "96f12e0722c76b4113f8bd4c4fd18532b35d5a7f",
"rev": "45f126b8af0012697abef21b496c5afa107e4895",
"type": "github"
},
"original": {
@@ -651,11 +657,11 @@
},
"nixpkgs-mine-stable": {
"locked": {
"lastModified": 1765034227,
"narHash": "sha256-5yQGE8/IvyHV1xQsESjhQumSzPcAmeLXFCY6ZdGDpek=",
"lastModified": 1768913078,
"narHash": "sha256-kG1pekaHIz9lgzxBd29YXyMuauvPbeJkIJfI9rtYeAM=",
"owner": "devplayer0",
"repo": "nixpkgs",
"rev": "c07d5abb1e18828369dabbda975b7374d39347c0",
"rev": "2289d9c7d193d99262cdf7fdc7313a0b4eff8881",
"type": "github"
},
"original": {
@@ -667,11 +673,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1764677808,
"narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=",
"lastModified": 1768773494,
"narHash": "sha256-XsM7GP3jHlephymxhDE+/TKKO1Q16phz/vQiLBGhpF4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1aab89277eb2d87823d5b69bae631a2496cff57a",
"rev": "77ef7a29d276c6d8303aece3444d61118ef71ac2",
"type": "github"
},
"original": {
@@ -682,11 +688,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1764667669,
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
"lastModified": 1768564909,
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "418468ac9527e799809c900eda37cbff999199b6",
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
"type": "github"
},
"original": {
@@ -726,6 +732,22 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1768564909,
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1709309926,
"narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
@@ -741,7 +763,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_6": {
"locked": {
"lastModified": 1674990008,
"narHash": "sha256-4zOyp+hFW2Y7imxIpZqZGT8CEqKmDjwgfD6BzRUE0mQ=",
@@ -849,7 +871,7 @@
"sbt": {
"inputs": {
"flake-utils": "flake-utils_11",
"nixpkgs": "nixpkgs_5"
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1698464090,

1
flake.nix
View File

@@ -30,6 +30,7 @@
# Stuff used by systems
impermanence.url = "github:nix-community/impermanence";
impermanence.inputs.home-manager.follows = "home-manager-unstable";
boardie.url = "github:devplayer0/boardie";
boardie.inputs.nixpkgs.follows = "nixpkgs-unstable";
nixGL.url = "github:nix-community/nixGL";

2
lib/constants.nix
View File

@@ -30,7 +30,7 @@ rec {
kernel = {
lts = pkgs: pkgs.linuxKernel.packages.linux_6_12;
latest = pkgs: pkgs.linuxKernel.packages.linux_6_17;
latest = pkgs: pkgs.linuxKernel.packages.linux_6_18;
};
nginx = rec {

8
nixos/boxes/colony/vms/estuary/default.nix
View File

@@ -104,11 +104,9 @@ in
lvm = {
dmeventd.enable = true;
};
resolved = {
llmnr = "false";
extraConfig = ''
MulticastDNS=false
'';
resolved.settings.Resolve = {
LLMNR = false;
MulticastDNS = false;
};
netdata.enable = true;

6
nixos/boxes/home/castle/default.nix
View File

@@ -109,11 +109,7 @@ in
};
fstrim.enable = true;
resolved = {
enable = true;
extraConfig = mkForce "";
dnssec = "false";
};
resolved.settings.Resolve.LLMNR = mkForce true;
pipewire.extraConfig.pipewire = {
"10-buffer"."context.properties" = {

8
nixos/boxes/home/routing-common/default.nix
View File

@@ -121,11 +121,9 @@ in
};
services = {
resolved = {
llmnr = "false";
extraConfig = ''
MulticastDNS=false
'';
resolved.settings.Resolve = {
LLMNR = false;
MulticastDNS = false;
};
iperf3 = {

2
nixos/boxes/kelder/containers/spoder/default.nix
View File

@@ -88,7 +88,7 @@ in
};
services = {
resolved.extraConfig = mkForce "";
resolved.settings.Resolve = mkForce { };
nextcloud = {
enable = true;

6
nixos/boxes/tower/default.nix
View File

@@ -99,12 +99,6 @@
};
};
resolved = {
enable = true;
extraConfig = mkForce "";
dnssec = "false";
};
fprintd.enable = true;
blueman.enable = true;

2
nixos/installer.nix
View File

@@ -99,7 +99,7 @@
# Enable wpa_supplicant, but don't start it by default.
networking.wireless.enable = mkDefault true;
networking.wireless.userControlled.enable = true;
networking.wireless.userControlled = true;
systemd.services.wpa_supplicant.wantedBy = mkForce [];
# Tell the Nix evaluator to garbage collect more aggressively.

14
nixos/modules/gui/default.nix
View File

@@ -1,6 +1,6 @@
{ lib, pkgs, config, ... }:
let
inherit (lib) optional mkIf mkDefault mkMerge;
inherit (lib) optional mkIf mkDefault mkMerge mkOverride;
inherit (lib.my) mkBoolOpt';
cfg = config.my.gui;
@@ -44,6 +44,18 @@ in
swaylock-plugin
];
services = {
# TODO: Remove if-else when 26.05 releases
resolved = if (config.system.nixos.release == "25.11:u-26.05") then {
settings.Resolve = {
FallbackDNS = mkOverride 99 (
"1.1.1.1#cloudflare-dns.com 8.8.8.8#dns.google " +
"1.0.0.1#cloudflare-dns.com 8.8.4.4#dns.google " +
"2606:4700:4700::1111#cloudflare-dns.com 2001:4860:4860::8888#dns.google " +
"2606:4700:4700::1001#cloudflare-dns.com 2001:4860:4860::8844#dns.google" );
LLMNR = "resolve";
};
} else { };
pipewire = {
enable = true;
alsa.enable = true;

12
nixos/modules/network.nix
View File

@@ -13,13 +13,21 @@ in
};
services.resolved = {
# Explicitly unset fallback DNS (Nix module will not allow for a blank config)
# TODO: Remove if-else when 26.05 releases
} // (if config.system.nixos.release == "25.11:u-25.11" then {
domains = [ config.networking.domain ];
# Explicitly unset fallback DNS (Nix module will not allow for a blank config)
extraConfig = ''
FallbackDNS=
Cache=no-negative
'';
};
} else {
settings.Resolve = {
Domains = [ config.networking.domain ];
FallbackDNS = "";
Cache = "no-negative";
};
});
}
(mkIf config.my.build.isDevVM {

1
nixos/modules/server.nix
View File

@@ -12,6 +12,7 @@ in
services = {
getty.autologinUser = mkDefault uname;
kmscon.autologinUser = mkDefault uname;
# TODO: Update to Setings.Resolve.LLMNR when 26.05 releases
resolved.llmnr = mkDefault "false";
};
systemd = {

4
pkgs/chocolate-doom2xx/default.nix
View File

@@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
./demoloopi.patch
];
configureFlags = [
"CFLAGS=-std=gnu17"
];
outputs = [ "out" "man" ];
postPatch = ''