phundrak/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: phundrak:2e8145f0f12caa44d0a70cbadbb8ff94c434c5cd
Branches Tags
phundrak:main
phundrak:develop
..
compare: phundrak:0b01ed04f5bedd3fe84c2506bc86a2853e0790af
Branches Tags
phundrak:main
phundrak:develop

No commits in common. "2e8145f0f12caa44d0a70cbadbb8ff94c434c5cd" and "0b01ed04f5bedd3fe84c2506bc86a2853e0790af" have entirely different histories.
2e8145f0f1 ... 0b01ed04f5

8 changed files with 36 additions and 83 deletions
Show Stats Expand all files Collapse all files

57
flake.lock generated
View File

@ -36,7 +36,6 @@
"inputs": { "inputs": {
"cachix": "cachix", "cachix": "cachix",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"nix": "nix", "nix": "nix",
"nixpkgs": [ "nixpkgs": [
@ -44,11 +43,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758366037, "lastModified": 1755961020,
"narHash": "sha256-5PK0eHAWMtwaexQ7PR68gzpeo5WjMY9hq2BcEBHjSLA=", "narHash": "sha256-Fs0CWiUA78Qgbc9zVk+zUN7pEkMPffnd//JsDtUUWBM=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "ebb56bfe1aa0936de2f8a68c616dabff1285e905", "rev": "abb198476023189fc45a01bd6502f5ca6ea62bd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -77,15 +76,16 @@
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"devenv", "devenv",
"nix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1756770412, "lastModified": 1733312601,
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "4524271976b625a4a605beefd893f270620fd751", "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,11 +167,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758375677, "lastModified": 1755914636,
"narHash": "sha256-BLtD+6qWz7fQjPk2wpwyXQLGI0E30Ikgf2ppn2nVadI=", "narHash": "sha256-VJ+Gm6YsHlPfUCpmRQxvdiZW7H3YPSrdVOewQHAhZN8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "edc7468e12be92e926847cb02418e649b02b59dd", "rev": "8b55a6ac58b678199e5bba701aaff69e2b3281c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,10 +186,7 @@
"devenv", "devenv",
"flake-compat" "flake-compat"
], ],
"flake-parts": [ "flake-parts": "flake-parts",
"devenv",
"flake-parts"
],
"git-hooks-nix": [ "git-hooks-nix": [
"devenv", "devenv",
"git-hooks" "git-hooks"
@ -227,11 +224,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757822619, "lastModified": 1755404379,
"narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +239,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1758277210, "lastModified": 1755615617,
"narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=", "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8eaee110344796db060382e15d3af0a9fc396e0e", "rev": "20075955deac2583bb12f07151c2df830ef346b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -285,11 +282,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758273351, "lastModified": 1753595452,
"narHash": "sha256-wOv1guIi9THD1NjOtBU2Xh/Avg9xv7nIjsfFSkr1NeQ=", "narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "e9a574d919a89602d2868621576b2ccae54a5cb0", "rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda",
"revCount": 675, "revCount": 665,
"type": "git", "type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell" "url": "https://git.outfoxxed.me/quickshell/quickshell"
}, },
@ -338,11 +335,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758007585, "lastModified": 1754988908,
"narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +370,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757304371, "lastModified": 1754886070,
"narHash": "sha256-EZ3Vwgh5xgXuiPUmr9e1a9dEu3hvEWhRurAKpsAwB2A=", "narHash": "sha256-MZDmxOkVKL1HY72bliN8Gxh0SYkHUa3W/1fTU2ke36I=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "3968348af022fe88468ef8de4f9683076e2e5e4b", "rev": "e37d2b326311320c8571111b3ef89b29d26d4b64",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
hosts/marpa/configuration.nix
View File

@ -21,19 +21,15 @@
desktop = { desktop = {
hyprland.enable = true; hyprland.enable = true;
niri.enable = true; niri.enable = true;
waydroid.enable = true;
xserver = { xserver = {
enable = true; enable = true;
de = "gnome"; de = "gnome";
}; };
}; };
dev = { dev.docker = {
docker = { enable = true;
enable = true; podman.enable = true;
podman.enable = true; autoprune.enable = true;
autoprune.enable = true;
};
qemu.enable = true;
}; };
hardware = { hardware = {
amdgpu.enable = true; amdgpu.enable = true;

7
system/desktop/default.nix
View File

@ -1,8 +1,3 @@
{ {
imports = [ imports = [./hyprland.nix ./niri.nix ./xserver.nix];
./hyprland.nix
./niri.nix
./waydroid.nix
./xserver.nix
];
} }

15
system/desktop/waydroid.nix
View File

@ -1,15 +0,0 @@
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.mySystem.desktop.waydroid;
in {
options.mySystem.desktop.waydroid.enable = mkEnableOption "Enables Waydroid";
config = mkIf cfg.enable {
virtualisation.waydroid.enable = cfg.enable;
environment.systemPackages = [ pkgs.waydroid-helper ];
};
}

2
system/dev/default.nix
View File

@ -1,3 +1,3 @@
{ {
imports = [./docker.nix ./qemu.nix]; imports = [./docker.nix];
} }

4
system/dev/docker.nix
View File

@ -1,7 +1,6 @@
{ {
lib, lib,
config, config,
pkgs,
... ...
}: }:
with lib; let with lib; let
@ -15,9 +14,6 @@ in {
}; };
config = { config = {
environment.systemPackages = mkIf cfg.podman.enable [
pkgs.podman-desktop
];
virtualisation = { virtualisation = {
docker = mkIf (cfg.enable && !cfg.podman.enable) { docker = mkIf (cfg.enable && !cfg.podman.enable) {
enable = true; enable = true;

19
system/dev/qemu.nix
View File

@ -1,19 +0,0 @@
{
config,
lib,
pkgs,
...
}:
with lib; let
cfg = config.mySystem.dev.qemu;
in {
options.mySystem.dev.qemu.enable = mkEnableOption "Enable QEMU";
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [
qemu
virt-manager
];
systemd.tmpfiles.rules = [ "L+ /var/lib/qemu/firmware - - - - ${pkgs.qemu}/share/qemu/firmware" ];
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
};
}

3
users/phundrak/packages.nix
View File

@ -74,7 +74,10 @@ with lib; {
dive # A tool for exploring each layer in a docker image dive # A tool for exploring each layer in a docker image
grype # Vulnerability scanner for container images and filesystems grype # Vulnerability scanner for container images and filesystems
kicad # Working on my custom keyboard kicad # Working on my custom keyboard
podman-desktop
podman-compose
tectonic # better LaTeX engine tectonic # better LaTeX engine
virt-manager
zeal zeal
## LSP servers ## LSP servers