diff --git a/flake.lock b/flake.lock index 18fb0a8..3c28aef 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1726440980, + "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724878143, - "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=", + "lastModified": 1726489388, + "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef", + "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1726463316, + "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "type": "github" }, "original": { diff --git a/machines/base.nix b/machines/base.nix index 71bf9e7..6943b14 100644 --- a/machines/base.nix +++ b/machines/base.nix @@ -31,7 +31,7 @@ users.users.${userSettings.username} = { isNormalUser = true; description = userSettings.name; - extraGroups = [ "networkmanager" "wheel" "docker" "input" "flatpak" "dialout" "video" "input" "audio" "libvirtd" ]; + extraGroups = [ "networkmanager" "wheel" "docker" "podman" "input" "flatpak" "dialout" "video" "input" "audio" "libvirtd" ]; packages = with pkgs; []; uid = 1000; }; diff --git a/machines/workstation/home.nix b/machines/workstation/home.nix index 131c863..dbbeb9a 100644 --- a/machines/workstation/home.nix +++ b/machines/workstation/home.nix @@ -2,10 +2,12 @@ { imports = [ ../../user/apps/browsers/firefox.nix + ../../user/apps/browsers/chromium.nix ../../user/apps/thunderbird.nix ../../user/dev/tools/git.nix ../../user/dev/tools/gitui.nix ../../user/dev/tools/firefox-devedition.nix + ../../user/dev/tools/dbeaver-bin.nix ../../user/dev/editor/vscodium.nix ../../user/dev/editor/zed-editor.nix ../../user/dev/lang/cc.nix diff --git a/system/services/podman.nix b/system/services/podman.nix index a655640..2572883 100644 --- a/system/services/podman.nix +++ b/system/services/podman.nix @@ -5,14 +5,15 @@ virtualisation.podman = { enable = true; dockerCompat = true; + dockerSocket.enable = true; defaultNetwork.settings.dns_enabled = true; }; environment.systemPackages = with pkgs; [ dive + virtiofsd podman-tui podman-compose - podman-desktop ]; hardware.nvidia-container-toolkit.enable = lib.lists.elem "nvidia" config.services.xserver.videoDrivers; diff --git a/system/utils.nix b/system/utils.nix index 45fa686..a4f2418 100644 --- a/system/utils.nix +++ b/system/utils.nix @@ -8,6 +8,8 @@ eza jq htop + btop + fastfetch mc git parted diff --git a/user/apps/browsers/chromium.nix b/user/apps/browsers/chromium.nix new file mode 100644 index 0000000..8627ff7 --- /dev/null +++ b/user/apps/browsers/chromium.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + chromium + ]; +} diff --git a/user/dev/tools/dbeaver-bin.nix b/user/dev/tools/dbeaver-bin.nix new file mode 100644 index 0000000..813a399 --- /dev/null +++ b/user/dev/tools/dbeaver-bin.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + dbeaver-bin + ]; +}