From a4beaf235889e5475bace2687e63b94cd80a51e8 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Sat, 4 Jan 2025 00:49:01 +0100 Subject: [PATCH] 310 current 2025-01-04 00:48:53 24.11.20241231.edf04b7 6.12.2-zen1 * --- flake.lock | 37 +++++++++++++++++++++++++++++++++++ flake.nix | 14 +++++++------ hosts/factorio/factorio.nix | 24 +++++++++++++++++++++-- modules/software/software.nix | 2 ++ 4 files changed, 69 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 2e15c71..16b04a9 100644 --- a/flake.lock +++ b/flake.lock @@ -36,6 +36,42 @@ "type": "github" } }, + "nixlib": { + "locked": { + "lastModified": 1734829460, + "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixos-generators": { + "inputs": { + "nixlib": "nixlib", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734915500, + "narHash": "sha256-A7CTIQ8SW0hfbhKlwK+vSsu4pD+Oaelw3v6goX6go+U=", + "owner": "nix-community", + "repo": "nixos-generators", + "rev": "051d1b2dda3b2e81b38d82e2b691e5c2f4d335f4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-generators", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1735388221, @@ -88,6 +124,7 @@ "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", + "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" diff --git a/flake.nix b/flake.nix index 287f0c1..028a561 100644 --- a/flake.nix +++ b/flake.nix @@ -12,18 +12,20 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # generating filesystems in different formats + nixos-generators = { + url = "github:nix-community/nixos-generators"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # NixOS unstable channel nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; # ready made hardware configurations. e.G.: Power saving - nixos-hardware = { - url = "github:NixOS/nixos-hardware/master"; - }; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # for managing flatpaks, like which ones are installed and which not - nix-flatpak = { - url = "github:gmodena/nix-flatpak"; - }; + nix-flatpak.url = "github:gmodena/nix-flatpak"; }; ####### diff --git a/hosts/factorio/factorio.nix b/hosts/factorio/factorio.nix index e504fae..057ad1f 100644 --- a/hosts/factorio/factorio.nix +++ b/hosts/factorio/factorio.nix @@ -37,7 +37,7 @@ # https://lix.systems/ Lix is a modern, delicious implementation of the Nix package manager, # focused on correctness, usability, and growth – # and committed to doing right by its community. - nix.package = pkgs.lix; + #nix.package = pkgs.lix; imports = [ #nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen1 #./hardware-configuration.nix @@ -45,6 +45,26 @@ ./hardware-configuration.nix ../../modules/locale.nix - ../../modules/game/server/factorio/factorio.nix + #../../modules/game/server/factorio/factorio.nix + + + + + + { + programs.command-not-found.enable = false; + environment.defaultPackages = []; + xdg = { + icons.enable = false; + mime.enable = false; + sounds.enable = false; + }; + documentation.man.enable = false; + documentation.nixos.enable = false; + } + ]; + disabledModules = [ + + ]; } diff --git a/modules/software/software.nix b/modules/software/software.nix index a1c62bf..a705c78 100644 --- a/modules/software/software.nix +++ b/modules/software/software.nix @@ -69,6 +69,8 @@ element-desktop rustdesk-flutter timer + rtl-sdr + gqrx ]; fonts.packages = with pkgs; [