1
0
Fork 0

Compare commits

..

No commits in common. "48711d87f004c1413a63eef5db39bf0f6c033d1f" and "46a8141cc4e8602df19f6e1d8d820391aefa2e9d" have entirely different histories.

14 changed files with 50 additions and 156 deletions

159
flake.lock generated
View file

@ -1,27 +1,5 @@
{ {
"nodes": { "nodes": {
"fenix": {
"inputs": {
"nixpkgs": [
"twitch-hls-client",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1744958318,
"narHash": "sha256-L0a9BKIgHAD9mqum0VoXjBUDwnCV16/Q1AQg3a8cEnw=",
"owner": "nix-community",
"repo": "fenix",
"rev": "4cc256372df88f061c5156b8ca4ed6d5b01fb1a7",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"firefox-addons": { "firefox-addons": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -30,11 +8,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1764389080, "lastModified": 1758879217,
"narHash": "sha256-BEn1Z9Uv20u2DS6wzLKdzx5kAzynM3wMQ9JnGf3VJvI=", "narHash": "sha256-vWk2iw/i5c0RHc/zLVyB51UYvmbzPq3uB14NN7kaouE=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "897437c09bf22ce59efb3370f0783d0c662dba31", "rev": "58402e09ad48f9f509d9249b8704c1a4f390c434",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -84,11 +62,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760948891, "lastModified": 1756770412,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "rev": "4524271976b625a4a605beefd893f270620fd751",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -141,11 +119,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1764361670, "lastModified": 1758928860,
"narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", "narHash": "sha256-ZqaRdd+KoR54dNJPtd7UX4O0X+02YItnTpQVu28lSVI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "rev": "bc2afee55bc5d3b825287829d6592b9cc1405aad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +134,11 @@
}, },
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1758834834, "lastModified": 1756659871,
"narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=", "narHash": "sha256-v6Rh4aQ6RKjM2N02kK9Usn0Ix7+OY66vNpeklc1MnGE=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001", "rev": "ed6cc3e48557ba18266e598a5ebb6602499ada16",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -171,11 +149,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1764328224, "lastModified": 1758663926,
"narHash": "sha256-hFyF1XQd+XrRx7WZCrGJp544dykexD8Q5SrJJZpEQYg=", "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d62603a997438e19182af69d3ce7be07565ecad4", "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +164,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1764242076, "lastModified": 1758690382,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,11 +180,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1761880412, "lastModified": 1756696532,
"narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", "rev": "58dcbf1ec551914c3756c267b8b9c8c86baa1b2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -218,11 +196,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1763618868, "lastModified": 1758262103,
"narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -232,22 +210,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1744932701,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nvf": { "nvf": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -257,11 +219,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1762622004, "lastModified": 1758271661,
"narHash": "sha256-NpzzgaoMK8aRHnndHWbYNKLcZN0r1y6icCoJvGoBsoE=", "narHash": "sha256-ENqd2/33uP5vB44ClDjjAV+J78oF8q1er4QUZuT8Z7g=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "09470524a214ed26633ddc2b6ec0c9bf31a8b909", "rev": "b7571df4d6e9ac08506a738ddceeec0b141751b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -280,11 +242,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1763909441, "lastModified": 1758185783,
"narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=", "narHash": "sha256-6fX2CG8PzdBNwJGBISnf/nVHUVMZdCsekT1mP672Uh8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4", "rev": "6a7d78cebd9a0f84a508bec9bc47ac504c5f51f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -303,25 +265,7 @@
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
"snowfall-lib": "snowfall-lib", "snowfall-lib": "snowfall-lib",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stable": "stable", "stable": "stable"
"twitch-hls-client": "twitch-hls-client"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1744878314,
"narHash": "sha256-iPHZkar3ebiF0rT6VLorSXIQCG7kAOmAsfuTahCzgS8=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "ed737b545e8db5d9c78fcaba73baed0f34e5b3f8",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
} }
}, },
"snowfall-lib": { "snowfall-lib": {
@ -351,11 +295,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1764021963, "lastModified": 1758425756,
"narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -409,41 +353,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_3": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"twitch-hls-client": {
"inputs": {
"fenix": "fenix",
"nixpkgs": "nixpkgs_4",
"systems": "systems_3"
},
"locked": {
"lastModified": 1762829126,
"narHash": "sha256-jApBFe9GeXkkNO+oODpYt+FArsU441lJhxnwzL4vwPk=",
"owner": "2bc4",
"repo": "twitch-hls-client",
"rev": "cb2e5c8a4a769018507ae1c9ab96b0d3a0b31c7b",
"type": "github"
},
"original": {
"owner": "2bc4",
"repo": "twitch-hls-client",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -26,8 +26,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };
twitch-hls-client.url = "github:2bc4/twitch-hls-client";
}; };
outputs = outputs =

View file

@ -94,7 +94,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.librewolf = { programs.librewolf = {
enable = true; enable = true;
package = pkgs.librewolf; package = pkgs.librewolf-wayland;
profiles."philipp" = { profiles."philipp" = {
inherit (cfg) inherit (cfg)

View file

@ -16,8 +16,8 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs = { programs.mpv = {
mpv.enable = true; enable = true;
}; };
}; };

View file

@ -16,8 +16,8 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
runelite runelite
bolt-launcher bolt-launcher
]; ];
}; };

View file

@ -48,7 +48,7 @@ in
kdiskmark kdiskmark
networkmanager networkmanager
kdePackages.networkmanager-qt kdePackages.networkmanager-qt
#kdePackages.wallpaper-engine-plugin Currently crashes plasma kdePackages.wallpaper-engine-plugin
]; ];
}; };

