properly manage stable channels & remove xserver form plasma6

This commit is contained in:
Tasia Iso 2024-04-13 12:48:54 +02:00
parent 4a253d5aa5
commit b4f7fe024f
3 changed files with 39 additions and 45 deletions

View file

@ -2,16 +2,16 @@
services.desktopManager.plasma6.enable = true;
services.xserver = {
enable = true;
enable = false;
libinput.enable = true;
};
displayManager = {
defaultSession = "plasma";
sddm = {
enable = true;
wayland.enable = true;
};
services.displayManager = {
sddm = {
enable = true;
wayland.enable = true;
};
defaultSession = "plasma";
};
}

View file

@ -2,52 +2,31 @@
"nodes": {
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1712386041,
"narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
"owner": "nix-community",
"repo": "home-manager",
"path": "/nix/store/9613fxrf433y10fz18ccixj4zpmdibzq-source",
"rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
"type": "github"
"type": "path"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager",
"type": "github"
"id": "home-manager",
"type": "indirect"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1712791164,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
"owner": "nixos",
"lastModified": 1705331948,
"narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
"rev": "b8dd8be3c790215716e7c12b247f45ca525867e2",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1712741485,
"narHash": "sha256-bCs0+MSTra80oXAsnM6Oq62WsirOIaijQ/BbUY59tR4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72",
"type": "github"
},
"original": {
"owner": "nixos",
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
@ -69,11 +48,26 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1712867921,
"narHash": "sha256-edTFV4KldkCMdViC/rmpJa7oLIU8SE/S35lh/ukC7bg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "51651a540816273b67bc4dedea2d37d116c5f7fe",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable"
}
}

View file

@ -3,8 +3,7 @@
inputs = {
# Nixpkgs
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
# You can access packages and modules from different nixpkgs revs
# at the same time. Here's an working example:
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
@ -25,6 +24,7 @@
outputs = {
self,
nixpkgs,
nixpkgs-unstable,
home-manager,
...
} @ inputs: let
@ -57,14 +57,14 @@
# NixOS configuration entrypoint
# Available through 'nixos-rebuild build --flake .#phoenix'
nixosConfigurations = {
phoenix = nixpkgs.lib.nixosSystem {
phoenix = nixpkgs-unstable.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
modules = [
./hosts/phoenix/configuration.nix
];
};
pc = nixpkgs.lib.nixosSystem {
pc = nixpkgs-unstable.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
modules = [
./hosts/pc/configuration.nix