moritz/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/nixos' into nixos

Browse source
This commit is contained in:
Moritz Böhme 2023-03-18 06:21:30 +01:00
commit f158ecde96
Signed by: moritz
GPG key ID: 970C6E89EB0547A9
5 changed files with 77 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
flake.nix
View file

@ -14,90 +14,62 @@
flake-utils.url = "github:numtide/flake-utils";
utils = {
url = "github:gytis-ivaskevicius/flake-utils-plus";
inputs.flake-utils.follows = "flake-utils";
};
utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
utils.inputs.flake-utils.follows = "flake-utils";
agenix = {
url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs";
};
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
};
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.inputs.utils.follows = "flake-utils";
# Zsh specific
forgit-git = {
url = "github:wfxr/forgit";
flake = false;
};
forgit-git.url = "github:wfxr/forgit";
forgit-git.flake = false;
# Laptop Touchpad
asus-touchpad-numpad-driver = {
url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";
flake = false;
};
asus-touchpad-numpad-driver.url = "github:MoritzBoehme/asus-touchpad-numpad-driver/german-layout";
asus-touchpad-numpad-driver.flake = false;
arkenfox-userjs = {
url = "github:arkenfox/user.js";
flake = false;
};
arkenfox-userjs.url = "github:arkenfox/user.js";
arkenfox-userjs.flake = false;
howdy = {
url = "sourcehut:~moritzboehme/howdy";
inputs.nixpkgs.follows = "nixpkgs";
};
howdy.url = "sourcehut:~moritzboehme/howdy";
howdy.inputs.nixpkgs.follows = "nixpkgs";
emacs.url = "git+ssh://git@gitea.moritzboeh.me/moritz/emacs.git?ref=main";
neovim.url = "github:neovim/neovim?dir=contrib";
nil = {
url = "github:oxalica/nil";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
nil.url = "github:oxalica/nil";
nil.inputs.nixpkgs.follows = "nixpkgs";
nil.inputs.flake-utils.follows = "flake-utils";
# Hyprland
hyprland.url = "github:hyprwm/Hyprland";
hyprpaper.url = "github:hyprwm/hyprpaper";
hypr-contrib.url = "github:hyprwm/contrib";
nvim-treesitter-textsubjects = {
url = "github:RRethy/nvim-treesitter-textsubjects";
flake = false;
};
nvim-treesitter-textsubjects.url = "github:RRethy/nvim-treesitter-textsubjects";
nvim-treesitter-textsubjects.flake = false;
smartcolumn-nvim = {
url = "github:m4xshen/smartcolumn.nvim";
flake = false;
};
smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
smartcolumn-nvim.flake = false;
copilot-lua = {
url = "github:zbirenbaum/copilot.lua";
flake = false;
};
copilot-lua.url = "github:zbirenbaum/copilot.lua";
copilot-lua.flake = false;
lspsaga-nvim = {
url = "github:glepnir/lspsaga.nvim";
flake = false;
};
lspsaga-nvim.url = "github:glepnir/lspsaga.nvim";
lspsaga-nvim.flake = false;
advanced-git-search-nvim = {
url = "github:aaronhallaert/advanced-git-search.nvim";
flake = false;
};
advanced-git-search-nvim.url = "github:aaronhallaert/advanced-git-search.nvim";
advanced-git-search-nvim.flake = false;
attic = {
url = "github:zhaofengli/attic";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "stable";
inputs.flake-utils.follows = "flake-utils";
};
attic.url = "github:zhaofengli/attic";
attic.inputs.nixpkgs.follows = "nixpkgs";
attic.inputs.nixpkgs-stable.follows = "stable";
attic.inputs.flake-utils.follows = "flake-utils";
};
outputs =
@ -145,8 +117,8 @@
./modules/profiles/gaming.nix
./modules/profiles/desktop.nix
];
hostDefaults = {
modules = [
hostDefaults.modules = [
./modules/default.nix
self.nixosModules.base
inputs.home-manager.nixosModule
@ -161,7 +133,7 @@
inputs.agenix.nixosModules.age
inputs.howdy.nixosModules.default
];
};
hosts.nixos-laptop.modules = [
./hosts/nixos-laptop

2
hosts/nixos-desktop/hardware-configuration.nix
View file

@ -11,7 +11,6 @@
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.initrd.systemd.enable = true;
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
@ -22,7 +21,6 @@
};
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/30025a9f-44cf-4074-8ae2-d4925efd67dd";
boot.initrd.luks.devices."enc".crypttabExtraOpts = [ "fido2-device=auto" ];
fileSystems."/home" = {
device = "/dev/disk/by-uuid/668a49b3-d169-461f-861d-0c3e6a1642d1";

1
hosts/nixos-laptop/hardware-configuration.nix
View file

@ -14,6 +14,7 @@
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/4a91d3eb-1633-42d9-8304-c10e49a61154";
fsType = "btrfs";

22
modules/config/yubikey.nix
View file

@ -9,9 +9,20 @@ let
cfg = config.my.yubikey;
in
{
options.my.yubikey = mkEnableOption "yubikey";
options.my.yubikey = {
enable = mkEnableOption "yubikey";
luksSupport = {
enable = mkEnableOption "fido2 luks support";
devices = mkOption {
type = types.listOf types.str;
default = [ ];
description = "List of luks devices to enable fido2 support for.";
};
};
};
config = {
config = mkIf cfg.enable {
services.udev.packages = [ pkgs.yubikey-personalization ];
environment.systemPackages = with pkgs; [
# cli
@ -22,5 +33,12 @@ in
yubikey-manager-qt
yubikey-personalization-gui
];
boot = mkIf cfg.luksSupport.enable {
initrd.systemd.enable = true;
initrd.luks.devices = genAttrs cfg.luksSupport.devices (_: {
crypttabExtraOpts = [ "fido2-device=auto" ];
});
};
};
}

9
modules/profiles/desktop.nix
View file

@ -5,8 +5,13 @@
}:
with lib; {
my = {
# config
yubikey.enable = true;
yubikey = {
enable = true;
luksSupport = {
enable = true;
devices = [ "enc" ];
};
};
wallpapers.enable = true;
theming = {
enable = true;