diff --git a/home/Aloria.nix b/home/Aloria.nix index f9c5416..02e2a32 100644 --- a/home/Aloria.nix +++ b/home/Aloria.nix @@ -15,7 +15,10 @@ }; in { imports = [ - (import ./utils/desktop.nix {inherit inputs config pkgs; scale = 1.2;}) + (import ./utils/desktop.nix { + inherit inputs config pkgs; + scale = 1.2; + }) (import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;}) ]; @@ -42,4 +45,7 @@ in { programs.alacritty.settings.font.size = 13; programs.kitty.font.size = 13; + systemd.user.services.vicinae.Service.Environment = [ + "QT_SCALE_FACTOR=1.5" + ]; } diff --git a/home/Arendia.nix b/home/Arendia.nix index b3965d4..06c7c17 100644 --- a/home/Arendia.nix +++ b/home/Arendia.nix @@ -15,7 +15,10 @@ }; in { imports = [ - (import ./utils/desktop.nix {inherit inputs config pkgs;}) + (import ./utils/desktop.nix { + inherit inputs config pkgs; + scale = 1.0; + }) (import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;}) ]; diff --git a/home/nvim/files/lua/plugins/blink.lua b/home/nvim/files/lua/plugins/blink.lua index e7b6a11..4c1e327 100644 --- a/home/nvim/files/lua/plugins/blink.lua +++ b/home/nvim/files/lua/plugins/blink.lua @@ -3,14 +3,10 @@ local function is_dap_buffer() end return { - { - 'saghen/blink.compat', - branch = 'v1', - lazy = true, - opts = {}, - }, { 'saghen/blink.cmp', + branch = 'v1', + version = "1.*", dependencies = { 'rafamadriz/friendly-snippets', 'honza/vim-snippets', @@ -59,7 +55,6 @@ return { end, providers = { dadbod = { name = "Dadbod", module = "vim_dadbod_completion.blink" }, - dap = { name = "dap", module = "blink.compat.source" }, avante = { module = 'blink-cmp-avante', name = 'Avante', diff --git a/home/vicinae/default.nix b/home/vicinae/default.nix index a7f5387..28f9067 100644 --- a/home/vicinae/default.nix +++ b/home/vicinae/default.nix @@ -6,7 +6,4 @@ autoStart = true; }; }; - systemd.user.services.vicinae.Service.Environment = [ - "QT_SCALE_FACTOR=1.5" - ]; } diff --git a/hosts/Arendia/default.nix b/hosts/Arendia/default.nix index c2000f2..ef793f3 100644 --- a/hosts/Arendia/default.nix +++ b/hosts/Arendia/default.nix @@ -11,7 +11,6 @@ in { imports = [ (import ../Common/default.nix {inherit inputs pkgs config;}) (import ../Common/desktop.nix {inherit inputs pkgs config;}) - (import ../Common/nfs.nix {inherit pkgs serverIP;}) (import ../Common/zfs.nix {inherit inputs pkgs config;}) ]; diff --git a/hosts/Arendia/hardware-configuration.nix b/hosts/Arendia/hardware-configuration.nix index dfde561..43183e1 100644 --- a/hosts/Arendia/hardware-configuration.nix +++ b/hosts/Arendia/hardware-configuration.nix @@ -12,6 +12,7 @@ boot.initrd.kernelModules = []; boot.kernelModules = ["kvm-intel"]; boot.extraModulePackages = []; + boot.zfs.forceImportRoot = false; fileSystems."/" = { device = "rpool/root";