simplify workstation foundation

This commit is contained in:
kiri committed 2026-09-05 18:46:12 +02:00
1 parent b2cea40ddb
commit 69552b74d9
4 files changed
+15 -43

No files matched your search

Generated
+3 -31
View File
@@ -282,22 +282,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1788405554,
"narHash": "sha256-r2f1oUwixlgq9zOdYLqJLfS/lWBT60/IITjhTKI59JU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a5cc6f2c37bf518436dc8d1c288ccd0c43c2f4c4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1767892417, "lastModified": 1767892417,
@@ -324,22 +308,11 @@
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1787900134,
"narHash": "sha256-5GWj0FI2uOwKNpXkmpWrSFDe1rCaNBCUQ8d+HDtFQPI=",
"rev": "83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c",
"type": "tarball",
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1063296.83199d0d373d/nixexprs.tar.zst"
},
"original": {
"type": "tarball",
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst"
}
},
"noctalia": { "noctalia": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_4" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1788600693, "lastModified": 1788600693,
@@ -368,7 +341,6 @@
"nix-wrapper-modules": "nix-wrapper-modules", "nix-wrapper-modules": "nix-wrapper-modules",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable",
"noctalia": "noctalia", "noctalia": "noctalia",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"walker": "walker" "walker": "walker"
+4 -2
View File
@@ -23,8 +23,10 @@
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-26.05"; noctalia = {
noctalia.url = "github:noctalia-dev/noctalia"; url = "github:noctalia-dev/noctalia";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
+2 -9
View File
@@ -1,15 +1,7 @@
{ inputs, ... }: { ... }:
{ {
flake.modules.homeManager.dev-tools = flake.modules.homeManager.dev-tools =
{ config, pkgs, ... }: { config, pkgs, ... }:
let
stablePkgs = import inputs.nixpkgs-stable {
inherit (pkgs.stdenv.hostPlatform) system;
config = {
inherit (pkgs.config) allowUnfree;
};
};
in
{ {
home.sessionVariables.CARGO_HOME = "${config.xdg.dataHome}/cargo"; home.sessionVariables.CARGO_HOME = "${config.xdg.dataHome}/cargo";
home.packages = with pkgs; [ home.packages = with pkgs; [
@@ -23,6 +15,7 @@
scc scc
nodejs nodejs
mariadb mariadb
just
]; ];
programs.lazygit = { programs.lazygit = {
+6 -1
View File
@@ -3,10 +3,15 @@ let
homeModules = config.flake.modules.homeManager; homeModules = config.flake.modules.homeManager;
in in
{ {
flake.modules.nixos.podman = { flake.modules.nixos.podman =
{ lib, pkgs, ... }:
{
home-manager.sharedModules = [ homeModules.podman ]; home-manager.sharedModules = [ homeModules.podman ];
virtualisation.podman.enable = true; virtualisation.podman.enable = true;
virtualisation.containers.containersConf.settings.engine.compose_providers = [
(lib.getExe pkgs.podman-compose)
];
}; };
flake.modules.homeManager.podman = flake.modules.homeManager.podman =