diff --git a/nixos/hosts/thalassa/null/configuration.nix b/nixos/hosts/thalassa/null/configuration.nix index 2f0d446..9faf63f 100644 --- a/nixos/hosts/thalassa/null/configuration.nix +++ b/nixos/hosts/thalassa/null/configuration.nix @@ -75,11 +75,14 @@ in # Bootloader. # boot.initrd.systemd.enable = true; # Experimental - boot.loader.systemd-boot.enable = true; - boot.loader.systemd-boot.configurationLimit = 6; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.efi.efiSysMountPoint = "/boot/efi"; - boot.kernelPackages = pkgs.linuxPackages_latest; + boot = { + kernelPackages = pkgs.linuxPackages_latest; + loader.systemd-boot.editor = false; + loader.systemd-boot.enable = true; + loader.systemd-boot.configurationLimit = 6; + loader.efi.canTouchEfiVariables = true; + loader.efi.efiSysMountPoint = "/boot/efi"; + }; services.gnome.gnome-keyring.enable = true; @@ -115,11 +118,9 @@ in "en_DK.UTF-8/UTF-8" ]; - xdg = { - portal = { + xdg.portal = { enable = true; wlr.enable = true; - }; }; services.dbus.enable = true; @@ -143,12 +144,10 @@ in videoDrivers = [ "nvidia" ]; }; - hardware.nvidia = { - prime = { - offload.enable = true; - intelBusId = "PCI:0:2:0"; - nvidiaBusId = "PCI:1:0:0"; - }; + hardware.nvidia.prime = { + offload.enable = true; + intelBusId = "PCI:0:2:0"; + nvidiaBusId = "PCI:1:0:0"; }; hardware.opengl = { @@ -224,12 +223,17 @@ in programs.ssh.startAgent = true; + # don't shutdown when power button is short-pressed services.logind.extraConfig = '' - # don’t shutdown when power button is short-pressed HandlePowerKey=suspend ''; - services.udev.packages = [ pkgs.qmk-udev-rules ]; + services.udev.packages = with pkgs; [ + android-udev-rules + logitech-udev-rules + qmk-udev-rules + wooting-udev-rules + ]; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index 5798570..a0397c0 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -1,5 +1,10 @@ -{ config, pkgs, lib, inputs, ... }: -{ +{ config, pkgs, lib, inputs, texlive, ... }: +let + tex = (pkgs.texlive.combine { + inherit (pkgs.texlive) scheme-full; + dnd-5e-latex-template = { pkgs = [ pkgs.v.dnd-5e-latex-template ]; }; + }); +in { programs.home-manager.enable = true; home.username = "victor"; home.homeDirectory = "/home/victor"; @@ -40,13 +45,13 @@ python3 retroarchFull ripgrep - rnix-lsp rsync rustup saleae-logic-2 solo2-cli steam-run - texlive.combined.scheme-full + tex + # texlive.combined.scheme-full thunderbird-wayland wf-recorder # Screenrecorder wl-clipboard # Clipboard manager @@ -55,36 +60,31 @@ xdg.mimeApps = { enable = true; - defaultApplications = - let - browser = [ "firefox.desktop" ]; - in - { - "image/*" = "org.gnome.eog.desktop"; - "text/html" = browser; - "x-scheme-handler/http" = browser; - "x-scheme-handler/https" = browser; - "x-scheme-handler/ftp" = browser; - "x-scheme-handler/about" = browser; - "x-scheme-handler/unknown" = browser; - "application/x-extension-htm" = browser; - "application/x-extension-html" = browser; - "application/x-extension-shtml" = browser; - "application/xhtml+xml" = browser; - "application/x-extension-xhtml" = browser; - "application/x-extension-xht" = browser; + defaultApplications = let browser = [ "firefox.desktop" ]; + in { + "image/*" = "org.gnome.eog.desktop"; + "text/html" = browser; + "x-scheme-handler/http" = browser; + "x-scheme-handler/https" = browser; + "x-scheme-handler/ftp" = browser; + "x-scheme-handler/about" = browser; + "x-scheme-handler/unknown" = browser; + "application/x-extension-htm" = browser; + "application/x-extension-html" = browser; + "application/x-extension-shtml" = browser; + "application/xhtml+xml" = browser; + "application/x-extension-xhtml" = browser; + "application/x-extension-xht" = browser; - "application/json" = browser; - "application/pdf" = browser; + "application/json" = browser; + "application/pdf" = browser; - "x-scheme-handler/vscode" = "code-url-handler.desktop"; - "x-scheme-handler/discord" = "webcord.desktop"; - }; + "x-scheme-handler/vscode" = "code-url-handler.desktop"; + "x-scheme-handler/discord" = "webcord.desktop"; + }; }; - programs.foot = { - enable = true; - }; + programs.foot = { enable = true; }; programs.nix-index.enable = true; @@ -119,25 +119,26 @@ enable = true; package = pkgs.firefox-devedition-bin; }; - + programs.vscode = { enable = true; package = pkgs.vscode; userSettings = { "ltex.language" = "en-GB"; "workbench.colorTheme" = "Catppuccin Frappé"; - "editor.fontFamily" = "'DejaVuSansMono Nerd Font', 'monospace', monospace"; + "editor.fontFamily" = + "'DejaVuSansMono Nerd Font', 'monospace', monospace"; "keyboard.dispatch" = "keyCode"; "rust-analyzer.server.path" = "${pkgs.rust-analyzer}/bin/rust-analyzer"; "terminal.integrated.defaultProfile.linux" = "zsh"; "nix.enableLanguageServer" = true; # Enable LSP. - "nix.serverPath" = "${pkgs.nil}/bin/nil"; # The path to the LSP server executable. - "[nix]" = { - "editor.defaultFormatter" = "jnoortheen.nix-ide"; - }; + "nix.serverPath" = + "${pkgs.nil}/bin/nil"; # The path to the LSP server executable. + "[nix]" = { "editor.defaultFormatter" = "brettm12345.nixfmt-vscode"; }; }; extensions = with pkgs.vscode-extensions; [ catppuccin.catppuccin-vsc + brettm12345.nixfmt-vscode codezombiech.gitignore editorconfig.editorconfig foxundermoon.shell-format @@ -156,31 +157,27 @@ programs.direnv = { enable = true; - nix-direnv = { - enable = true; - }; + nix-direnv = { enable = true; }; }; programs.zsh = { enable = true; - sessionVariables = { - DIRENV_LOG_FORMAT = ""; - }; + sessionVariables = { DIRENV_LOG_FORMAT = ""; }; }; - xdg.userDirs = let home = config.home.homeDirectory; in - { - enable = true; - createDirectories = true; - desktop = "${home}/.desktop"; - documents = "${home}/cloud/Documents"; - download = "${home}/dl"; - music = "${home}/cloud/Music"; - pictures = "${home}/cloud/Pictures"; - publicShare = "${home}/.publicShare"; - templates = "${home}/.templates"; - videos = "${home}/cloud/Videos"; - }; + xdg.userDirs = let home = config.home.homeDirectory; + in { + enable = true; + createDirectories = true; + desktop = "${home}/.desktop"; + documents = "${home}/cloud/Documents"; + download = "${home}/dl"; + music = "${home}/cloud/Music"; + pictures = "${home}/cloud/Pictures"; + publicShare = "${home}/.publicShare"; + templates = "${home}/.templates"; + videos = "${home}/cloud/Videos"; + }; services.syncthing.enable = true; } diff --git a/nixos/pkgs/catppuccin/cursors/default.nix b/nixos/pkgs/catppuccin/cursors/default.nix index fb301e3..9115558 100644 --- a/nixos/pkgs/catppuccin/cursors/default.nix +++ b/nixos/pkgs/catppuccin/cursors/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, xorg, inkscape }: +{ stdenvNoCC, lib, fetchFromGitHub, xorg, inkscape }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "catppuccin-cursors"; version = "0.2.0"; diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix index a8066a4..acc9d28 100644 --- a/nixos/pkgs/default.nix +++ b/nixos/pkgs/default.nix @@ -1,10 +1,4 @@ final: prev: { - # hedgedoc = prev.hedgedoc.overrideAttrs (old: { - # # see https://github.com/NixOS/nixpkgs/issues/176127#issuecomment-1146782555 - # preBuild = '' - # export HOME=$TMPDIR - # ''; - # }); catppuccin.cursors = prev.callPackage ./catppuccin/cursors { }; vmagent = prev.callPackage ./vmagent { }; @@ -19,6 +13,8 @@ final: prev: { withTFO = true; }; + dnd-5e-latex-template = prev.callPackage ./dnd-5e-latex-template { }; + gitea-agatheme = prev.callPackage ./gitea-agatheme { }; }; } diff --git a/nixos/pkgs/dnd-5e-latex-template/default.nix b/nixos/pkgs/dnd-5e-latex-template/default.nix new file mode 100644 index 0000000..de795c6 --- /dev/null +++ b/nixos/pkgs/dnd-5e-latex-template/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: stdenvNoCC.mkDerivation rec { + pname = "dnd-5e-latex-template"; + version = "0.8.0"; + tlType = "run"; + + src = fetchFromGitHub { + owner = "rpgtex"; + repo = "DND-5e-LaTeX-Template"; + rev = "d611f61d2d0f54e621641cffe87b49ca216ccf1a"; + sha256 = "sha256-jSYC0iduKGoUaYI1jrH0cakC45AMug9UodERqsvwVxw="; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + runHook preInstall + + path="$out/tex/latex/${pname}" + mkdir -p "$path" + cp -r $src/* $path + + runHook postInstall + ''; + + meta = { + description = "DnD 5e latex template"; + }; +} diff --git a/nixos/pkgs/gitea-agatheme/default.nix b/nixos/pkgs/gitea-agatheme/default.nix index e3ee02b..23bdcdc 100644 --- a/nixos/pkgs/gitea-agatheme/default.nix +++ b/nixos/pkgs/gitea-agatheme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { +{ lib, stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation { pname = "gitea-agatheme"; version = "1.1";