diff options
| -rw-r--r-- | config/bash.nix | 1 | ||||
| -rw-r--r-- | flake.lock | 24 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | machines/x/home.nix | 2 | ||||
| -rw-r--r-- | modules/core/impermanence.nix | 2 | ||||
| -rw-r--r-- | modules/virtualization.nix | 10 |
6 files changed, 25 insertions, 15 deletions
diff --git a/config/bash.nix b/config/bash.nix index ae54f9e..cf83aad 100644 --- a/config/bash.nix +++ b/config/bash.nix @@ -44,6 +44,7 @@ bind '"\C-f": "sessionizer\n"' alias poof="rm $HOME/.ssh/known_hosts*" + alias db="distrobox enter" if [ -f $HOME/.custom_bashrc ]; then source $HOME/.custom_bashrc @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1736711425, - "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", + "lastModified": 1737038063, + "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", "owner": "nix-community", "repo": "disko", - "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", + "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1737188535, + "narHash": "sha256-O2ttwW1/dUc/Y+Rf48Njtr4tZpRJhy8FhafikekIjMY=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "1e36429705f9af2d00a517ba46a4f21ef8a8194f", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737022245, - "narHash": "sha256-AkDUWBsc4WJXGSRFb7UUDwecDAaybFj1YvvDZhY4V7g=", + "lastModified": 1737188028, + "narHash": "sha256-4/7LTwK3kb/CnflThLH+PaP8Kg8CQpCvAVVacDJLBpw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1bda1e50be0d0ae1ecd4f4b707c680bc3ec6c22b", + "rev": "0fdcadfdd348bf572a42206af9dff193d9ae515b", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -11,6 +11,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + # Plasma Manager plasma-manager = { url = "github:nix-community/plasma-manager"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/machines/x/home.nix b/machines/x/home.nix index 636987f..7600252 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ inputs, pkgs, ... }: { nixpkgs.config.allowUnfree = true; diff --git a/modules/core/impermanence.nix b/modules/core/impermanence.nix index 8330235..e80a50e 100644 --- a/modules/core/impermanence.nix +++ b/modules/core/impermanence.nix @@ -29,7 +29,7 @@ "/var/lib/libvirt" "/var/lib/systemd/coredump" "/etc/NetworkManager/system-connections" - "/var/lib/docker" + # "/var/lib/docker" ]; files = [ "/etc/machine-id" diff --git a/modules/virtualization.nix b/modules/virtualization.nix index 02d5d93..fb5a4cd 100644 --- a/modules/virtualization.nix +++ b/modules/virtualization.nix @@ -18,8 +18,10 @@ in }; spiceUSBRedirection.enable = true; - docker = { + # docker.enable = true; + podman = { enable = true; + dockerCompat = true; }; }; services.spice-vdagentd.enable = true; @@ -34,6 +36,12 @@ in #pkgs.vagrant pkgs.virt-viewer pkgs.guestfs-tools + pkgs.distrobox + + (pkgs.writeShellScriptBin "db-create" '' + mkdir -p "$HOME/db" + distrobox create --name my-distrobox --home "$HOME/db" --init --image ubuntu:24.04 + '') (pkgs.writeShellScriptBin "pin-cpu" '' if [[ $1 == "" ]]; then |