let nixos modules access all the same data as home-manager modules, update unstable pin
This commit is contained in:
parent
2099bf1ad8
commit
8af1656ed0
12
flake.lock
12
flake.lock
|
@ -186,11 +186,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1736344531,
|
||||
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
|
||||
"lastModified": 1741513245,
|
||||
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
|
||||
"owner": "NixOs",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
|
||||
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -231,11 +231,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739557722,
|
||||
"narHash": "sha256-XikzLpPUDYiNyJ4w2SfRShdbSkIgE3btYdxCGInmtc4=",
|
||||
"lastModified": 1740569341,
|
||||
"narHash": "sha256-WV8nY2IOfWdzBF5syVgCcgOchg/qQtpYh6LECYS9XkY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "plasma-manager",
|
||||
"rev": "1f3e1f38dedbbb8aad77e184fb54ec518e2d9522",
|
||||
"rev": "5eeb0172fb74392053b66a8149e61b5e191b2845",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
34
flake.nix
34
flake.nix
|
@ -36,13 +36,7 @@
|
|||
nix.registry.unstable.flake = nixpkgs-unstable;
|
||||
system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
|
||||
};
|
||||
home-module =
|
||||
system: config: {
|
||||
home-manager = {
|
||||
sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users.${config.user} = import ./home-manager/all.nix {
|
||||
module-opts = system: config: {
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
|
@ -60,18 +54,24 @@
|
|||
} // self.packages.${system};
|
||||
inherit config;
|
||||
};
|
||||
home-module = opts@{ config, ... }: {
|
||||
home-manager = {
|
||||
sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users.${config.user} = import ./home-manager/all.nix opts;
|
||||
};
|
||||
};
|
||||
user-system = import ./nixos/shared/user-system.nix;
|
||||
graphical = import ./nixos/shared/graphical.nix;
|
||||
graphical-with-conf = base: system: config: [
|
||||
nix-config-module
|
||||
home-manager.nixosModules.home-manager
|
||||
base
|
||||
(user-system system config)
|
||||
(graphical system config)
|
||||
(home-module system config)
|
||||
];
|
||||
user-system = import ./nixos/shared/user-system.nix;
|
||||
graphical = import ./nixos/shared/graphical.nix;
|
||||
graphical-with-conf = base: system: config: [
|
||||
nix-config-module
|
||||
home-manager.nixosModules.home-manager
|
||||
(import base (module-opts system config))
|
||||
(user-system (module-opts system config))
|
||||
(graphical (module-opts system config))
|
||||
(home-module (module-opts system config))
|
||||
];
|
||||
in {
|
||||
|
||||
nixosConfigurations.lambda = nixpkgs.lib.nixosSystem rec {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ pkgs, unstable, extra, config, ... }:
|
||||
{
|
||||
# [HARDWARE]
|
||||
imports =
|
||||
|
@ -106,7 +106,10 @@
|
|||
rocmOverrideGfx = "10.3.0";
|
||||
};
|
||||
|
||||
services.nextjs-ollama-llm-ui.enable = true;
|
||||
services.nextjs-ollama-llm-ui = {
|
||||
enable = true;
|
||||
package = unstable.nextjs-ollama-llm-ui;
|
||||
};
|
||||
|
||||
system.stateVersion = "24.11";
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ pkgs, unstable, extra, config, ... }:
|
||||
{
|
||||
# [HARDWARE]
|
||||
imports =
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
system: config: { pkgs, ... }:
|
||||
{ pkgs, unstable, extra, config, ... }:
|
||||
{
|
||||
# [DESKTOP / XORG / WAYLAND]
|
||||
services.libinput = {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
system: config: { pkgs, ... }:
|
||||
{ pkgs, unstable, extra, config, ... }:
|
||||
{
|
||||
# [LOCALE]
|
||||
time.timeZone = "Europe/Stockholm";
|
||||
|
|
|
@ -1,9 +1,4 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page, on
|
||||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{ pkgs, unstable, extra, config, ... }:
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
|
|
Loading…
Reference in New Issue
Block a user