Compare commits

...

3 commits

Author SHA1 Message Date
e9a528eace
dms: new background 2026-01-20 23:15:33 +01:00
fb015a7370
yggdrasil: dev stuff 2026-01-20 23:15:10 +01:00
d26311f457
loptland: cleanup 2026-01-20 23:14:42 +01:00
13 changed files with 43 additions and 22 deletions

View file

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 959 KiB

24
flake.lock generated
View file

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

View file

@ -3,7 +3,7 @@
outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules);
inputs = {
inputs = rec {
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.url = "github:Daholli/nixpkgs/e880129391be2f558d6c205cfd931be338b3b707";
nixpkgs-latest-minecraft.url = "github:ChandlerSwift/nixpkgs/487be302ead911dc24db3068f6d9631f2db7585d";
nixpkgs-latest-factorio = nixpkgs-master;
nixpkgs-latest-minecraft = nixpkgs-master;
home-manager = {
url = "github:nix-community/home-manager/master";

View file

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

View file

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

View file

@ -20,7 +20,9 @@
".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.jpg".source = ../firewatch.jpg;
"Pictures/firewatch_background.jpg".source = ../../../../assets/firewatch_background.jpg;
# https://wallpaperaccess.com/galaxy-nebula
"Pictures/nebula_background.jpg".source = ../../../../assets/nebula_background.jpg;
};
programs.dankMaterialShell = {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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