View file

@ -35,7 +35,6 @@ in
[ [
pulsemixer pulsemixer
pavucontrol pavucontrol
twitch-hls-client
] ]
++ cfg.extra-packages; ++ cfg.extra-packages;

View file

@ -185,12 +185,10 @@ in
description = "Linkwarden (Self-hosted collaborative bookmark manager to collect, organize, and preserve webpages, articles, and more...)"; description = "Linkwarden (Self-hosted collaborative bookmark manager to collect, organize, and preserve webpages, articles, and more...)";
requires = [ requires = [
"network-online.target" "network-online.target"
] ] ++ lib.optionals cfg.database.enable [ "postgresql.service" ];
++ lib.optionals cfg.database.enable [ "postgresql.service" ];
after = [ after = [
"network-online.target" "network-online.target"
] ] ++ lib.optionals cfg.database.enable [ "postgresql.service" ];
++ lib.optionals cfg.database.enable [ "postgresql.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment = cfg.environment // { environment = cfg.environment // {
# Required, otherwise chrome dumps core # Required, otherwise chrome dumps core

View file

@ -17,7 +17,7 @@ in
package = mkOption { package = mkOption {
description = "The package of Technitium to use."; description = "The package of Technitium to use.";
type = types.package; type = types.package;
default = pkgs.technitium-dns-server; default = pkgs.awesome-flake.technitium-dns-server;
}; };
openFirewall = mkOption { openFirewall = mkOption {

View file

@ -66,7 +66,7 @@ in
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-cjk-serif noto-fonts-cjk-serif
noto-fonts-color-emoji noto-fonts-emoji
nerd-fonts.hack nerd-fonts.hack
#(pkgs.awesome-flake.ttf-ms-win11.override { acceptEula = true; }) #(pkgs.awesome-flake.ttf-ms-win11.override { acceptEula = true; })
] ]

View file

@ -20,7 +20,7 @@ in
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = false; enableSSHSupport = false;
pinentryPackage = pkgs.pinentry-qt; pinentryPackage = pkgs.pinentry;
}; };
}; };

View file

@ -78,3 +78,4 @@ stdenvNoCC.mkDerivation (finalAttrs: {
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
}; };
}) })

View file

@ -14,10 +14,7 @@
wireguard = { wireguard = {
enable = true; enable = true;
interfaces."wg0" = { interfaces."wg0" = {
ips = [ ips = [ "192.168.100.10/24" "fd00:100::10/64" ];
"192.168.100.10/24"
"fd00:100::10/64"
];
listenPort = 51820; listenPort = 51820;
mtu = 1400; mtu = 1400;
privateKeyFile = "/run/secrets/privateKey"; privateKeyFile = "/run/secrets/privateKey";
@ -25,10 +22,7 @@
{ {
publicKey = "ylsjhpKiq3B6Kv4q2uiHXUJpyxY2b1DOAlGc/FWdflQ="; publicKey = "ylsjhpKiq3B6Kv4q2uiHXUJpyxY2b1DOAlGc/FWdflQ=";
presharedKeyFile = "/run/secrets/presharedKey"; presharedKeyFile = "/run/secrets/presharedKey";
allowedIPs = [ allowedIPs = [ "192.168.100.1/32" "fd00:100::1/128" ];
"192.168.100.1/32"
"fd00:100::1/128"
];
endpoint = "neuruppin.boehm.sh:51820"; endpoint = "neuruppin.boehm.sh:51820";
persistentKeepalive = 25; persistentKeepalive = 25;
} }

View file

@ -21,13 +21,8 @@
"sd_mod" "sd_mod"
]; ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ boot.kernelModules = [ "kvm-amd" ];
"kvm-amd" boot.extraModulePackages = [ ];
"v4l2loopback"
];
boot.extraModulePackages = with config.boot.kernelPackages; [
v4l2loopback
];
boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/1616e34a-a8c6-4e18-882c-d955b4f8ffeb"; boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/1616e34a-a8c6-4e18-882c-d955b4f8ffeb";