gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

stop mc server

Browse source 
update nix-janitor and nix

update lockfile

fix nerd-fonts
This commit is contained in:
Gerg-L 2024-11-30 15:40:26 -05:00
parent b7e24442ec
commit 9bec2ed262
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
6 changed files with 68 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

153
flake.lock generated
View file

@ -1,33 +1,5 @@
{ {
"nodes": { "nodes": {
"cargo2nix": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils",
"nixpkgs": [
"nix-janitor",
"nixpkgs"
],
"rust-overlay": [
"nix-janitor",
"rust-overlay"
]
},
"locked": {
"lastModified": 1712112199,
"narHash": "sha256-5ur7bE90d+6Ny6PzC/6R0bDAa6B1+gDAk2XIFSDfAjY=",
"owner": "cargo2nix",
"repo": "cargo2nix",
"rev": "da5f5d796af00fe818aa12f3b2d46a4800e6fec8",
"type": "github"
},
"original": {
"owner": "cargo2nix",
"ref": "release-0.12",
"repo": "cargo2nix",
"type": "github"
}
},
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1730652660, "lastModified": 1730652660,
@ -50,11 +22,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732919362, "lastModified": 1732988076,
"narHash": "sha256-3SxlMD3nSI90+pHOF27SuLEt3+wew8xl+sUJaJMeHOI=", "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "b71e3faca99b40fb801f03fd950fbefbbba691a4", "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +90,11 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1650374568, "lastModified": 1732722421,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8", "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,22 +120,6 @@
} }
}, },
"flake-compat_5": { "flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1732722421,
"narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_6": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -179,7 +135,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_7": { "flake-compat_6": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732722421, "lastModified": 1732722421,
@ -282,21 +238,6 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
@ -316,7 +257,7 @@
}, },
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_5",
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"nixpkgs": [ "nixpkgs": [
"nvim-flake", "nvim-flake",
@ -486,11 +427,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1732942656, "lastModified": 1732990138,
"narHash": "sha256-64wbhC0jrYUH7dNmpXw1xYVMI9AX6xxBES91M7crX3A=", "narHash": "sha256-Z7NT+HFb/VQqdORpTWIDugrk3dc129jAcuqOLjRiuzA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8ad72fe6962ef77520833dc2a03eb2580cf7fc77", "rev": "130bb06af1b749f0b53468fc91421c467424a182",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -517,12 +458,12 @@
}, },
"neovim-nightly": { "neovim-nightly": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_4",
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects", "hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src", "neovim-src": "neovim-src",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1732925246, "lastModified": 1732925246,
@ -567,16 +508,16 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1728310575, "lastModified": 1732892090,
"narHash": "sha256-R13o8hNhzuTuEwUBViVOmT4OM0/I2d9DxnkxQOip1yg=", "narHash": "sha256-Ka/uNdaqpTAiVL++4MPHg8fG5o1tiJeY6G2t5UiKhd8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "26c3fc11eada3fa7df0284190095868a947fefe2", "rev": "64000481168d1da9d2519f055dd1fdee22275c21",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "26c3fc11eada3fa7df0284190095868a947fefe2", "ref": "64000481168d1da9d2519f055dd1fdee22275c21",
"repo": "nix", "repo": "nix",
"type": "github" "type": "github"
} }
@ -603,24 +544,20 @@
}, },
"nix-janitor": { "nix-janitor": {
"inputs": { "inputs": {
"cargo2nix": "cargo2nix", "nixpkgs": "nixpkgs",
"nixpkgs": [
"unstable"
],
"parts": "parts", "parts": "parts",
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1716802118, "lastModified": 1732982517,
"narHash": "sha256-KRXz2qUDWmyglXk56jL0twOQ3pWdpacddyVn95W7wl0=", "narHash": "sha256-PeFMHcQVxkMx1Yl25qo9fZVjWTjRbElZLxPpcCCi/wE=",
"owner": "Nobbz", "owner": "Nobbz",
"repo": "nix-janitor", "repo": "nix-janitor",
"rev": "d49fd7486d5597d2e854154bf643e7f86c5f1f6c", "rev": "07d6547d69d5d40a9397ddaece76c97f86ed022d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Nobbz", "owner": "Nobbz",
"ref": "d49fd7486d5597d2e854154bf643e7f86c5f1f6c",
"repo": "nix-janitor", "repo": "nix-janitor",
"type": "github" "type": "github"
} }
@ -663,15 +600,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1706487304, "lastModified": 1689601424,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", "narHash": "sha256-WEqoSflQP65MF9O9k+JEkvUXMEoyCatmMAoLOowcEoE=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", "rev": "d0f2758381caca8b4fb4a6cac61721cc9de06bd9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "nixos",
"ref": "nixpkgs-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -744,6 +681,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1732617236, "lastModified": 1732617236,
"narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=",
@ -761,7 +714,7 @@
}, },
"nvim-flake": { "nvim-flake": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"mnw": "mnw", "mnw": "mnw",
"neovim-nightly": "neovim-nightly", "neovim-nightly": "neovim-nightly",
"nixpkgs": [ "nixpkgs": [
@ -889,8 +842,8 @@
}, },
"rust-overlay_2": { "rust-overlay_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1715998563, "lastModified": 1715998563,
@ -928,7 +881,7 @@
}, },
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_7", "flake-compat": "flake-compat_6",
"nixpkgs": [ "nixpkgs": [
"unstable" "unstable"
] ]
@ -949,16 +902,16 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1732749044, "lastModified": 1732824227,
"narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1000,11 +953,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1732837521,
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
flake.nix
View file

