diff --git a/configuration/base/networking.nix b/configuration/base/networking.nix index d01ae7d..a2b6c7e 100644 --- a/configuration/base/networking.nix +++ b/configuration/base/networking.nix @@ -5,9 +5,6 @@ # Pick only one of the below networking options. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. networking = { - nftables = { - enable = true; - }; networkmanager = { # Easiest to use and most distros use this by default. enable = true; diff --git a/configuration/base/programs.nix b/configuration/base/programs.nix index 13c8627..5dd473f 100644 --- a/configuration/base/programs.nix +++ b/configuration/base/programs.nix @@ -19,8 +19,8 @@ rar zstd - xz p7zip + busybox libva-utils smartmontools diff --git a/configuration/modules/virtualisation.nix b/configuration/modules/virtualisation.nix index b8950c7..3dfd518 100644 --- a/configuration/modules/virtualisation.nix +++ b/configuration/modules/virtualisation.nix @@ -1,39 +1,55 @@ -{ pkgs, ... }: +{ pkgs, lib, config, inputs, ... }: +with lib; { - virtualisation = { - containers = { - # Enable common container config files in /etc/containers - enable = true; - }; - libvirtd = { - enable = true; - qemu = { - vhostUserPackages = [ pkgs.virtiofsd ]; - ovmf.enable = true; + options.virtualisation.containerManagement = mkOption { + type = types.enum [ "docker" "podman" ]; + default = "docker"; + }; + + config = { + virtualisation = { + containers = { + # Enable common container config files in /etc/containers + 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 = { - # enable = true; - # dockerSocket.enable = true; - # dockerCompat = true; - # defaultNetwork.settings.dns_enabled = true; - # }; - # remember to add the necessary users to the docker group - docker = { - enable = true; - storageDriver = "btrfs"; - }; - # waydroid = { - # enable = true; - # }; + programs.virt-manager.enable = true; + + environment.systemPackages = with pkgs;[ + inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".waydroid-helper + ] ++ optionals (config.virtualisation.containerManagement == "podman") [ + docker-compose + # podman-compose + podman-tui + podman-desktop + ] ++ optionals (config.virtualisation.containerManagement == "docker") [ + lazydocker + ]; }; - programs.virt-manager.enable = true; - # environment.systemPackages = with pkgs;[ - # docker-compose - # # podman-compose - # podman-tui - # podman-desktop - # ]; } diff --git a/devices/tuxedo/configuration.nix b/devices/tuxedo/configuration.nix index 7e56700..34751e5 100644 --- a/devices/tuxedo/configuration.nix +++ b/devices/tuxedo/configuration.nix @@ -34,6 +34,8 @@ # services.hardware.openrgb.enable = true; + virtualisation.containerManagement = "docker"; + fileSystems."/mnt/HDD2" = { fsType = "ext4"; label = "HDD2"; diff --git a/devices/tuxedo/flake.lock b/devices/tuxedo/flake.lock index e3ad080..a1a1622 100644 --- a/devices/tuxedo/flake.lock +++ b/devices/tuxedo/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1760701190, - "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", + "lastModified": 1762276996, + "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", "owner": "nix-community", "repo": "disko", - "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", + "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1761451000, - "narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=", + "lastModified": 1762055842, + "narHash": "sha256-Pu1v3mlFhRzZiSxVHb2/i/f5yeYyRNqr0RvEUJ4UgHo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4", + "rev": "359ff6333a7b0b60819d4c20ed05a3a1f726771f", "type": "github" }, "original": { @@ -66,11 +66,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1761443854, - "narHash": "sha256-xf4jaO2hvPub4acCtV5xmeMUA47+L/Dr0Ywx3wwIN7c=", + "lastModified": 1762394210, + "narHash": "sha256-6WdUH74KlneHu5Pq6l3DbEBHgyrLify3YTCdT5JqEpg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "f44f8539049c4a7df6c9ab3df1b58d98ba081325", + "rev": "20329b2085ba393e910e521afffe72ae8bbe0b65", "type": "github" }, "original": { @@ -97,11 +97,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -113,11 +113,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761173472, - "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", + "lastModified": 1762233356, + "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", + "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", "type": "github" }, "original": { diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index b71f273..1393392 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -38,8 +38,9 @@ haruna # misc - electrum - syncthing + # TODO: uncomment when ecdsa is updated + # https://github.com/NixOS/nixpkgs/pull/456881 + # electrum dbeaver-bin ruffle popsicle diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index 25faf85..4df067c 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -3,17 +3,18 @@ let openvsx = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx; vscode-marketplace = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace; + version = "0.0.13"; resharper-code = (pkgs.vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "resharper-code"; - version = "0.0.12"; + version = version; publisher = "jetbrains"; }; vsix = builtins.fetchurl { name = "jetbrains.resharper-code.zip"; - url = "https://download.jetbrains.com/product?code=VSCRS&latest&distribution=linuxX64&type=eap"; - sha256 = "sha256:05zmr3r2yid8r5hdh1km7kfl3cwlsf9nnccigyzhs14j5k7q0kjc"; + url = "https://download.jetbrains.com/product?code=VSCRS&latest&distribution=linuxX64&type=eap&version=${version}"; + sha256 = "sha256:1sq5sx8hfy853n6zpi1irjq7s3pyv87h8hl44qk0rb29d98sqxl0"; }; }).overrideAttrs (old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.makeBinaryWrapper ]; diff --git a/home-manager/firefox/firefox-profile.nix b/home-manager/firefox/firefox-profile.nix index 41065f6..ff400a3 100644 --- a/home-manager/firefox/firefox-profile.nix +++ b/home-manager/firefox/firefox-profile.nix @@ -61,8 +61,12 @@ # browser links should be new tab "browser.link.open_newwindow.restriction" = 0; - # allow custom search enginers + # allow custom search engines "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 "media.hardware-video-decoding.force-enabled" = true; @@ -88,9 +92,6 @@ # restore tabs on startup "browser.startup.page" = 3; - # do not trim http - "browser.urlbar.trimURLs" = false; - # open in new tabs "browser.tabs.loadBookmarksInTabs" = true;