From 42447b4e745ba77fe98a76f538198e1a2d7d4905 Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Wed, 12 Mar 2025 06:05:31 +0000 Subject: [PATCH] use distrobox4nix --- flake.lock | 16 ++++++++++++++++ flake.nix | 1 + home/programs/coding/default.nix | 1 + home/programs/coding/distrobox.nix | 11 +++++++++++ home/programs/shell/fish.nix | 13 ------------- hosts/default.nix | 1 + os/system/configuration.nix | 3 --- 7 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 home/programs/coding/distrobox.nix diff --git a/flake.lock b/flake.lock index 26a070c..6dc4d54 100644 --- a/flake.lock +++ b/flake.lock @@ -110,6 +110,21 @@ "type": "github" } }, + "distrobox4nix": { + "locked": { + "lastModified": 1741561924, + "narHash": "sha256-eJuZoG+vBTt6t0bjTvZRcQW2eAgD5tCIW/CkPnkbA0k=", + "owner": "aguirre-matteo", + "repo": "distrobox4nix", + "rev": "fc6578785ece239f64c4ab5f50a7c1f06e3880ad", + "type": "github" + }, + "original": { + "owner": "aguirre-matteo", + "repo": "distrobox4nix", + "type": "github" + } + }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -834,6 +849,7 @@ "root": { "inputs": { "agenix": "agenix", + "distrobox4nix": "distrobox4nix", "flake-parts": "flake-parts", "home-manager": "home-manager_2", "nh": "nh", diff --git a/flake.nix b/flake.nix index 62b3c80..9c93171 100644 --- a/flake.nix +++ b/flake.nix @@ -67,5 +67,6 @@ nh.url = "github:viperML/nh"; treefmt-nix.url = "github:numtide/treefmt-nix"; agenix.url = "github:ryantm/agenix"; + distrobox4nix.url = "github:aguirre-matteo/distrobox4nix"; }; } diff --git a/home/programs/coding/default.nix b/home/programs/coding/default.nix index 2d5d679..d819107 100644 --- a/home/programs/coding/default.nix +++ b/home/programs/coding/default.nix @@ -7,5 +7,6 @@ ./zed.nix ./nixvim ./R.nix + ./distrobox.nix ]; } diff --git a/home/programs/coding/distrobox.nix b/home/programs/coding/distrobox.nix new file mode 100644 index 0000000..b1cb6fc --- /dev/null +++ b/home/programs/coding/distrobox.nix @@ -0,0 +1,11 @@ +{ + programs.distrobox = { + enable = true; + containers = { + python-project = { + image = "fedora:latest"; + additional_packages = "python3 python3-pip git python3-numpy python3-scipy python3-matplotlib python3-pandas"; + }; + }; + }; +} diff --git a/home/programs/shell/fish.nix b/home/programs/shell/fish.nix index 297ec58..7c9a816 100644 --- a/home/programs/shell/fish.nix +++ b/home/programs/shell/fish.nix @@ -30,19 +30,6 @@ ]; functions = { fish_greeting = ""; - # fish_command_not_found = - # /* - # fish - # */ - # '' - # function fish_command_not_found - # if test -e /run/.containerenv -o -e /.dockerenv - # distrobox-host-exec $argv - # else - # __fish_default_command_not_found_handler $argv - # end - # end - # ''; }; }; }; diff --git a/hosts/default.nix b/hosts/default.nix index 1cce9dc..aedf191 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -23,6 +23,7 @@ let inputs.nixvim.homeManagerModules.nixvim inputs.agenix.homeManagerModules.default ../secrets/age.nix + inputs.distrobox4nix.homeManagerModule ]; in { diff --git a/os/system/configuration.nix b/os/system/configuration.nix index f8264b1..4feaba6 100644 --- a/os/system/configuration.nix +++ b/os/system/configuration.nix @@ -88,8 +88,6 @@ printing.enable = true; - flatpak.enable = true; - pipewire = { enable = true; alsa.enable = true; @@ -155,7 +153,6 @@ curl gnumake cmake - distrobox ntfs3g base16-schemes home-manager