From 14c1cafcd8aa52505af11a3bbb208f1bfd7619ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 11 Nov 2024 13:22:46 +0100 Subject: [PATCH 1/6] feat: add prismlauncher --- hosts/nixos-desktop/default.nix | 1 + modules/profiles/impermanence.nix | 1 + modules/programs/prismlauncher.nix | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 100644 modules/programs/prismlauncher.nix diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index b3d88b7..6804d69 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; }; diff --git a/modules/profiles/impermanence.nix b/modules/profiles/impermanence.nix index 93568f7..992519f 100644 --- a/modules/profiles/impermanence.nix +++ b/modules/profiles/impermanence.nix @@ -56,6 +56,7 @@ in ".local/share/JetBrains" ".local/share/direnv" ".local/share/nvim" + ".local/share/PrismLauncher/" ".local/share/zoxide" ".local/state/nvim" ".mozilla" 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 ]; + }; +} From c64a45ac7bdf9186e3f87a341a5f9270fdf84852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 11 Nov 2024 13:23:21 +0100 Subject: [PATCH 2/6] feat(nvim): add obsidian plugin --- modules/programs/nvim/new_plugins/other.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/modules/programs/nvim/new_plugins/other.nix b/modules/programs/nvim/new_plugins/other.nix index e423f4c..7da6805 100644 --- a/modules/programs/nvim/new_plugins/other.nix +++ b/modules/programs/nvim/new_plugins/other.nix @@ -58,6 +58,25 @@ 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 + ''; + }; + } ]; }; } From 8d4ec90a2eb1a8c9911605262310c6dc9ec7f55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 11 Nov 2024 13:24:00 +0100 Subject: [PATCH 3/6] feat(desktop): add kanshi settings --- hosts/nixos-desktop/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index 6804d69..311468c 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -31,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 = { From 54b73fbc64ff528e685dc6437f635894d4e56260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 13 Nov 2024 11:41:42 +0100 Subject: [PATCH 4/6] feat(impermanence): add steam --- modules/profiles/impermanence.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/profiles/impermanence.nix b/modules/profiles/impermanence.nix index 992519f..a3b9fa2 100644 --- a/modules/profiles/impermanence.nix +++ b/modules/profiles/impermanence.nix @@ -45,18 +45,19 @@ 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/PrismLauncher/" ".local/share/zoxide" ".local/state/nvim" ".mozilla" From a9ffa8d649cee1c5e1dfc01d2aa72ade50660044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 13 Nov 2024 11:42:01 +0100 Subject: [PATCH 5/6] feat(nvim): add mini align --- modules/programs/nvim/new_plugins/other.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/programs/nvim/new_plugins/other.nix b/modules/programs/nvim/new_plugins/other.nix index 7da6805..3107253 100644 --- a/modules/programs/nvim/new_plugins/other.nix +++ b/modules/programs/nvim/new_plugins/other.nix @@ -77,6 +77,15 @@ in ''; }; } + { + plugins.mini = { + enable = true; + modules = { + align = { }; + }; + }; + performance.combinePlugins.standalonePlugins = [ "mini.nvim" ]; + } ]; }; } From 57dabe199f13647f618520105eb92d0a2faf5bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Wed, 13 Nov 2024 11:42:27 +0100 Subject: [PATCH 6/6] fix(kitty): set terminal package --- modules/programs/kitty.nix | 1 + 1 file changed, 1 insertion(+) 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 = {