diff --git a/flake.lock b/flake.lock index b479732..7a67c93 100644 --- a/flake.lock +++ b/flake.lock @@ -54,7 +54,47 @@ "type": "github" } }, + "flatpaks": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs_2", + "systems": "systems" + }, + "locked": { + "lastModified": 1733581530, + "narHash": "sha256-W+orHmF+XpZosrBFAFRs7sS1iVKYveg9SutkzSXMVsI=", + "owner": "GermanBread", + "repo": "declarative-flatpak", + "rev": "b88bd5b65f8e7c35eec0a90cfd6e096b2e7f79c0", + "type": "github" + }, + "original": { + "owner": "GermanBread", + "ref": "stable-v3", + "repo": "declarative-flatpak", + "type": "github" + } + }, "home-manager": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -95,6 +135,38 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1743259260, "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=", @@ -114,9 +186,25 @@ "inputs": { "alacritty-themes": "alacritty-themes", "firefox-addons": "firefox-addons", - "home-manager": "home-manager", + "flatpaks": "flatpaks", + "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_3" + } + }, + "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 2c2229b..8f7c3e8 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,10 @@ url = "github:Johnsoct/alacritty"; flake = false; }; + + flatpaks = { + url = "github:GermanBread/declarative-flatpak/stable-v3"; + }; }; outputs = { nixpkgs, ... } @ inputs: diff --git a/modules/default.nix b/modules/default.nix index 97eb959..afb3467 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -83,6 +83,7 @@ in modules = [ inputs.home-manager.nixosModules.home-manager + inputs.flatpaks.nixosModules.declarative-flatpak ../nixos/system config.nixosSystemModule diff --git a/nixos/system/default.nix b/nixos/system/default.nix index ba69c32..7aa8e25 100644 --- a/nixos/system/default.nix +++ b/nixos/system/default.nix @@ -27,6 +27,14 @@ services.openssh.enable = true; + services.flatpak = { + enable = true; + packages = [ "flathub:app/org.vinegarhq.Sober//stable" ]; + remotes = { + "flathub" = "https://dl.flathub.org/repo/flathub.flatpakrepo"; + }; + }; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/nixos/system/hardware.nix b/nixos/system/hardware.nix index c8077fe..290e89c 100644 --- a/nixos/system/hardware.nix +++ b/nixos/system/hardware.nix @@ -8,7 +8,15 @@ # Enable AMD GPU support boot.initrd.kernelModules = [ "amdgpu" ]; - boot.kernelParams = [ "video=DP-1:2560x1440@165" "video=DP-3:1920x1080@144" ]; + boot.kernelParams = [ + "video=DP-1:2560x1440@165" + "video=DP-3:1920x1080@144" + "kvm.enable_virt_at_load=0" + ]; + virtualisation.virtualbox.host = { + enable = true; + enableExtensionPack = true; + }; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; diff --git a/nixos/system/users.nix b/nixos/system/users.nix index 2d8fdad..88dd5fa 100644 --- a/nixos/system/users.nix +++ b/nixos/system/users.nix @@ -8,7 +8,11 @@ shell = pkgs.zsh; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ + "networkmanager" + "wheel" + "vboxusers" + ]; }; security.sudo.wheelNeedsPassword = false;