diff --git a/flake.nix b/flake.nix index 5486e20..a3b0a91 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ system = "x86_64-linux"; # helper function to create a machine mkHost = { modules, specialArgs ? { pkgsVersion = nixpkgs-unstable; } - , system ? "x86_64-linux", minimal ? false }: + , system ? "x86_64-linux", minimal ? false, stylix ? false }: nixpkgs-unstable.lib.nixosSystem { inherit system; modules = modules ++ [ @@ -52,22 +52,19 @@ additions modifications unstable-packages + nur.overlay ]; }) ] ++ (if !minimal then [ - ({ ... }: { - # stylix compains if image is not set... - stylix.autoEnable = true; - stylix.image = ./yuyukowallpaper1809.png; - }) home-manager-unstable.nixosModules.home-manager nixos-cosmic.nixosModules.default - stylix.nixosModules.stylix - #todo: check how to actually do this - ./modules/graphical/stylix.nix ./modules/graphical/cosmic.nix ] else - [ ]); + [ ]) ++ (if stylix then [ + stylix.nixosModules.stylix + ./modules/graphical/stylix.nix + ] else + [ ]); specialArgs = specialArgs // { inherit inputs outputs; }; }; in flake-utils.lib.eachDefaultSystem (system: { @@ -92,6 +89,7 @@ }; }; "kop-pc" = mkHost { + stylix = true; modules = [ ./users/kopatz ./systems/pc/configuration.nix ]; }; "nix-laptop" = mkHost { diff --git a/home-manager/nixvim/default.nix b/home-manager/nixvim/default.nix index bcafe80..f43b297 100644 --- a/home-manager/nixvim/default.nix +++ b/home-manager/nixvim/default.nix @@ -17,6 +17,7 @@ let ./git.nix ./lightline.nix ./lsp.nix + ./images.nix ./none-ls.nix ./nvim-tree.nix ./telescope.nix diff --git a/home-manager/nixvim/images.nix b/home-manager/nixvim/images.nix new file mode 100644 index 0000000..5c6ac51 --- /dev/null +++ b/home-manager/nixvim/images.nix @@ -0,0 +1,11 @@ +{pkgs, ...}: +{ + plugins = { + image.enable = true; + clipboard-image = { + # todo change based on graphical settings + clipboardPackage = pkgs.wl-clipboard; + enable = true; + }; + }; +} diff --git a/home-manager/nixvim/lsp.nix b/home-manager/nixvim/lsp.nix index fd7327f..0c51750 100644 --- a/home-manager/nixvim/lsp.nix +++ b/home-manager/nixvim/lsp.nix @@ -8,6 +8,7 @@ gopls.enable = true; nixd.enable = true; csharp-ls.enable = true; + typst-lsp.enable = true; }; keymaps.lspBuf = { gd = {