Compare commits
15 commits
ebf9313db4
...
8d2766c9aa
Author | SHA1 | Date | |
---|---|---|---|
8d2766c9aa | |||
5464226af7 | |||
94f2925054 | |||
0f41a19f3a | |||
dbe681dda9 | |||
ffd3541e93 | |||
e5bd758c7b | |||
d6a77c851a | |||
ccb39b1190 | |||
33a259f480 | |||
c48f8889af | |||
f7b3b0c003 | |||
205086969b | |||
6d0f775d73 | |||
d84bc75c42 |
7 changed files with 91 additions and 54 deletions
54
flake.lock
generated
54
flake.lock
generated
|
@ -14,11 +14,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740420811,
|
"lastModified": 1740601740,
|
||||||
"narHash": "sha256-ZfSnVdW2S9G4dYFxnW7sB/XgBe2SR17WHTb0eDNkkOk=",
|
"narHash": "sha256-YQ8lMeT/KkMDavXrqPvoO6pKQdfSSAZBcNp/Cer4vWc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "authentik-nix",
|
"repo": "authentik-nix",
|
||||||
"rev": "c79e9b78104e9d8c406445d575623c2770d7d99a",
|
"rev": "bfcad34becd76d148e1ad537b5dcbd58d858a5bb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -30,16 +30,16 @@
|
||||||
"authentik-src": {
|
"authentik-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740398117,
|
"lastModified": 1740599692,
|
||||||
"narHash": "sha256-eafk3lCFG3l1OKt8xoKZjbDFcOUFQgpivMMT4GjaNWU=",
|
"narHash": "sha256-KZalpsM9rvki9GD+urf8idHOEnvBJtkSvE1b2b4KL/4=",
|
||||||
"owner": "goauthentik",
|
"owner": "goauthentik",
|
||||||
"repo": "authentik",
|
"repo": "authentik",
|
||||||
"rev": "5c5cc1c7daa4248c5a2c29ac47f3639d4eaa8ff5",
|
"rev": "31fe0e59234e487a42012510d1a4e4819b9aba26",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "goauthentik",
|
"owner": "goauthentik",
|
||||||
"ref": "version/2025.2.0",
|
"ref": "version/2025.2.1",
|
||||||
"repo": "authentik",
|
"repo": "authentik",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -278,11 +278,11 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740449362,
|
"lastModified": 1742165831,
|
||||||
"narHash": "sha256-UJaNM71Lai/GdExpjqzhWRcLLJf5TfISSHZgA/KMU6M=",
|
"narHash": "sha256-/ssmsf50UERQNlOcUuyfvigcnCNckAhAPZMo0+Y3mdY=",
|
||||||
"rev": "42a8fb96567ef4ffae9494056da0c8ca5a7634df",
|
"rev": "2a336813ad2a4d64d027830507276da32927d215",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/42a8fb96567ef4ffae9494056da0c8ca5a7634df.tar.gz?rev=42a8fb96567ef4ffae9494056da0c8ca5a7634df"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2a336813ad2a4d64d027830507276da32927d215.tar.gz?rev=2a336813ad2a4d64d027830507276da32927d215"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -301,11 +301,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738176840,
|
"lastModified": 1741894565,
|
||||||
"narHash": "sha256-NG3IRvRs3u3btVCN861FqHvgOwqcNT/Oy6PBG86F5/E=",
|
"narHash": "sha256-2FD0NDJbEjUHloVrtEIms5miJsj1tvQCc/0YK5ambyc=",
|
||||||
"rev": "621aae0f3cceaffa6d73a4fb0f89c08d338d729e",
|
"rev": "a6da43f8193d9e329bba1795c42590c27966082e",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/621aae0f3cceaffa6d73a4fb0f89c08d338d729e.tar.gz?rev=621aae0f3cceaffa6d73a4fb0f89c08d338d729e"
|
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/a6da43f8193d9e329bba1795c42590c27966082e.tar.gz?rev=a6da43f8193d9e329bba1795c42590c27966082e"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
@ -387,11 +387,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740387674,
|
"lastModified": 1742180333,
|
||||||
"narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=",
|
"narHash": "sha256-SrvP0G0fxz35lvQxBhAeJOl6+BueIsxJ4azMX+l/kAU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "d58f642ddb23320965b27beb0beba7236e9117b5",
|
"rev": "113cd3916682def185290145924fa30b30bda972",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -403,11 +403,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740339700,
|
"lastModified": 1742136038,
|
||||||
"narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
|
"narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
|
"rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -447,11 +447,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740367490,
|
"lastModified": 1742069588,
|
||||||
"narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
|
"narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
|
"rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -567,11 +567,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739262228,
|
"lastModified": 1742206174,
|
||||||
"narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
|
"narHash": "sha256-Fwo/KZl8+OLvm/XcA/6cSvoG2XxHrKNITR08S78pGus=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
|
"rev": "c00da36830ae93f200b4a10eae0a56b733616774",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -111,14 +111,13 @@
|
||||||
./modules/basic-tools
|
./modules/basic-tools
|
||||||
./modules/binary-caches.nix
|
./modules/binary-caches.nix
|
||||||
./modules/devtools.nix
|
./modules/devtools.nix
|
||||||
./modules/gnome.nix
|
./modules/sway.nix
|
||||||
./modules/gnupg.nix
|
./modules/gnupg.nix
|
||||||
./modules/radio.nix
|
./modules/radio.nix
|
||||||
./modules/science.nix
|
./modules/science.nix
|
||||||
./modules/tlp.nix
|
./modules/tlp.nix
|
||||||
./modules/virtualization.nix
|
./modules/virtualization.nix
|
||||||
./hosts/toaster/secure-boot.nix
|
./hosts/toaster/secure-boot.nix
|
||||||
./modules/chromium.nix
|
|
||||||
./modules/mail
|
./modules/mail
|
||||||
./modules/wg
|
./modules/wg
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, config, ... }:
|
{ lib, pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./mullvad.nix
|
./mullvad.nix
|
||||||
|
@ -6,26 +6,21 @@
|
||||||
./zw.nix
|
./zw.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Networkmanager shouldn't interfere with systemd managed interfaces
|
environment.systemPackages = with pkgs; [
|
||||||
networking.networkmanager.unmanaged =
|
iwgtk
|
||||||
let
|
impala
|
||||||
systemd_netdevs = lib.attrsets.attrValues (
|
];
|
||||||
lib.attrsets.mapAttrs (_name: value: value.netdevConfig.Name) config.systemd.network.netdevs
|
|
||||||
);
|
|
||||||
in
|
|
||||||
systemd_netdevs;
|
|
||||||
|
|
||||||
systemd.network = {
|
# kick out networkmanager
|
||||||
enable = true;
|
networking.networkmanager.enable = lib.mkForce false;
|
||||||
wait-online.enable = false; # uplink is managed by networkmanager
|
networking.useNetworkd = true;
|
||||||
};
|
systemd.network.enable = true;
|
||||||
|
|
||||||
users.users."0xa".extraGroups = [ "networkmanager" ];
|
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "toaster";
|
hostName = "toaster";
|
||||||
firewall.enable = true;
|
firewall.enable = true;
|
||||||
wireguard.enable = true;
|
wireguard.enable = true;
|
||||||
|
wireless.iwd.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.resolved = {
|
services.resolved = {
|
||||||
|
@ -39,4 +34,38 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# we might have no interwebs at all
|
||||||
|
systemd.network.wait-online.enable = false;
|
||||||
|
|
||||||
|
# uplinks
|
||||||
|
systemd.network.networks = {
|
||||||
|
"10-ether-uplink" = {
|
||||||
|
matchConfig.Name = "enp1s0f0";
|
||||||
|
networkConfig = {
|
||||||
|
DHCP = "yes";
|
||||||
|
IPv6AcceptRA = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"10-dock-uplink" = {
|
||||||
|
matchConfig.Name = "enp5s0f4u1u1";
|
||||||
|
networkConfig = {
|
||||||
|
DHCP = "yes";
|
||||||
|
IPv6AcceptRA = true;
|
||||||
|
};
|
||||||
|
dhcpV4Config = {
|
||||||
|
RouteMetric = 666;
|
||||||
|
};
|
||||||
|
dhcpV6Config = {
|
||||||
|
RouteMetric = 666;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
"wlan-uplink" = {
|
||||||
|
matchConfig.Name = "wlan0";
|
||||||
|
networkConfig = {
|
||||||
|
DHCP = "yes";
|
||||||
|
IPv6AcceptRA = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
fzf
|
fzf
|
||||||
fishPlugins.done
|
fishPlugins.done
|
||||||
fishPlugins.fzf-fish
|
fishPlugins.fzf-fish
|
||||||
fishPlugins.hydro
|
fishPlugins.tide
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
|
|
|
@ -2,24 +2,23 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
chromium
|
(chromium.override { enableWideVine = true; })
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland --force-dark-mode --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,WebUIDarkMode";
|
nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland --ignore-gpu-blocklist --enable-gpu-rasterization --enable-zero-copy --enable-features=VaapiVideoDecoder,VaapiVideoEncoder,CanvasOopRasterization,WebUIDarkMode";
|
||||||
|
|
||||||
programs.chromium = {
|
programs.chromium = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extensions = [
|
extensions = [
|
||||||
# "pkehgijcmpdhfbdbbnkijodmdjhbjlgp" # privacy badger
|
|
||||||
"ekhagklcjbdpajgpjgmbionohlpdbjgc" # zotero connector
|
"ekhagklcjbdpajgpjgmbionohlpdbjgc" # zotero connector
|
||||||
"nngceckbapebfimnlniiiahkandclblb" # bitwarden
|
"nngceckbapebfimnlniiiahkandclblb" # bitwarden
|
||||||
# "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
|
"ddkjiahejlhfcafbddmgiahcphecmpfh" # ublock lite
|
||||||
# "ddkjiahejlhfcafbddmgiahcphecmpfh" # ublock lite
|
|
||||||
"mnjggcdmjocbbbhaepdhchncahnbgone" # sponsorblock
|
"mnjggcdmjocbbbhaepdhchncahnbgone" # sponsorblock
|
||||||
|
"khncfooichmfjbepaaaebmommgaepoid" # unhook
|
||||||
];
|
];
|
||||||
extraOpts = {
|
extraOpts = {
|
||||||
"BrowserSignin" = 0;
|
"BrowserSignin" = 0;
|
||||||
# "SyncDisabled" = true;
|
"SyncDisabled" = true;
|
||||||
"PasswordManagerEnabled" = false;
|
"PasswordManagerEnabled" = false;
|
||||||
"TranslateEnabled" = false;
|
"TranslateEnabled" = false;
|
||||||
"AutofillAddressEnabled" = false;
|
"AutofillAddressEnabled" = false;
|
||||||
|
@ -27,10 +26,15 @@
|
||||||
"AutoplayAllowed" = false;
|
"AutoplayAllowed" = false;
|
||||||
"DefaultNotificationSetting" = 2;
|
"DefaultNotificationSetting" = 2;
|
||||||
"BackgroundModeEnabled" = false;
|
"BackgroundModeEnabled" = false;
|
||||||
# "DefaultSearchProviderEnabled" = true;
|
"DefaultSearchProviderEnabled" = true;
|
||||||
# "DefaultSearchProviderSearchURL" = "https://google.com/search?q={searchTerms}";
|
# "DefaultSearchProviderSearchURL" = "https://google.com/search?q={searchTerms}";
|
||||||
# "DefaultSearchProviderSearchURL" = "https://duckduckgo.com/?q={searchTerms}";
|
"DefaultSearchProviderSearchURL" = "https://duckduckgo.com/?q={searchTerms}";
|
||||||
"SearchSuggestEnable" = false;
|
"SearchSuggestEnable" = false;
|
||||||
|
"BlockThirdPartyCookies" = true;
|
||||||
|
"PrivacySandboxAdMeasurementEnabled" = false;
|
||||||
|
"PrivacySandboxAdTopicsEnabled" = false;
|
||||||
|
"PrivacySandboxPromptEnabled" = false;
|
||||||
|
"PrivacySandboxSiteEnabledAdsEnabled" = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,12 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
|
imports = [
|
||||||
|
./chromium.nix
|
||||||
|
];
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
blender
|
blender
|
||||||
dino
|
dino
|
||||||
ffmpeg-full
|
ffmpeg-full
|
||||||
firefox-wayland
|
|
||||||
gimp
|
gimp
|
||||||
inkscape
|
inkscape
|
||||||
signal-desktop
|
signal-desktop
|
||||||
|
@ -16,6 +18,7 @@
|
||||||
discord
|
discord
|
||||||
mpv
|
mpv
|
||||||
dwarf-fortress-packages.dwarf-fortress-full
|
dwarf-fortress-packages.dwarf-fortress-full
|
||||||
|
obs-studio
|
||||||
];
|
];
|
||||||
programs.steam.enable = true;
|
programs.steam.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,8 @@
|
||||||
qbittorrent
|
qbittorrent
|
||||||
gnomeExtensions.caffeine
|
gnomeExtensions.caffeine
|
||||||
spotify
|
spotify
|
||||||
|
ghostty
|
||||||
|
fractal
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.gnome.excludePackages = with pkgs; [
|
environment.gnome.excludePackages = with pkgs; [
|
||||||
|
|
Loading…
Add table
Reference in a new issue