@ -17,14 +17,14 @@
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
ref = "nixos-24.05"; ref = "nixos-24.11";
}; };
#nix itself #nix itself
nix = { nix = {
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
ref = "26c3fc11eada3fa7df0284190095868a947fefe2"; ref = "64000481168d1da9d2519f055dd1fdee22275c21";
inputs.nixpkgs.follows = "stable"; inputs.nixpkgs.follows = "stable";
}; };
nixos-generators = { nixos-generators = {
@ -61,8 +61,7 @@
type = "github"; type = "github";
owner = "Nobbz"; owner = "Nobbz";
repo = "nix-janitor"; repo = "nix-janitor";
ref = "d49fd7486d5597d2e854154bf643e7f86c5f1f6c"; #inputs.nixpkgs.follows = "unstable";
inputs.nixpkgs.follows = "unstable";
}; };
#my own packages #my own packages
spicetify-nix = { spicetify-nix = {

2
hosts/gerg-desktop/services/minecraft.nix
View file

@ -1,7 +1,7 @@
{ lib, self' }: { lib, self' }:
{ {
# I manually switch this sometimes # I manually switch this sometimes
config = lib.mkIf true { config = lib.mkIf false {
networking.firewall = { networking.firewall = {
allowedUDPPorts = [ 24454 ]; allowedUDPPorts = [ 24454 ];
allowedTCPPorts = [ allowedTCPPorts = [

1
hosts/gerg-desktop/services/reboot-bot.nix
View file

@ -7,6 +7,7 @@
sops.secrets.reboot_token = { }; sops.secrets.reboot_token = { };
systemd.services.reboot_bot = { systemd.services.reboot_bot = {
enable = false;
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
after = [ "network-online.target" ]; after = [ "network-online.target" ];

10
modules/misc.nix
View file

@ -32,7 +32,15 @@
nix-tree # view packages nix-tree # view packages
pciutils # lspci pciutils # lspci
; ;
inherit (nix-janitor.packages) default; nix-janitor = pkgs.symlinkJoin {
name = "nix-janitor";
paths = [ nix-janitor.packages.default ];
nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
postBuild = ''
wrapProgram "$out/bin/janitor" \
--suffix PATH : ${lib.makeBinPath [ config.nix.package ]}
'';
};
} }
); );

2
modules/theming.nix
View file

@ -66,7 +66,7 @@ in
fonts = { fonts = {
packages = [ packages = [
pkgs.overpass pkgs.overpass
(pkgs.nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) pkgs.nerd-fonts.symbols-only
]; ];
enableDefaultPackages = false; enableDefaultPackages = false;
fontDir.enable = true; fontDir.enable = true;