schrottkatze/nix-configs
0
0
Fork 0
mirror of https://forge.katzen.cafe/schrottkatze/nix-configs.git synced 2025-11-17 17:19:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: schrottkatze:509320c115216663aa06e88d5f740a5faf919a07
Branches Tags
schrottkatze:main
schrottkatze:push-pqvqptxrrmyk
..
compare: schrottkatze:5750480f034ea31517868470ad0c23745cd7d1f3
Branches Tags
schrottkatze:main
schrottkatze:push-pqvqptxrrmyk

No commits in common. "509320c115216663aa06e88d5f740a5faf919a07" and "5750480f034ea31517868470ad0c23745cd7d1f3" have entirely different histories.
509320c115 ... 5750480f03

64 changed files with 996 additions and 1301 deletions
Download patch file Download diff file Expand all files Collapse all files

15
common.nix
View file

@ -10,13 +10,11 @@
...
}:
with lib;
with builtins;
{
with builtins; {
imports = [lix-module.nixosModules.default];
environment = {
systemPackages = with pkgs; [
nixfmt-rfc-style
overskride
transmission_4-gtk
@ -107,16 +105,7 @@ with builtins;
users.users.jade = {
isNormalUser = true;
extraGroups = [
"wheel"
"input"
"uinput"
"libvirtd"
"adbusers"
"dialout"
"plugdev"
"wireshark"
];
extraGroups = ["wheel" "input" "uinput" "libvirtd" "adbusers" "dialout" "plugdev" "wireshark"];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOaE8TFsIazpn4OnHvHcRpOFr9FfvMaWOiEjmHsmnAoE cardno:000F_70CD7D05"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILg7hhAKxIAbokHHcIj9HBgbkgoKGCG2R+gx7HZKL+iz cardno:000F_93C6A612"

43
flake.nix
View file

@ -24,8 +24,7 @@
};
};
outputs =
{
outputs = {
self,
nixpkgs,
nixpkgs-stable,
@ -39,14 +38,12 @@
fenix,
crane,
...
}@inputs:
let
} @ inputs: let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
pkgs-stable = nixpkgs-stable.legacyPackages.${system};
pkgs-unstable-small = nixpkgs-unstable-small.legacyPackages.${system};
rs-toolchain =
with fenix.packages.${system};
rs-toolchain = with fenix.packages.${system};
combine [
complete.toolchain
];
@ -58,9 +55,7 @@
src = crane-lib.cleanCargoSource (crane-lib.path ./.);
};
};
in
{
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
in {
devShells."x86_64-linux".default = pkgs.mkShell {
buildInputs = [
rs-toolchain
@ -71,14 +66,7 @@
nixosConfigurations = {
monosodium-glutamate-g = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit
inputs
pkgs-unstable-small
pkgs-stable
rs-programs
lix-module
niri
;
inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module niri;
};
system = "x86_64-linux";
modules = [
@ -95,13 +83,11 @@
home-manager.sharedModules = [
inputs.nixcord.homeManagerModules.nixcord
];
home-manager.users.jade =
{
home-manager.users.jade = {
nixosConfig,
pkgs,
...
}:
{
}: {
home.sessionVariables.TZ = nixosConfig.time.timeZone;
home.stateVersion = "${nixosConfig.system.stateVersion}";
};
@ -110,14 +96,7 @@
};
denkbrett = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit
inputs
pkgs-unstable-small
pkgs-stable
rs-programs
lix-module
niri
;
inherit inputs pkgs-unstable-small pkgs-stable rs-programs lix-module niri;
};
system = "x86_64-linux";
modules = [
@ -134,13 +113,11 @@
home-manager.sharedModules = [
inputs.nixcord.homeManagerModules.nixcord
];
home-manager.users.jade =
{
home-manager.users.jade = {
nixosConfig,
pkgs,
...
}:
{
}: {
home.sessionVariables.TZ = nixosConfig.time.timeZone;
home.stateVersion = "22.11";
};

3
hosts/denkbrett/configuration.nix
View file

@ -1,8 +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, ... }:
{
{pkgs, ...}: {
nixpkgs.config.permittedInsecurePackages = [
"electron-25.9.0"
"electron-27.3.11"

30
hosts/denkbrett/hardware-configuration.nix
View file

@ -7,19 +7,12 @@
pkgs,
modulesPath,
...
}:
{
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [
"xhci_pci"
"nvme"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = ["i915"];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
@ -27,33 +20,22 @@
fileSystems."/" = {
device = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";
fsType = "btrfs";
options = [
"subvol=@"
"compress=zstd:3"
"noatime"
];
options = ["subvol=@" "compress=zstd:3" "noatime"];
};
fileSystems."/home" = {
device = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";
fsType = "btrfs";
options = [
"subvol=@home"
"compress=zstd:3"
];
options = ["subvol=@home" "compress=zstd:3"];
};
fileSystems."/swap" = {
device = "/dev/disk/by-uuid/4f9e8afa-f8d7-40bf-b3ea-17e8e8fbb694";
fsType = "btrfs";
options = [
"subvol=@/@swap"
"noatime"
];
options = ["subvol=@/@swap" "noatime"];
};
boot.initrd.luks.devices."luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122".device =
"/dev/disk/by-uuid/9cd75cce-6829-4db8-8c5c-a9fb9ec3e122";
boot.initrd.luks.devices."luks-9cd75cce-6829-4db8-8c5c-a9fb9ec3e122".device = "/dev/disk/by-uuid/9cd75cce-6829-4db8-8c5c-a9fb9ec3e122";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/C6CA-5DE8";

3
hosts/denkbrett/modules/default.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
imports = [
./input.nix
./graphics.nix

3
hosts/denkbrett/modules/graphics.nix
View file

@ -3,8 +3,7 @@
lib,
config,
...
}:
{
}: {
environment.variables = {
VDPAU_DRIVER = lib.mkIf config.hardware.graphics.enable (lib.mkDefault "va_gl");
};

19
hosts/denkbrett/modules/input.nix
View file

@ -1,18 +1,10 @@
{ ... }:
{
{...}: {
# key remapping
jade.input.remapping =
let
jade.input.remapping = let
default = {
swapKeys = [
[
"KEY_Y"
"KEY_Z"
]
[
"KEY_LEFTALT"
"KEY_LEFTMETA"
]
["KEY_Y" "KEY_Z"]
["KEY_LEFTALT" "KEY_LEFTMETA"]
];
dual_role = [
{
@ -22,8 +14,7 @@
}
];
};
in
{
in {
enable = true;
devices."AT Translated Set 2 keyboard" = default;
devices."Razer Razer Huntsman" = default;

3
hosts/monosodium-glutamate-g/configuration.nix
View file

@ -5,8 +5,7 @@
pkgs,
pkgs-stable,
...
}:
{
}: {
imports = [
./hardware-configuration.nix
../../common.nix

20
hosts/monosodium-glutamate-g/hardware-configuration.nix
View file

@ -7,20 +7,12 @@
pkgs,
modulesPath,
...
}:
{
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"uas"
"usbhid"
"sd_mod"
];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "uas" "usbhid" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
@ -31,16 +23,12 @@
options = ["subvol=@"];
};
boot.initrd.luks.devices."luks-919f9b8b-2804-447a-97e0-f7f515d0be56".device =
"/dev/disk/by-uuid/919f9b8b-2804-447a-97e0-f7f515d0be56";
boot.initrd.luks.devices."luks-919f9b8b-2804-447a-97e0-f7f515d0be56".device = "/dev/disk/by-uuid/919f9b8b-2804-447a-97e0-f7f515d0be56";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/3FAD-A6B4";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
options = ["fmask=0077" "dmask=0077"];
};
fileSystems."/swap" = {

3
hosts/monosodium-glutamate-g/modules/default.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
imports = [
./graphics.nix
];

3
hosts/monosodium-glutamate-g/modules/graphics.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
environment.systemPackages = [
pkgs.nvtopPackages.amd
pkgs.radeontop

3
modules/default.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
imports = [
./shell
./desktop

7
modules/desktop-legacy/default.nix
View file

@ -4,8 +4,7 @@
pkgs,
...
}:
with lib;
{
with lib; {
imports = [
./gaming.nix
./syncthing.nix
@ -29,9 +28,7 @@ with lib;
notifications.test = true;
};
home-manager.users.jade =
{ pkgs, ... }:
{
home-manager.users.jade = {pkgs, ...}: {
programs.ssh = {
controlMaster = "yes";
};

10
modules/desktop-legacy/gaming.nix
View file

@ -2,20 +2,16 @@
config,
lib,
...
}:
let
}: let
cfg = config.jade.desktop.gaming;
in
with lib;
{
with lib; {
options.jade.desktop.gaming = {
enable = mkEnableOption "Enable gaming stuff";
};
config = mkIf cfg.enable {
programs.steam.enable = true;
home-manager.users.jade =
{ pkgs, ... }:
{
home-manager.users.jade = {pkgs, ...}: {
home.packages = with pkgs; [
lutris
prismlauncher

10
modules/desktop-legacy/kdeconnect.nix
View file

@ -3,20 +3,16 @@
lib,
pkgs,
...
}:
let
}: let
cfg = config.jade.desktop.kdeconnect;
in
with lib;
{
with lib; {
options.jade.desktop.kdeconnect = {
enable = mkEnableOption "Enable KDE connect";
};
config = mkIf cfg.enable {
programs.kdeconnect.enable = true;
home-manager.users.jade =
{ pkgs, ... }:
{
home-manager.users.jade = {pkgs, ...}: {
services.kdeconnect = {
enable = true;
indicator = true;

12
modules/desktop-legacy/social.nix
View file

@ -3,23 +3,19 @@
lib,
pkgs,
...
}:
let
}: let
cfg = config.jade.desktop.social;
in
with lib;
{
with lib; {
options.jade.desktop.social = {
enable = mkEnableOption "Enable social apps";
};
config = mkIf cfg.enable {
home-manager.users.jade =
{
home-manager.users.jade = {
pkgs,
pkgs-stable,
...
}:
{
}: {
programs.nixcord = {
enable = true;
vesktop = {

6
modules/desktop-legacy/syncthing.nix
View file

@ -3,12 +3,10 @@
lib,
pkgs,
...
}:
let
}: let
cfg = config.jade.desktop.syncthing;
in
with lib;
{
with lib; {
options.jade.desktop.syncthing = {
enable = mkEnableOption "Enable syncing via syncthing";
};

3
modules/desktop/audio.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs = {
noisetorch.enable = true;
};

3
modules/desktop/default.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
imports = [
./audio.nix
./home

6
modules/desktop/dm.nix
View file

@ -3,12 +3,10 @@
config,
lib,
...
}:
let
}: let
cfg = config.jade.desktop.dm;
in
with lib;
{
with lib; {
options.jade.desktop.dm.autoLogin = {
enable = mkEnableOption "Enable Autologin";
delay = mkOption {

12
modules/desktop/home/browser.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
home.file = {
".tridactylrc" = {
text = ''
@ -17,9 +16,7 @@
};
policies = {
DefaultDownloadDirectory = "\${home}/Downloads";
Extensions.Install =
builtins.map (name: "https://addons.mozilla.org/firefox/downloads/latest/${name}")
[
Extensions.Install = builtins.map (name: "https://addons.mozilla.org/firefox/downloads/latest/${name}") [
"ublock-origin"
"tridactyl-vim"
"privacy-badger17"
@ -167,10 +164,7 @@
template = "https://docs.rs/{searchTerms}";
}
];
definedAliases = [
"doc"
"docd"
];
definedAliases = ["doc" "docd"];
};
"rust std docs" = {
urls = [

7
modules/desktop/home/default.nix
View file

@ -1,9 +1,6 @@
{ ... }:
{
{...}: {
programs.niri.enable = true;
home-manager.users.jade =
{ pkgs, ... }:
{
home-manager.users.jade = {pkgs, ...}: {
imports = [
./notifications.nix
./terminal.nix

3
modules/desktop/home/eww/default.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{ ... }: {
programs.eww = {
enable = true;
configDir = ./configDir;

6
modules/desktop/home/layaway.nix
View file

@ -2,8 +2,7 @@
pkgs,
lib,
...
}:
let
}: let
# stolen: https://github.com/MultisampledNight/core/blob/678f176cb24f5dc4b5dc629cfd3e643487be01bb/system/packages/layaway/default.nix#L7-L25
layaway = pkgs.rustPlatform.buildRustPackage rec {
pname = "layaway";
@ -25,7 +24,6 @@ let
maintainers = [maintainers.multisn8];
};
};
in
{
in {
home.packages = [layaway];
}

75
modules/desktop/home/niri/binds.nix
View file

@ -1,52 +1,11 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.niri.settings.binds = {
# spawn terminal
"Mod+Return".action.spawn = "kitty";
"Mod+Return".repeat = false;
"Mod+D".action.spawn = [
"wofi"
"-S"
"drun"
"--allow-images"
];
"Mod+D".action.spawn = ["wofi" "-S" "drun" "--allow-images"];
"Mod+D".repeat = false;
"Mod+I".action.spawn = [
"${pkgs.rofimoji}/bin/rofimoji"
"--selector"
"wofi"
"-f"
"alchemical_symbols"
"anatolian_hieroglyphs"
"emojis"
"braille_patterns"
"box_drawing"
"chess_symbols"
"emoticons"
"geometric_shapes"
"gothic"
"greek_extended"
"math"
"mathematical_alphanumeric_symbols"
"mathematical_operators"
"miscellaneous_symbols"
"miscellaneous_mathematical_symbols-a"
"miscellaneous_mathematical_symbols-b"
"miscellaneous_symbols_and_arrows"
"miscellaneous_symbols_and_pictographs"
"miscellaneous_technical"
"modi"
"modifier_tone_letters"
"musical_symbols"
"nerd_font"
"number_forms"
"shorthand_format_controls"
"specials"
"variation_selectors"
"vertical_forms"
"-a"
"copy"
];
"Mod+I".action.spawn = ["${pkgs.rofimoji}/bin/rofimoji" "--selector" "wofi" "-f" "alchemical_symbols" "anatolian_hieroglyphs" "emojis" "braille_patterns" "box_drawing" "chess_symbols" "emoticons" "geometric_shapes" "gothic" "greek_extended" "math" "mathematical_alphanumeric_symbols" "mathematical_operators" "miscellaneous_symbols" "miscellaneous_mathematical_symbols-a" "miscellaneous_mathematical_symbols-b" "miscellaneous_symbols_and_arrows" "miscellaneous_symbols_and_pictographs" "miscellaneous_technical" "modi" "modifier_tone_letters" "musical_symbols" "nerd_font" "number_forms" "shorthand_format_controls" "specials" "variation_selectors" "vertical_forms" "-a" "copy"];
"Mod+Shift+E".action.quit = [];
"Mod+Shift+Q".action.close-window = [];
@ -119,30 +78,10 @@
"Mod+W".action.toggle-column-tabbed-display = [];
# media keys
"XF86AudioRaiseVolume".action.spawn = [
"wpctl"
"set-volume"
"@DEFAULT_AUDIO_SINK@"
"0.1+"
];
"XF86AudioLowerVolume".action.spawn = [
"wpctl"
"set-volume"
"@DEFAULT_AUDIO_SINK@"
"0.1-"
];
"XF86AudioMute".action.spawn = [
"wpctl"
"set-mute"
"@DEFAULT_AUDIO_SINK@"
"toggle"
];
"XF86AudioMicMute".action.spawn = [
"wpctl"
"set-mute"
"@DEFAULT_AUDIO_SOURCE@"
"toggle"
];
"XF86AudioRaiseVolume".action.spawn = ["wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"];
"XF86AudioLowerVolume".action.spawn = ["wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"];
"XF86AudioMute".action.spawn = ["wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"];
"XF86AudioMicMute" .action.spawn = ["wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"];
"XF86AudioRaiseVolume".allow-when-locked = true;
"XF86AudioLowerVolume".allow-when-locked = true;
"XF86AudioMute".allow-when-locked = true;

12
modules/desktop/home/niri/default.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
imports = [
./xwayland-sat.nix
./screenshot.nix
@ -15,14 +14,7 @@
};
spawn-at-startup = [
{
command = [
"eww"
"open-many"
"topBar"
"bottomBar"
];
}
{command = ["eww" "open-many" "topBar" "bottomBar"];}
{
command = [
"${pkgs.swaybg}/bin/swaybg"

3
modules/desktop/home/niri/input.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
programs.niri.settings.input = {
keyboard = {
xkb = {

7
modules/desktop/home/niri/privacy.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
programs.niri.settings = {
layer-rules = [
{
@ -16,9 +15,7 @@
{title = "^.*(Discord|Beispiel Screenshare block Bug|Bitwarden|Träwelling).*$";}
];
excludes = [
{
title = "^.*((Schrottkatze|Statistics|Leaderboard) - Träwelling|chaos.social|Nekoverse|catgirl.cloud).*$";
}
{title = "^.*((Schrottkatze|Statistics|Leaderboard) - Träwelling|chaos.social|Nekoverse|catgirl.cloud).*$";}
{is-floating = true;}
];
block-out-from = "screen-capture";

10
modules/desktop/home/niri/quirks.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
home.packages = [pkgs.gamescope];
programs.niri.settings = {
window-rules = [
@ -29,7 +28,6 @@
shadow.enable = false;
border.enable = false;
baba-is-float = false;
open-focused = false;
}
{
matches = [
@ -49,11 +47,7 @@
is-floating = true;
}
];
geometry-corner-radius =
let
val = 5.;
in
{
geometry-corner-radius = let val = 5.; in {
bottom-left = val;
bottom-right = val;
top-left = val;

3
modules/desktop/home/niri/screenshot.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.niri.settings = {
screenshot-path = "~/Pictures/screenshots/%Y-%m-%dT%H:%M:%S.png";
binds = {

18
modules/desktop/home/niri/style.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
programs.niri.settings = {
prefer-no-csd = true;
@ -47,11 +46,9 @@
window-rules = [
{
matches = [
{
matches = [{
is-floating = true;
}
];
}];
baba-is-float = true;
shadow = {
offset.y = 0;
@ -63,18 +60,13 @@
};
}
{
geometry-corner-radius =
let
val = 1.;
in
{
geometry-corner-radius = let val = 1.; in {
bottom-left = val;
bottom-right = val;
top-left = val;
top-right = val;
};
clip-to-geometry = true;
}
];
}];
};
}

3
modules/desktop/home/niri/xwayland-sat.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.niri.settings = {
spawn-at-startup = [
{command = ["${pkgs.xwayland-satellite}/bin/xwayland-satellite"];}

3
modules/desktop/home/notifications.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
home.packages = [
pkgs.libnotify
];

3
modules/desktop/home/swayidle.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
# unsure whether i still need swayidle, will keep it in and might remove after further testing
services.swayidle = {

3
modules/desktop/home/terminal.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
programs.kitty = {
enable = true;
font.size = 12;

3
modules/desktop/locale.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
time.timeZone = "Europe/Berlin";
i18n.extraLocaleSettings = {
LC_ADDRESS = "de_DE.UTF-8";

3
modules/desktop/printing.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
services.printing = {
enable = true;
drivers = with pkgs; [

7
modules/desktop/themeing.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
stylix = {
enable = true;
polarity = "dark";
@ -26,9 +25,7 @@
};
};
};
home-manager.users.jade =
{ pkgs, ... }:
{
home-manager.users.jade = {pkgs, ...}: {
stylix.targets = {
firefox = {
profileNames = ["jade"];

3
modules/desktop/tlp.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
services.tlp = {
enable = true;
settings = {

3
modules/hardware/default.nix
View file

@ -3,8 +3,7 @@
lib,
pkgs,
...
}:
{
}: {
imports = [
./spacenav.nix
./wacom.nix

6
modules/hardware/hardware_key.nix
View file

@ -3,12 +3,10 @@
config,
lib,
...
}:
let
}: let
cfg = config.jade.hwKey;
in
with lib;
{
with lib; {
options.jade.hwKey = {
pamAuth.enable = mkEnableOption "Enable PAM authentication with hardware keys";
};

3
modules/hardware/spacenav.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
spacenavd
libspnav

7
modules/hardware/wacom.nix
View file

@ -1,9 +1,6 @@
{ ... }:
{
{...}: {
services.xserver.wacom.enable = true;
home-manager.users.jade =
{ pkgs, ... }:
{
home-manager.users.jade = {pkgs, ...}: {
home.packages = [
# TODO: figure out if the previous enabled option depends on these anyway
pkgs.libwacom

3
modules/input/default.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
imports = [
./evremap.nix
];

67
modules/input/evremap.nix
View file

@ -3,8 +3,7 @@
config,
lib,
...
}:
let
}: let
cfg = config.jade.input.remapping;
evremap = pkgs.rustPlatform.buildRustPackage {
pname = "evremap";
@ -22,15 +21,11 @@ let
};
toml = pkgs.formats.toml {};
in
with lib;
{
with lib; {
options.jade.input.remapping = {
enable = mkEnableOption "Enable evremap";
devices = mkOption {
type = types.attrsOf (
types.submodule (
{ name, ... }:
{
type = types.attrsOf (types.submodule ({name, ...}: {
options = {
device_name = mkOption {
type = types.str;
@ -38,15 +33,10 @@ with lib;
default = name;
};
remap = mkOption {
type = types.listOf (
types.submodule (
{ ... }:
{
type = types.listOf (types.submodule ({...}: {
options.input = mkOption {type = types.listOf types.str;};
options.output = mkOption {type = types.listOf types.str;};
}
)
);
}));
default = [];
};
swapKeys = mkOption {
@ -58,42 +48,31 @@ with lib;
default = [];
};
dual_role = mkOption {
type = types.listOf (
types.submodule (
{ ... }:
{
type = types.listOf (types.submodule ({...}: {
options.input = mkOption {type = types.str;};
options.hold = mkOption {type = types.listOf types.str;};
options.tap = mkOption {type = types.listOf types.str;};
}
)
);
}));
default = [];
};
};
}
)
);
}));
};
};
config = mkIf cfg.enable (
with builtins;
let
devs = map (
{
with builtins; let
devs = map ({
device_name,
remap,
swapKeys,
dual_role,
}:
{
}: {
inherit device_name dual_role;
# expand swapKeys to normal remaps
remap = concatLists [
remap
(lib.lists.flatten (
map (keys: [
(lib.lists.flatten (map (keys: [
{
input = [(head keys)];
output = [(lib.lists.last keys)];
@ -102,31 +81,25 @@ with lib;
input = [(lib.lists.last keys)];
output = [(head keys)];
}
]) swapKeys
))
])
swapKeys))
];
}
) (attrValues cfg.devices);
in
{
}) (attrValues cfg.devices);
in {
# generate numbered systemd services for each device to be remapped
# https://github.com/wez/evremap/issues/17
systemd.services = listToAttrs (
genList (i: {
systemd.services = listToAttrs (genList (i: {
name = "evremap${toString i}";
value =
let
value = let
cfgFile = toml.generate "remaps-${toString i}.toml" (elemAt devs i);
in
{
in {
wantedBy = ["multi-user.target"];
serviceConfig.ExecStart = "-${evremap}/bin/evremap remap ${cfgFile}";
unitConfig = {
Restart = "on-failure";
};
};
}) (length devs)
);
}) (length devs));
environment.systemPackages = [evremap];
}
);

12
modules/media/default.nix
View file

@ -4,21 +4,17 @@
config,
lib,
...
}:
let
}: let
cfg = config.jade.desktop.media;
in
with lib;
{
with lib; {
imports = [
./obs.nix
./fonts.nix
];
options.jade.desktop.media.videoEditing = mkEnableOption "Enable Video editing software";
config = {
home-manager.users.jade =
{ pkgs, ... }:
{
home-manager.users.jade = {pkgs, ...}: {
imports = [./typst.nix];
home.packages = with pkgs; [
# creative software basics
@ -38,7 +34,7 @@ with lib;
imagemagick
ffmpeg_7-full
libreoffice
onlyoffice-bin_latest
# viewers
pkgs-stable.font-manager

7
modules/media/fonts.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
nixpkgs.config.packageOverrides = pkgs: {
google-fonts = pkgs.google-fonts.overrideAttrs (oldAttrs: {
src = pkgs.fetchFromGitHub {
@ -35,9 +34,7 @@
fontDir.enable = true;
};
home-manager.users.jade =
{ ... }:
{
home-manager.users.jade = {...}: {
fonts.fontconfig = {
enable = true;
defaultFonts = {

6
modules/media/obs.nix
View file

@ -3,12 +3,10 @@
lib,
pkgs,
...
}:
let
}: let
cfg = config.jade.desktop.media.obs;
in
with lib;
{
with lib; {
options.jade.desktop.media.obs = mkEnableOption "Enable OBS";
config = mkIf cfg {

6
modules/media/typst.nix
View file

@ -2,8 +2,7 @@
pkgs,
typst-within,
...
}:
let
}: let
packages = {
typst-configs = pkgs.fetchFromGitea {
domain = "forge.katzen.cafe";
@ -20,8 +19,7 @@ let
};
};
mkTypstPath = name: ".local/share/typst/packages/local/${name}/0.1.0";
in
{
in {
home.file = {
typst-configs = {
target = mkTypstPath "typst-configs";

7
modules/net/default.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
imports = [
./firewall.nix
./hosts.nix
@ -11,9 +10,7 @@
systemd.services."NetworkManager-wait-online".enable = false;
services.mullvad-vpn.enable = true;
home-manager.users.jade =
{ pkgs, ... }:
{
home-manager.users.jade = {pkgs, ...}: {
home.packages = with pkgs; [
networkmanagerapplet
mullvad-vpn

20
modules/net/dispatchers/default.nix
View file

@ -1,13 +1,10 @@
{ pkgs, ... }:
let
addNuShebang =
path:
{pkgs, ...}: let
addNuShebang = path:
builtins.concatStringsSep "\n\n" [
"#!${pkgs.nushell}/bin/nu"
(builtins.readFile path)
];
in
{
in {
networking.networkmanager.dispatcherScripts = [
{
type = "basic";
@ -15,15 +12,16 @@ in
}
];
environment.etc =
with builtins;
(listToAttrs (
environment.etc = with builtins; (
listToAttrs (
map (v: {
name = "networkhooks/${v}";
value = {
text = addNuShebang ./hooks/${v};
mode = "0755";
};
}) (attrNames (readDir ./hooks))
));
})
(attrNames (readDir ./hooks))
)
);
}

12
modules/net/eduroam.nix
View file

@ -1,19 +1,13 @@
# Thanks @ kloenk (@kloenk@catcatnya.com) for making this for me at MRMCD 2024 :33
{ pkgs-stable, ... }:
let
{pkgs-stable, ...}: let
caDir = "/var/lib/easyroam";
uuid = "821ad781-76a3-447f-a2e8-c7f18a1df3bc";
in
{
in {
systemd.services.easyroam = {
requires = ["NetworkManager.service"];
after = ["NetworkManager.service"];
requiredBy = ["network-online.target"];
path = with pkgs-stable; [
networkmanager
openssl
gnused
];
path = with pkgs-stable; [networkmanager openssl gnused];
script = ''
set -x
openssl pkcs12 -password pass: -in ${caDir}/my_easyroam_cert.p12 -legacy -nokeys | openssl x509 > ${caDir}/easyroam_client_cert.pem

3
modules/net/firewall.nix
View file

@ -3,8 +3,7 @@
lib,
pkgs,
...
}:
{
}: {
config = {
networking = {
firewall = {

3
modules/net/hosts.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
networking.hosts = {
"127.0.0.1" = [
"www.tiktok.com"

8
modules/nix.nix
View file

@ -2,8 +2,7 @@
rs-programs,
niri,
...
}:
{
}: {
nix = {
extraOptions = ''
experimental-features = nix-command flakes
@ -25,9 +24,6 @@
"nodejs-16.20.0"
];
};
overlays = [
rs-programs
niri.overlays.niri
];
overlays = [rs-programs niri.overlays.niri];
};
}

7
modules/shell/btop.nix
View file

@ -1,8 +1,5 @@
{ ... }:
{
home-manager.users.jade =
{ pkgs, ... }:
{
{...}: {
home-manager.users.jade = {pkgs, ...}: {
programs.btop = {
enable = true;
settings = {

7
modules/shell/default.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
imports = [
./helix.nix
./nu.nix
@ -12,9 +11,7 @@
];
programs.mosh.enable = true;
programs.bat.enable = true;
home-manager.users.jade =
{ ... }:
{
home-manager.users.jade = {...}: {
programs.carapace.enable = true;
programs.direnv.enable = true;
};

9
modules/shell/git.nix
View file

@ -3,15 +3,12 @@
lib,
pkgs,
...
}:
{
home-manager.users.jade =
{
}: {
home-manager.users.jade = {
pkgs,
config,
...
}:
{
}: {
programs.git = {
enable = true;
userName = "Schrottkatze";

26
modules/shell/helix.nix
View file

@ -1,12 +1,9 @@
{ config, ... }:
{
home-manager.users.jade =
{
{config, ...}: {
home-manager.users.jade = {
pkgs,
pkgs-stable,
...
}:
{
}: {
home = {
sessionVariables.EDITOR = "hx";
packages = [
@ -47,10 +44,7 @@
display-inlay-hints = true;
};
popup-border = "popup";
shell = [
"nu"
"-c"
];
shell = ["nu" "-c"];
statusline.left = [
"mode"
"spinner"
@ -142,10 +136,7 @@
check.command = "check";
completion.snippets.custom = {
"pub fn" = {
prefix = [
"pfn"
"pubfn"
];
prefix = ["pfn" "pubfn"];
postfix = ["pfn"];
body = [
"pub fn $\{receiver\}() {"
@ -204,7 +195,7 @@
{
name = "nix";
formatter = {
command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
command = "${pkgs.alejandra}/bin/alejandra";
args = ["--quiet"];
};
auto-format = true;
@ -212,10 +203,7 @@
{
name = "html";
roots = [".git"];
language-servers = [
"vscode-html-language-server"
"emmet-language-server"
];
language-servers = ["vscode-html-language-server" "emmet-language-server"];
auto-format = false;
}
];

17
modules/shell/mprocs.nix
View file

@ -1,12 +1,9 @@
{ ... }:
{
home-manager.users.jade =
{
{...}: {
home-manager.users.jade = {
pkgs,
lib,
...
}:
{
}: {
home = {
packages = [pkgs.mprocs];
};
@ -14,16 +11,12 @@
text = builtins.toJSON {
proc_list_width = 15;
keymap_procs = {
"<l>" = {
c = "toggle-focus";
};
"<l>" = {c = "toggle-focus";};
};
keymap_term = {
"<C-a>" = null;
# Ctrl-m so it doesnt overlap with zellij or helix
"<C-M>" = {
c = "toggle-focus";
};
"<C-M>" = {c = "toggle-focus";};
};
};
};

10
modules/shell/nu.nix
View file

@ -1,8 +1,5 @@
{ config, ... }:
{
home-manager.users.jade =
{ pkgs, ... }:
{
{config, ...}: {
home-manager.users.jade = {pkgs, ...}: {
# Needed for nu_scripts background_task
services.pueue = {
enable = true;
@ -37,7 +34,8 @@
source ${./nu/aliases.nu};
nu ${./nu/shell-startup.nu};
'';
extraEnv = '''';
extraEnv = ''
'';
};
# programs.starship.enableNushellIntegration = true;
programs.carapace.enableNushellIntegration = true;

7
modules/shell/starship.nix
View file

@ -1,8 +1,5 @@
{ ... }:
{
home-manager.users.jade =
{ pkgs, ... }:
{
{...}: {
home-manager.users.jade = {pkgs, ...}: {
programs.starship = {
enable = true;
enableNushellIntegration = false;

3
modules/shell/sudo.nix
View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
nixpkgs.config.packageOverrides = pkgs: {
sudo = pkgs.sudo.override {withInsults = true;};
};

17
modules/shell/tty.nix
View file

@ -1,10 +1,13 @@
{ config, ... }:
let
generateOptions =
with builtins;
(opts: toString (attrValues (mapAttrs (name: value: "--${name} ${toString value}") opts)));
in
{
{config, ...}: let
generateOptions = with builtins; (
opts:
toString (
attrValues (
mapAttrs (name: value: "--${name} ${toString value}") opts
)
)
);
in {
# TODO: global colorscheme vars for everything
console.colors = [
"282828"