diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index b3d88b7..311468c 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -22,6 +22,7 @@ impermanence.enable = true; webis.enable = true; }; + programs.prismlauncher.enable = true; services.wallpaper.enable = true; }; @@ -30,6 +31,19 @@ stable.calibre # NOTE: breaks often in unstable ]; + home-manager.users.moritz.services.kanshi.settings = [ + { + profile.name = "default"; + profile.outputs = [ + { + adaptiveSync = true; + criteria = "*"; + scale = 1.2; + } + ]; + } + ]; + hardware = { keyboard.qmk.enable = true; nvidia = { diff --git a/modules/profiles/impermanence.nix b/modules/profiles/impermanence.nix index 93568f7..a3b9fa2 100644 --- a/modules/profiles/impermanence.nix +++ b/modules/profiles/impermanence.nix @@ -45,15 +45,17 @@ in ".cache/nvim/luac" ".cat_installer" # eduroam ".config/JetBrains" + ".config/Mullvad VPN/" ".config/Nextcloud" ".config/Signal/" - ".config/Mullvad VPN/" ".config/calibre" ".config/github-copilot" ".config/kdeconnect" ".config/keepassxc" ".java/.userPrefs/jetbrains/" ".local/share/JetBrains" + ".local/share/PrismLauncher/" + ".local/share/Steam/" ".local/share/direnv" ".local/share/nvim" ".local/share/zoxide" diff --git a/modules/programs/kitty.nix b/modules/programs/kitty.nix index 45983ac..02ff047 100644 --- a/modules/programs/kitty.nix +++ b/modules/programs/kitty.nix @@ -11,6 +11,7 @@ in options.my.programs.kitty.enable = mkEnableOption "kitty"; config = mkIf cfg.enable { + my.terminal.package = config.home-manager.users.moritz.programs.kitty.package; my.shell.aliases.ssh = "TERM=xterm-256color command ssh"; home-manager.users.moritz = { programs.kitty = { diff --git a/modules/programs/nvim/new_plugins/other.nix b/modules/programs/nvim/new_plugins/other.nix index e423f4c..3107253 100644 --- a/modules/programs/nvim/new_plugins/other.nix +++ b/modules/programs/nvim/new_plugins/other.nix @@ -58,6 +58,34 @@ in plugins.helpview.enable = true; performance.combinePlugins.standalonePlugins = [ "helpview.nvim" ]; } + { + plugins.obsidian.enable = true; + plugins.obsidian.settings = { + dir = "~/Documents/Nextcloud/Notes/zettelkasten/"; + note_id_func.__raw = '' + function(title) + if title ~= nil then + return title + else + suffix = "" + for _ = 1, 4 do + suffix = suffix .. string.char(math.random(65, 90)) + end + return tostring(os.date("%Y-%m-%d")) .. "-" .. suffix + end + end + ''; + }; + } + { + plugins.mini = { + enable = true; + modules = { + align = { }; + }; + }; + performance.combinePlugins.standalonePlugins = [ "mini.nvim" ]; + } ]; }; } diff --git a/modules/programs/prismlauncher.nix b/modules/programs/prismlauncher.nix new file mode 100644 index 0000000..54c01aa --- /dev/null +++ b/modules/programs/prismlauncher.nix @@ -0,0 +1,26 @@ +{ config +, lib +, pkgs +, ... +}: + +with lib; +let + cfg = config.my.programs.prismlauncher; + + prismlauncher = pkgs.runCommandNoCC "prismlauncher" + { + nativeBuildInputs = [ pkgs.makeWrapper ]; + } '' + makeWrapper ${lib.getExe pkgs.prismlauncher} $out/bin/prismlauncher \ + --set QT_STYLE_OVERRIDE "" \ + --set QT_QPA_PLATFORMTHEME "gtk3" + ''; +in +{ + options.my.programs.prismlauncher.enable = mkEnableOption "prismlauncher"; + + config = mkIf cfg.enable { + users.users.moritz.packages = [ prismlauncher ]; + }; +}