mbk/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use-kde opt instead of use-x11

Browse source 
wayland doesn't seem like the right choice for me :/
This commit is contained in:
mehbark 2023-08-15 09:52:10 -04:00
parent 3375ef7930
commit c7d0386ff3
5 changed files with 15 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.conf.nix
View file

@ -1,3 +1,3 @@
{
use-x11 = false;
use-kde = false;
}

10
configuration.nix
View file

@ -4,7 +4,7 @@
{ config, pkgs, ... }:
let
use-x11 = (import ./build.conf.nix).use-x11;
use-kde = (import ./build.conf.nix).use-kde;
in
{
nix = {
@ -57,11 +57,11 @@ in
};
# Enable the X11 windowing system.
services.xserver.enable = use-x11;
services.xserver.enable = true;
# Enable the KDE Plasma Desktop Environment.
services.xserver.displayManager.sddm.enable = use-x11;
services.xserver.desktopManager.plasma5.enable = use-x11;
services.xserver.displayManager.sddm.enable = use-kde;
services.xserver.desktopManager.plasma5.enable = use-kde;
# Configure keymap in X11
services.xserver = {
@ -69,8 +69,6 @@ in
xkbVariant = "";
};
programs.hyprland.enable = !use-x11;
# Enable CUPS to print documents.
services.printing.enable = true;

141
flake.lock
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1691998815,
"narHash": "sha256-HuFgb+W1Dvd0mjjudpTf0hVg/YKKiMRpX14t7dJeTm8=",
"lastModified": 1692081771,
"narHash": "sha256-LWhyDz3gi1RzTcW6e6iwfs4VuDWFajOexBKygNIqvQM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "da6874e8bb82204323b94154585a1471c739f73e",
"rev": "18791781ea86cbec6bce8bcb847444b9c73b8b3b",
"type": "github"
},
"original": {
@ -20,76 +20,13 @@
"type": "github"
}
},
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs",
"systems": "systems",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1692034053,
"narHash": "sha256-Ml3mabr8SBbZjh+pFAO/HDGINdR4e4MTPhRmthxTh3g=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "7c4daee29a353fa7e800c4874ce6d491eda458c3",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "Hyprland",
"type": "github"
}
},
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1691654369,
"narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1692007866,
"narHash": "sha256-X8w0vPZjZxMm68VCwh/BHDoKRGp+BgzQ6w7Nkif6IVM=",
"lastModified": 1692067901,
"narHash": "sha256-kq8Pf/nmlXECDWMkQSRGQkjWsA6G0pjzZkfUEaTmXJE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "de2b8ddf94d6cc6161b7659649594c79bd66c13b",
"rev": "ea95c0917609e5c48023cc7c6141bea2fdf13970",
"type": "github"
},
"original": {
@ -102,71 +39,7 @@
"root": {
"inputs": {
"home-manager": "home-manager",
"hyprland": "hyprland",
"nixpkgs": "nixpkgs_2"
}
},
"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"
}
},
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1691073628,
"narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
"type": "gitlab"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1691841170,
"narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
"nixpkgs": "nixpkgs"
}
}
},

2
flake.nix
View file

@ -5,7 +5,7 @@
inputs.home-manager.url = "github:nix-community/home-manager";
inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs";
outputs = inputs@{ self, nixpkgs, home-manager, hyprland, ... }: {
outputs = inputs@{ self, nixpkgs, home-manager, ... }: {
nixosConfigurations = {
nix = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";

4
home.nix
View file

@ -1,6 +1,6 @@
{ config, pkgs, ... }:
let
use-x11 = (import ./build.conf.nix).use-x11;
use-kde = (import ./build.conf.nix).use-kde;
in
{
/* The home.stateVersion option does not have a default and must be set */
@ -108,5 +108,5 @@ in
extraConfig = import ./kitty.conf.nix;
};
xsession.windowManager.xmonad.enable = !use-x11;
xsession.windowManager.xmonad.enable = !use-kde;
}