worble/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove nftables (linux uses this by default now anyways i think?)

Browse Source 
add busybox since its basically expected by some programs (comes with xz)
make virtualisation a proper module so i can flip between docker and podman (i will make podman work one day i swear)
add waydroid back in
electrum is busted for now
make resharper a bit more modular
add new firefox bs
This commit is contained in:
worble
2025-11-07 11:28:21 +00:00
parent a64a137724
commit c3171bd792
8 changed files with 78 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configuration/base/networking.nix
View File

@@ -5,9 +5,6 @@
# Pick only one of the below networking options. # Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking = { networking = {
nftables = {
enable = true;
};
networkmanager = { networkmanager = {
# Easiest to use and most distros use this by default. # Easiest to use and most distros use this by default.
enable = true; enable = true;

2
configuration/base/programs.nix
View File

@@ -19,8 +19,8 @@
rar rar
zstd zstd
xz
p7zip p7zip
busybox
libva-utils libva-utils
smartmontools smartmontools

80
configuration/modules/virtualisation.nix
View File

@@ -1,39 +1,55 @@
{ pkgs, ... }: { pkgs, lib, config, inputs, ... }:
with lib;
{ {
virtualisation = { options.virtualisation.containerManagement = mkOption {
containers = { type = types.enum [ "docker" "podman" ];
# Enable common container config files in /etc/containers default = "docker";
enable = true; };
};
libvirtd = { config = {
enable = true; virtualisation = {
qemu = { containers = {
vhostUserPackages = [ pkgs.virtiofsd ]; # Enable common container config files in /etc/containers
ovmf.enable = true; enable = true;
};
libvirtd = {
enable = true;
qemu = {
vhostUserPackages = [ pkgs.virtiofsd ];
ovmf.enable = true;
};
};
# remember to add the necessary users to the podman group
podman = {
enable = if (config.virtualisation.containerManagement == "podman") then true else false;
dockerSocket.enable = true;
dockerCompat = true;
defaultNetwork.settings.dns_enabled = true;
};
# remember to add the necessary users to the docker group
docker = {
enable = if (config.virtualisation.containerManagement == "docker") then true else false;
storageDriver = "btrfs";
};
waydroid = {
enable = true;
# TODO: update when this is in stable
package = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waydroid-nftables;
}; };
}; };
# podman = { programs.virt-manager.enable = true;
# enable = true;
# dockerSocket.enable = true; environment.systemPackages = with pkgs;[
# dockerCompat = true; inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waydroid-helper
# defaultNetwork.settings.dns_enabled = true; ] ++ optionals (config.virtualisation.containerManagement == "podman") [
# }; docker-compose
# remember to add the necessary users to the docker group # podman-compose
docker = { podman-tui
enable = true; podman-desktop
storageDriver = "btrfs"; ] ++ optionals (config.virtualisation.containerManagement == "docker") [
}; lazydocker
# waydroid = { ];
# enable = true;
# };
}; };
programs.virt-manager.enable = true;
# environment.systemPackages = with pkgs;[
# docker-compose
# # podman-compose
# podman-tui
# podman-desktop
# ];
} }

2
devices/tuxedo/configuration.nix
View File

@@ -34,6 +34,8 @@
# services.hardware.openrgb.enable = true; # services.hardware.openrgb.enable = true;
virtualisation.containerManagement = "docker";
fileSystems."/mnt/HDD2" = { fileSystems."/mnt/HDD2" = {
fsType = "ext4"; fsType = "ext4";
label = "HDD2"; label = "HDD2";

30
devices/tuxedo/flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760701190, "lastModified": 1762276996,
"narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -48,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761451000, "lastModified": 1762055842,
"narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=", "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4", "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -66,11 +66,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1761443854, "lastModified": 1762394210,
"narHash": "sha256-xf4jaO2hvPub4acCtV5xmeMUA47+L/Dr0Ywx3wwIN7c=", "narHash": "sha256-6WdUH74KlneHu5Pq6l3DbEBHgyrLify3YTCdT5JqEpg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "f44f8539049c4a7df6c9ab3df1b58d98ba081325", "rev": "20329b2085ba393e910e521afffe72ae8bbe0b65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -97,11 +97,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1761373498, "lastModified": 1762111121,
"narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -113,11 +113,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1761173472, "lastModified": 1762233356,
"narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
devices/tuxedo/home.nix
View File

@@ -38,8 +38,9 @@
haruna haruna
# misc # misc
electrum # TODO: uncomment when ecdsa is updated
syncthing # https://github.com/NixOS/nixpkgs/pull/456881
# electrum
dbeaver-bin dbeaver-bin
ruffle ruffle
popsicle popsicle

7
home-manager/development/vscode.nix
View File

@@ -3,17 +3,18 @@
let let
openvsx = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx; openvsx = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx;
vscode-marketplace = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace; vscode-marketplace = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace;
version = "0.0.13";
resharper-code = (pkgs.vscode-utils.buildVscodeMarketplaceExtension { resharper-code = (pkgs.vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {
name = "resharper-code"; name = "resharper-code";
version = "0.0.12"; version = version;
publisher = "jetbrains"; publisher = "jetbrains";
}; };
vsix = builtins.fetchurl { vsix = builtins.fetchurl {
name = "jetbrains.resharper-code.zip"; name = "jetbrains.resharper-code.zip";
url = "https://download.jetbrains.com/product?code=VSCRS&latest&distribution=linuxX64&type=eap"; url = "https://download.jetbrains.com/product?code=VSCRS&latest&distribution=linuxX64&type=eap&version=${version}";
sha256 = "sha256:05zmr3r2yid8r5hdh1km7kfl3cwlsf9nnccigyzhs14j5k7q0kjc"; sha256 = "sha256:1sq5sx8hfy853n6zpi1irjq7s3pyv87h8hl44qk0rb29d98sqxl0";
}; };
}).overrideAttrs (old: { }).overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.makeBinaryWrapper ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.makeBinaryWrapper ];

9
home-manager/firefox/firefox-profile.nix
View File

@@ -61,8 +61,12 @@
# browser links should be new tab # browser links should be new tab
"browser.link.open_newwindow.restriction" = 0; "browser.link.open_newwindow.restriction" = 0;
# allow custom search enginers # allow custom search engines
"browser.urlbar.update2.engineAliasRefresh" = true; "browser.urlbar.update2.engineAliasRefresh" = true;
# do not retrieve suggestions as you type https://blog.mozilla.org/en/firefox/better-search-suggestions/
"browser.urlbar.quicksuggest.online.enabled" = false;
# do not trim http
"browser.urlbar.trimURLs" = false;
# force enable hardware accel # force enable hardware accel
"media.hardware-video-decoding.force-enabled" = true; "media.hardware-video-decoding.force-enabled" = true;
@@ -88,9 +92,6 @@
# restore tabs on startup # restore tabs on startup
"browser.startup.page" = 3; "browser.startup.page" = 3;
# do not trim http
"browser.urlbar.trimURLs" = false;
# open in new tabs # open in new tabs
"browser.tabs.loadBookmarksInTabs" = true; "browser.tabs.loadBookmarksInTabs" = true;