moritz/clan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: moritz:6125c37e2ab1c1eb38d9405178be15cdb48178c5
Branches Tags
moritz:main
..
compare: moritz:713c40d617177a0b7c07b70efc672e891ce1ea49
Branches Tags
moritz:main

No commits in common. "6125c37e2ab1c1eb38d9405178be15cdb48178c5" and "713c40d617177a0b7c07b70efc672e891ce1ea49" have entirely different histories.
6125c37e2a ... 713c40d617

23 changed files with 105 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

4
machines/moritz-desktop/configuration.nix
View file

@ -1,7 +1,7 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{pkgs, inputs, ...}: {
{pkgs, ...}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
@ -43,7 +43,7 @@
home-manager.users.moritz.home.packages = with pkgs; [
anki
(inputs.stable.legacyPackages.${pkgs.system}.calibre) # NOTE: breaks often in unstable
stable.calibre # NOTE: breaks often in unstable
];
networking.firewall.allowedTCPPorts = [9090];

1
machines/moritz-laptop/configuration.nix
View file

@ -45,7 +45,6 @@
wl-clipboard
];
home-manager.users.moritz.services.poweralertd.enable = true;
home-manager.users.moritz.services.kanshi.settings = [
{
profile.name = "undocked";

63
modules/moritz/nixpkgs.nix Normal file
View file

@ -0,0 +1,63 @@
{
config,
lib,
...
}:
with lib; let
cfg = config.my.nixpkgs;
overlayType = mkOptionType {
name = "nixpkgs-overlay";
description = "nixpkgs overlay";
check = lib.isFunction;
merge = lib.mergeOneOption;
};
in {
options.my.nixpkgs = {
overlays = mkOption {
default = [];
type = types.listOf overlayType;
example =
literalExpression
''
[
(self: super: {
openssh = super.openssh.override {
hpnSupport = true;
kerberos = self.libkrb5;
};
})
]
'';
};
channels = mkOption {
default = {};
example = literalExpression ''
{
stable = inputs.nixpkgs-stable;
}
'';
type = with types; attrsOf package;
};
overlaysForAllChannels = mkEnableOption "apply overlays for all channels";
};
config.nixpkgs = {
overlays = let
channelOverlays = _: prev:
mapAttrs
(
_: value:
import value {
inherit (prev) system;
config.allowUnfree = true;
overlays = optional cfg.overlaysForAllChannels cfg.overlays;
}
)
cfg.channels;
in
cfg.overlays ++ [channelOverlays];
config.allowUnfree = true;
};
}

BIN
modules/moritz/profiles/IntelOneMono-Regular_freeze.ttf Normal file
View file

Binary file not shown.

39
modules/moritz/profiles/base.nix
View file

@ -12,6 +12,23 @@ in {
];
my = {
nixpkgs = {
overlays = [
(
_: prev: {
nur = import inputs.nur {
pkgs = prev;
nurpkgs = prev;
};
}
)
];
channels = {
master = inputs.master;
stable = inputs.stable;
};
};
shell = {
abbreviations = {
us = "systemctl --user";
@ -56,10 +73,15 @@ in {
};
};
};
specialisation.light-theme.configuration = {
stylix = {
base16Scheme = lib.mkOverride 999 ./day.yaml;
};
};
stylix = {
enable = lib.mkDefault true;
base16Scheme = lib.mkDefault ./theme/night.yaml;
opacity.terminal = 0.95;
base16Scheme = lib.mkDefault ./night.yaml;
opacity.terminal = 0.9;
fonts = {
serif = {
package = pkgs.dejavu_fonts;
@ -70,8 +92,15 @@ in {
name = "DejaVu Sans";
};
monospace = {
package = pkgs.nerd-fonts.fira-code;
name = "FiraCode Nerd Font";
package = (
# NOTE: custom intel one mono with frozen programming features
pkgs.runCommand "intone-mono-nerd-font-patched" {} ''
${pkgs.nerd-font-patcher}/bin/nerd-font-patcher -c ${./IntelOneMono-Regular_freeze.ttf}
mkdir -p $out/share/fonts/truetype/NerdFonts/IntoneMonoFreeze/
cp -a . $out/share/fonts/truetype/NerdFonts/IntoneMonoFreeze/
''
);
name = "IntoneMonoFreeze Nerd Font";
};
emoji = {
package = pkgs.noto-fonts-emoji;
@ -135,8 +164,6 @@ in {
xdg.userDirs.enable = true;
};
nixpkgs.config.allowUnfree = true;
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;

0
modules/moritz/profiles/theme/day.yaml → modules/moritz/profiles/day.yaml
View file

2
modules/moritz/profiles/desktop.nix
View file

@ -74,7 +74,7 @@ in {
(inputs.filetags.packages.${pkgs.system}.default)
keepassxc
pavucontrol
(inputs.stable.legacyPackages.${pkgs.system}.libreoffice) # NOTE: breaks often
stable.libreoffice # NOTE: breaks often
signal-desktop
vlc
];

3
modules/moritz/profiles/jujutsu.nix
View file

@ -19,8 +19,7 @@ in {
email = "mail@moritzboeh.me";
name = "Moritz Böhme";
};
ui.pager.command = ["less" "-FRX"];
ui.pager.env.LESSCHARSET = "utf-8";
ui.paginate = "never";
ui.default-command = "log";
signing = {
behavior = "drop";

0
modules/moritz/profiles/theme/night.yaml → modules/moritz/profiles/night.yaml
View file

3
modules/moritz/programs/chromium.nix
View file

@ -2,7 +2,6 @@
config,
lib,
pkgs,
inputs,
...
}:
with lib; let
@ -12,7 +11,7 @@ in {
enable = mkEnableOption "chromium";
package = mkOption {
type = types.package;
default = inputs.stable.legacyPackages.${pkgs.system}.chromium;
default = pkgs.stable.chromium;
defaultText = "pkgs.chromium";
description = "Chromium package to install.";
};

5
modules/moritz/programs/firefox.nix
View file

@ -65,10 +65,7 @@ in {
// Overrides
${cfg.arkenfox.overrides}
'';
extensions.packages = with (import inputs.nur {
pkgs = pkgs;
nurpkgs = pkgs;
}).repos.rycee.firefox-addons; [
extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
darkreader
istilldontcareaboutcookies
kagi-search

4
modules/moritz/programs/nvim/plugins/lsp.nix
View file

@ -10,11 +10,11 @@
elixir.setup {
nextls = {
enable = vim.fn.exepath("nextls") ~= "",
enable = true,
cmd = vim.fn.exepath("nextls"),
},
elixirls = {
enable = vim.fn.exepath("elixir-ls") ~= "",
enable = true,
cmd = vim.fn.exepath("elixir-ls"),
settings = elixirls.settings {
dialyzerEnabled = true,

2
modules/moritz/security/default.nix
View file

@ -70,7 +70,7 @@
# SSH
services.openssh = {
package = pkgs.openssh;
package = pkgs.master.openssh; # HACK: to fix CVE-2024-6387
settings = {
# Disable ssh password login
PasswordAuthentication = lib.mkDefault false;

1
vars/per-machine/moritz-laptop/user-password-moritz/user-password-hash/machines/moritz-laptop
View file

@ -1 +0,0 @@
../../../../../../sops/machines/moritz-laptop

19
vars/per-machine/moritz-laptop/user-password-moritz/user-password-hash/secret
View file

@ -1,19 +0,0 @@
{
"data": "ENC[AES256_GCM,data:26K8iGyk1w83Ems7o9ctxzpX70I0vb724DgSmJWIp73RG3FS09m/gUA7xIQ8ZZWtWwyA/XK+ZZzda7WyvT7n3fbaTBvftJAagWZMtlr02v7AITKaLQO4oUHeIX/irljZP+eJhMTEFDIBZQ==,iv:J6l0pM4DnHP33CzO+tcU61bwe1ENA3XxY8HxAUWwHf8=,tag:3kI2MZnoywethEzqr8dJ5w==,type:str]",
"sops": {
"age": [
{
"recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByQW96a09RVyt4cDBlQ0pR\nSE9YVFRIV0VpMVVuSEdRdzQzOUR3VHNqcGw4Ckx3eTY2cDVQRG90K1VIZDNzSE1B\neWZaSFlMWlF2dWdvVlNYMmVwMEx5cVEKLS0tIFNPeVZhSW95bDlQUzlDYXo1dENj\nd1Bzd2I4dFp6RUlhaHJqajVrTi9aMFUKdErKRtu37x6xCjpXORxaKkZWSTV2pqD2\nkSEzCUIgUPcKb5U/AzZcj9WG8E+y4mea+ZzGpx2w+iSu0yehJdVyVg==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age1rgyueg2rnfw2er0rzkc6dc97p38fekjujdusfje6xn7g40plpfrshrlsyu",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxUncrV2w1VTFxRW5VMmNZ\nbmtscnZHQXUxZzFOQk1YSzNHTm8vNlVkUTA4ClJrQjdSVVdPZHZuTUk3YXF0eGhu\nZ3QxRGZKd2NmeFdwZkE1RnNyWVRWK0kKLS0tIGFQZFlDZW1Fb3V1ZE9GbXlhMzJP\nNHhlTGZENzZwOVlnRmJwTHBaazNoV2cKX1S0yXxp0RuJzbce9LDdM5se6t0oVPy8\nCeJ0DVGTOG+0hMeAL4tKeYiYHUBxhO4zUVfWBDcAeClt7W908gSptA==\n-----END AGE ENCRYPTED FILE-----\n"
}
],
"lastmodified": "2025-08-01T18:16:08Z",
"mac": "ENC[AES256_GCM,data:S3N2Oj79iA+gzEIv3f0Z7/q3YHpg2qR72LGnN0SLwP5yFt/x9Azn9kFUWK67cXcCm9d5vZ67IS9l+lTSAvUfqPJjQbyu3XWgu6mzb0gxaRaZ5EBgdxmsGgbMNRoRJsJiFZDQeN1F6hI33rqIVKT7DKBpgO0yANN8zDlkoiy3zuE=,iv:7kXXanDQejDSseBk0YlQR8PMO4W0NhJAPgWXHfPiQ0A=,tag:QYT/W7gZXrn4uFDSqa0C9Q==,type:str]",
"unencrypted_suffix": "_unencrypted",
"version": "3.10.2"
}
}

1
vars/per-machine/moritz-laptop/user-password-moritz/user-password-hash/users/moritz
View file

@ -1 +0,0 @@
../../../../../../sops/users/moritz

15
vars/per-machine/moritz-laptop/user-password-moritz/user-password/secret
View file

@ -1,15 +0,0 @@
{
"data": "ENC[AES256_GCM,data:2cnno2ocuWquZks=,iv:NCs2Ayd/hBJn+2YPyFLCRBYamtlKfltDDrwCygHFtMw=,tag:J9tRVUcoahtZInbxtUgz5g==,type:str]",
"sops": {
"age": [
{
"recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsM2VlM2xDeG5rM3c1dzVK\ndVpwa3Z0QUgwaXBCR3lnQTNrdmFxOEZVeTFFCkdLM2xSa09DREd1ZEk0a0FpMTBH\ncnNWdldNOExNOEJXMGd2bUIwK0xkencKLS0tIE5zbys5U3RzNC9xdjNWR1lwMEw0\nREY4YXAwVkhuN2l6Tm1EK0lia2VGTkEKSHs2i9MDXy8U22Q+KQ4UotrWA+rr4X4K\ntSPMM/5nE3/Vh89xuw1VJyA7hS0rn/Q14/9NfAHFTiMNrg91Zu8PgQ==\n-----END AGE ENCRYPTED FILE-----\n"
}
],
"lastmodified": "2025-08-01T18:16:05Z",
"mac": "ENC[AES256_GCM,data:rsrX/WEIjICr3cJha/qaZ0JNqs2LxSGvsv9ed05aLbK3cQBwktLuCyQaFMTMbvWCOxDRa4xsnF4/KigtQQPiwRW1nQ5H+Kzir+LX6vo0Ftw3WCBLQBb7Jg4KWIZ7VbR11aFDhoYdnaBguJZm6LmnG8fub2OAkKV4UL2xv4izvUg=,iv:RsKjFu8wsZaVgidoaqtKksbpU6MOvIQMP0UtNh75XUg=,tag:AEuB7d20852uOFEOO70miQ==,type:str]",
"unencrypted_suffix": "_unencrypted",
"version": "3.10.2"
}
}

1
vars/per-machine/moritz-laptop/user-password-moritz/user-password/users/moritz
View file

@ -1 +0,0 @@
../../../../../../sops/users/moritz

1
vars/per-machine/moritz-laptop/user-password-root/user-password-hash/machines/moritz-laptop
View file

@ -1 +0,0 @@
../../../../../../sops/machines/moritz-laptop

19
vars/per-machine/moritz-laptop/user-password-root/user-password-hash/secret
View file

@ -1,19 +0,0 @@
{
"data": "ENC[AES256_GCM,data:2TiDEVPXGeaQHWXDbaS85LcROcvgcHJ+sn5McYXrxn1g2iPc0PbQmPTswnDb4MiNdpywSVNiM47DtLz4f3wFmdZPoS/rnyUfBR1V5YU0wdKdOSjk97Q4xea5pNFP9ZltbNmOSSTfkL3RhQ==,iv:WMDwAemQVRIm+/jiii/2kAQa3NxlJzvCGl1OVpccL1Y=,tag:MXapiPKPWJjnZxa/FqfWng==,type:str]",
"sops": {
"age": [
{
"recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGSnBRM1NSRXBwL2ZNamh2\nQ25NbktmZlNwSk9uUkFjY25jajZYUktUVm1ZCi85TW9RREhHTHhUZzh4dzlLTjl4\nRVd4dTgxekpjSExyMFhRMDErcEdWbncKLS0tIHdEWS9MNHE4azBYMTdVaW1Jb0ty\nODRrR3BQNWd4Qlc2VDRxNnpLNXY1Nm8KdPqSJ67CKH6LpDTY9KYtcNxqBTgyBCyk\nM7vu+qDuwZODG7qvxqE3c2KnrfDalO+4/DDi2cf0jRNAyXq3HFaHKA==\n-----END AGE ENCRYPTED FILE-----\n"
},
{
"recipient": "age1rgyueg2rnfw2er0rzkc6dc97p38fekjujdusfje6xn7g40plpfrshrlsyu",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1bEVWRzRZWTdlM2xsWktZ\neUFJYStpZDhIMmJoa28wb0ZoUmx6TnFFVXp3Cnpid3FNZVBqZCsveWI0ekFxVDNE\nc1krUnBBcTFGTTdwMklWZm9iRjRNblUKLS0tIDFzeTN1R1p6MERVNzNyZndWaHN6\nUUJLYWkvT3VzR2tpeXlMQkliZmZiSGcKm6hBLbaoN1gNINFZjaSOB0gGynAk2IpZ\nMLRU75FDo12ExjGWapuSwmF38E7K9aL36ADznkqhk535uVOAPv4Jfg==\n-----END AGE ENCRYPTED FILE-----\n"
}
],
"lastmodified": "2025-08-01T18:17:20Z",
"mac": "ENC[AES256_GCM,data:edjaJwjv2xNeNFa/XdblSaP6+n5/iQp43ARgYfzThZNZ1ZN5hBvMsSFCYie+LUmntn3AJe7n4Gg4OaDivyttBOjWDUZBoCZquXWdVA/hzujfJpdqtAOmGrTNVAPAf2S2pNOvtHwsoZzaDdWrrHbp3PCkMXqIAWc8LbadXGQbc8k=,iv:X0AgKfAJIvy6nDDI5aEpmJg+N12UvFgUND7bPdaT4Ik=,tag:xqe5adLYxVbJk5AtMQbDhg==,type:str]",
"unencrypted_suffix": "_unencrypted",
"version": "3.10.2"
}
}

1
vars/per-machine/moritz-laptop/user-password-root/user-password-hash/users/moritz
View file

@ -1 +0,0 @@
../../../../../../sops/users/moritz

15
vars/per-machine/moritz-laptop/user-password-root/user-password/secret
View file

@ -1,15 +0,0 @@
{
"data": "ENC[AES256_GCM,data:OkHa8p3LDyijUJRUjw8ST8VvKffdG3Gyxvk2zF1Wtg==,iv:RTjyI5XFMxk/GcfEnvEpZYg5eKesstw2dNI1nbaPds8=,tag:qU5l+G36P4tsK85hVvTiTQ==,type:str]",
"sops": {
"age": [
{
"recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7",
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmbWN4QzBtQTV4QzVYcVhu\nU1oxdk55eUdYNDVxQ0hVdkF2OWVkVTlJZFhVCjRibVdyeWJIdDhLUi9yc1RGSnNu\nQ3UzWGFCNWwwNkdFUGp3Y0Uxb2NtbkUKLS0tIEJ2Y29GeU9HZEpXRkRSU0U0aTI5\nLzJDTEp5TmJEbWdjUldXc2piT0xkNWMKMOO+m5vJelGhuxFFOWncneZgtsuQ3NUD\n9ACBCLjjZbUB7AIfK2GfTORFU50dp70kPvUCXl9PHzTGOq9TlMp1qw==\n-----END AGE ENCRYPTED FILE-----\n"
}
],
"lastmodified": "2025-08-01T18:17:18Z",
"mac": "ENC[AES256_GCM,data:ivmyAf63jazxFKJP6FyyRpXwnot/TIGSisFvOiMf1IQNsxXIhRkVtevSX1bWpq9CJUNqVSkICT3rzjYY2Wg0qoG/x1p59OXo20O6N8atEM3lXh9Hx02SWNsYoEmOeyvopGss6jPKJVdzUSESY8/lpzKPF1ejzhnMYc4utgVm4W8=,iv:zCbqTAY5zIez/+ytyETn7QtLBun3i3E1dw4cMNHRUBQ=,tag:enRpiIOdPVMKgBaKigwTww==,type:str]",
"unencrypted_suffix": "_unencrypted",
"version": "3.10.2"
}
}

1
vars/per-machine/moritz-laptop/user-password-root/user-password/users/moritz
View file

@ -1 +0,0 @@
../../../../../../sops/users/moritz