Compare commits

..

6 Commits

39 changed files with 114 additions and 61 deletions

42
flake.lock generated
View File

@@ -48,11 +48,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1773892995,
"narHash": "sha256-kRGAztxZcaErtp4FoXnKgOX0OebUdkAIoSXRU1fybKA=",
"lastModified": 1774690660,
"narHash": "sha256-oMALw/szOKhCXVX00pmITjcHorWPWu2jLRYiV1sWHnI=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "394a8d49da42d2a63e8845c7262c636051f0f823",
"rev": "f4fc55e8011f82a9e0d66c610c1bec5274751b10",
"type": "gitlab"
},
"original": {
@@ -103,11 +103,11 @@
]
},
"locked": {
"lastModified": 1773681845,
"narHash": "sha256-o8hrZrigP0JYcwnglCp8Zi8jQafWsxbDtRRPzuVwFxY=",
"lastModified": 1774559029,
"narHash": "sha256-deix7yg3j6AhjMPnFDCmWB3f83LsajaaULP5HH2j34k=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "0759e0e137305bc9d0c52c204c6d8dffe6f601a6",
"rev": "a0bb0d11514f92b639514220114ac8063c72d0a3",
"type": "github"
},
"original": {
@@ -141,11 +141,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1774407052,
"narHash": "sha256-rUkn7Bo3PAlpcZl8+0FDsTwFyDwvS4xwMT9+RJ+XJoE=",
"lastModified": 1774666183,
"narHash": "sha256-3DNpGXzkyuIu3/gXNtLvB2oSqKY5z1QP5ajy3VZjVV0=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "70daf1f48885f0b4a70797076cd2ff5d9139b46e",
"rev": "7bcbe84d765e7fce5e267c569c718d8246336f3b",
"type": "github"
},
"original": {
@@ -156,11 +156,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1773533765,
"narHash": "sha256-qonGfS2lzCgCl59Zl63jF6dIRRpvW3AJooBGMaXjHiY=",
"lastModified": 1774567711,
"narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "f8e82243fd601afb9f59ad230958bd073795cbfe",
"rev": "3f6f874dfc34d386d10e434c48ad966c4832243e",
"type": "github"
},
"original": {
@@ -172,11 +172,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1773814637,
"narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=",
"lastModified": 1774388614,
"narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96",
"rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
"type": "github"
},
"original": {
@@ -203,11 +203,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1773821835,
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
"lastModified": 1774386573,
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
"type": "github"
},
"original": {
@@ -239,11 +239,11 @@
]
},
"locked": {
"lastModified": 1773889674,
"narHash": "sha256-+ycaiVAk3MEshJTg35cBTUa0MizGiS+bgpYw/f8ohkg=",
"lastModified": 1774303811,
"narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "29b6519f3e0780452bca0ac0be4584f04ac16cc5",
"rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
"type": "github"
},
"original": {

View File

@@ -28,6 +28,9 @@
programs.zsh.enable = true;
# hive modules
hive.hyprland.enable = true;
hive.hyprland.autologin = "jonas";
hive.kwallet.enable = true;
hive.kwallet.forUsers = ["jonas"];
hive.virt-manager.enable = true;
hive.virt-manager.forUsers = ["jonas"];

View File

@@ -49,6 +49,9 @@
];
# hive modules
hive.plasma.enable = true;
hive.plasma.autologin = "jonas";
hive.kwallet.enable = true;
hive.kwallet.forUsers = ["jonas"];
hive.virt-manager.enable = true;
hive.virt-manager.forUsers = ["jonas"];

View File

