flake.lock

@@ -1465,33 +1465,33 @@
     },
     "nixpkgs-latest-factorio": {
       "locked": {
-        "lastModified": 1768319201,
-        "narHash": "sha256-mKJw6+HKC66g7yztoSMvcQo/sV7XkXWnxdEcFHqIQm8=",
-        "owner": "nixos",
+        "lastModified": 1757278553,
+        "narHash": "sha256-NlXNDOQtUo9ed0DNKgoSRcfe1D0aQRenVhgcbPBXf44=",
+        "owner": "Daholli",
         "repo": "nixpkgs",
-        "rev": "0ec0edf1d56a143488c61c1853531534b128a882",
+        "rev": "e880129391be2f558d6c205cfd931be338b3b707",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "master",
+        "owner": "Daholli",
         "repo": "nixpkgs",
+        "rev": "e880129391be2f558d6c205cfd931be338b3b707",
         "type": "github"
       }
     },
     "nixpkgs-latest-minecraft": {
       "locked": {
-        "lastModified": 1768319201,
-        "narHash": "sha256-mKJw6+HKC66g7yztoSMvcQo/sV7XkXWnxdEcFHqIQm8=",
-        "owner": "nixos",
+        "lastModified": 1765340982,
+        "narHash": "sha256-ScoKn82baWwHH3BwUGUwFO71N3RdKWaEjWwQHT6sesE=",
+        "owner": "ChandlerSwift",
         "repo": "nixpkgs",
-        "rev": "0ec0edf1d56a143488c61c1853531534b128a882",
+        "rev": "487be302ead911dc24db3068f6d9631f2db7585d",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "master",
+        "owner": "ChandlerSwift",
         "repo": "nixpkgs",
+        "rev": "487be302ead911dc24db3068f6d9631f2db7585d",
         "type": "github"
       }
     },

flake.nix

@@ -3,7 +3,7 @@
 
   outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
 
-  inputs = rec {
+  inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     systems.url = "github:nix-systems/default-linux";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -16,8 +16,8 @@
     catppuccin.url = "github:catppuccin/nix";
     sops-nix.url = "github:Mic92/sops-nix";
 
-    nixpkgs-latest-factorio = nixpkgs-master;
-    nixpkgs-latest-minecraft = nixpkgs-master;
+    nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/e880129391be2f558d6c205cfd931be338b3b707";
+    nixpkgs-latest-minecraft.url = "github:ChandlerSwift/nixpkgs/487be302ead911dc24db3068f6d9631f2db7585d";
 
     home-manager = {
       url = "github:nix-community/home-manager/master";

modules/base/home/helix.nix

@@ -108,7 +108,7 @@
               {
                 name = "nix";
                 auto-format = true;
-                formatter.command = "${pkgs.nixfmt}/bin/nixfmt";
+                formatter.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
                 language-servers = [
                   "nixd"
                   "nil"

modules/base/system/nixdaemon.nix

@@ -14,7 +14,7 @@
       # imports = [ inputs.nix-ld.nixosModules.nix-ld ];
 
       environment.systemPackages = with pkgs; [
-        nixfmt
+        nixfmt-rfc-style
         nix-prefetch-git
         nix-index
 

modules/desktop/addons/dms/default.nix

@@ -20,9 +20,7 @@
           ".config/DankMaterialShell/settings.json".source = ./settings.json;
           ".config/DankMaterialShell/clsettings.json".source = ./clsettings.json;
           # https://www.reddit.com/r/WidescreenWallpaper/comments/13hib3t/purple_firewatch_3840x1620/
-          "Pictures/firewatch_background.jpg".source = ../../../../assets/firewatch_background.jpg;
-          # https://wallpaperaccess.com/galaxy-nebula
-          "Pictures/nebula_background.jpg".source = ../../../../assets/nebula_background.jpg;
+          "Pictures/firewatch.jpg".source = ../firewatch.jpg;
         };
 
         programs.dankMaterialShell = {

modules/desktop/addons/dms/settings.json

@@ -359,7 +359,7 @@
       "spacing": 4,
       "innerPadding": 4,
       "bottomGap": 0,
-      "transparency": 0,
+      "transparency": 1,
       "widgetTransparency": 1,
       "squareCorners": false,
       "noBackground": false,

modules/dev/gh.nix

@@ -3,8 +3,6 @@
     homeManager.dev =
       { pkgs, ... }:
       {
-        home.packages = [ pkgs.github-copilot-cli ];
-
         programs = {
           gh-dash = {
             enable = true;
@@ -54,6 +52,7 @@
             enable = true;
             extensions = [
               pkgs.gh-dash
+              pkgs.gh-copilot
             ];
           };
         };

modules/hosts/loptland/default.nix

@@ -48,8 +48,7 @@ topLevel: {
 
       services.resolved = {
         enable = true;
-
-        settings.Resolve.Domains = [ "~." ];
+        domains = [ "~." ];
       };
 
       networking.firewall.allowedTCPPorts = [

modules/hosts/yggdrasil/default.nix

@@ -25,10 +25,6 @@ topLevel: {
 
         termscp
         nixpkgs-review
-
-        postman
-        vlc
-        ffmpeg
       ];
 
       services.teamviewer.enable = true;

modules/server/factorio-server.nix

@@ -1,16 +1,7 @@
 {
   flake.modules.nixos.factorio-server =
-    {
-      config,
-      inputs,
-      pkgs,
-      ...
-    }:
+    { config, ... }:
     let
-      latest-factorio = import inputs.nixpkgs-latest-factorio {
-        system = pkgs.stdenv.hostPlatform.system;
-        config.allowUnfree = true;
-      };
       sopsFile = ../../secrets/secrets-loptland.yaml;
     in
     {
@@ -55,8 +46,6 @@
 
       services.factorio = {
         enable = true;
-        package = latest-factorio.factorio-headless;
-
         openFirewall = true;
         public = true;
         lan = true;

modules/server/hydra.nix

@@ -30,8 +30,6 @@
 
       services.hydra = {
         enable = true;
-        package = pkgs.hydra.overrideAttrs { stdenv = pkgs.gcc14Stdenv; };
-
         hydraURL = "http://localhost:${toString httpPort}";
         port = httpPort;
         notificationSender = "hydra@localhost";