@@ -5,31 +5,34 @@
pkgs,
...
}: let
cfg = config.hive.displayManager;
cfg = config.hive.hyprland;
in {
options.hive.displayManager = with lib; {
options.hive.hyprland = with lib; {
enable = mkEnableOption "Enable Hyprland Wayland compositor";
autologin = mkOption {
type = types.nullOr types.str;
default = null;
description = "The autologin username or null for no autologin.";
};
};
config = {
services.xserver.enable = true;
services.xserver = {
xkb.layout = "de";
xkb.variant = "";
xkb.options = "caps:ctrl_modifier";
};
services.displayManager.autoLogin.enable = cfg.autologin != null;
services.displayManager.autoLogin.user = cfg.autologin;
services.libinput.enable = true;
services.dbus.enable = true;
services.displayManager.sddm = {
config = lib.mkIf cfg.enable {
services.displayManager = {
autoLogin.enable = cfg.autologin != null;
autoLogin.user = cfg.autologin;
sddm = {
enable = true;
wayland.enable = true;
};
};
programs.hyprland = {
enable = true;
withUWSM = true;
xwayland.enable = true;
};
services.libinput.enable = true;
services.dbus.enable = true;
xdg.portal = {
enable = true;
@@ -41,14 +44,7 @@
};
environment.systemPackages = with pkgs; [spaceFM];
services.udisks2.enable = true;
programs.hyprland = {
enable = true;
withUWSM = true;
xwayland.enable = true;
};
programs.hyprlock.enable = true;
security.pam.services.hyprlock = {};
};

View File

@@ -8,6 +8,7 @@
cfg = config.hive.kwallet;
in {
options.hive.kwallet = {
enable = lib.mkEnableOption "Enable kwallet integration with pam.";
forUsers = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [];
@@ -17,7 +18,7 @@
};
};
config = {
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs.kdePackages; [
kwallet
kwalletmanager

View File

@@ -1,15 +1,30 @@
{
flake.nixosModules.plasma = {pkgs, ...}: {
services.xserver.enable = true;
services.xserver = {
xkb.layout = "de";
xkb.variant = "";
xkb.options = "caps:ctrl_modifier";
flake.nixosModules.plasma = {
config,
pkgs,
lib,
...
}: let
cfg = config.hive.plasma;
in {
options.hive.plasma = {
enable = lib.mkEnableOption "Enable Plasma 6 desktop environment";
autologin = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
description = "The autologin username or null for no autologin.";
};
services.displayManager.sddm = {
};
config = lib.mkIf cfg.enable {
services.displayManager = {
autoLogin.enable = cfg.autologin != null;
autoLogin.user = cfg.autologin;
sddm = {
enable = true;
wayland.enable = true;
};
};
services.desktopManager.plasma6.enable = true;
xdg.portal = {
enable = true;
@@ -19,4 +34,5 @@
];
};
};
};
}

32
modules/docs.nix Normal file
View File

@@ -0,0 +1,32 @@
{
self,
inputs,
...
}: {
perSystem = {
pkgs,
lib,
system,
...
}: {
packages.docs = let
nixos = inputs.nixpkgs.lib.nixosSystem {
inherit system;
modules =
[
inputs.sops-nix.nixosModules.sops
]
++ lib.attrValues self.nixosModules;
};
doc = pkgs.nixosOptionsDoc {options.hive = nixos.options.hive;};
in
pkgs.stdenvNoCC.mkDerivation {
name = ".hive-docs";
buildCommand = ''
mkdir -p $out
cp ${doc.optionsCommonMark} $out/docs.md
${pkgs.pandoc}/bin/pandoc -o $out/docs.html $out/docs.md
'';
};
};
}

View File

@@ -92,7 +92,7 @@
;;collab ; buffers with friends
(debugger +realgud +lsp) ; FIXME stepping through code, to help you add bugs
;;direnv
;;docker
docker
;;editorconfig ; let someone else argue about tabs vs spaces
ein ; tame Jupyter notebooks with emacs
(eval +overlay) ; run code, run (also, repls)

View File

@@ -56,6 +56,7 @@
imports = [
self.nixosModules.bulk-transcode-overlay
self.nixosModules.unstable-overlay
];
config = {

View File

@@ -28,6 +28,7 @@
description = "The user for the borg repository home.";
};
repositories = lib.mkOption {
description = "The borg repositories to serve";
type = lib.types.attrsOf (lib.types.submodule {
options = {
name = lib.mkOption {