Fix window rules

hosts/kalle-pc/default.nix

@@ -116,16 +116,13 @@
       };
 
       windowRules = {
-        # Auto workspace
-        zen = [ "workspace 1 silent" ];
-        discord = [ "workspace name:HDMI-A-1" ];
-      };
-
-      windowRulesV2 = {
         # ULauncher
         "class:^(ulauncher)$" = [
           "dimaround"
         ];
+        # Auto workspace
+        "class:zen" = [ "workspace 1 silent" ];
+        "class:discord" = [ "workspace name:HDMI-A-1" ];
       };
 
     };

modules/hyprland.nix

@@ -84,11 +84,6 @@
           default = { };
         };
 
-        windowRulesV2 = mkOption {
-          type = types.attrsOf (types.listOf types.str);
-          default = { };
-        };
-
         binds = mkOption {
           type = types.attrsOf types.str;
           default = { };
@@ -279,13 +274,6 @@
                 x = ident: values: map (y ident) values;
               in
               lib.flatten (lib.mapAttrsToList x cfg.windowRules);
-
-            windowrulev2 =
-              let
-                y = ident: value: "${value},${ident}";
-                x = ident: values: map (y ident) values;
-              in
-              lib.flatten (lib.mapAttrsToList x cfg.windowRulesV2);
           };
         };
       };

modules/new_nvim/config/init.lua

@@ -1 +0,0 @@
-require("config.lazy")

modules/new_nvim/config/lua/config/lazy.lua

@@ -1,35 +0,0 @@
--- Bootstrap lazy.nvim
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
-    local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-    local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-    if vim.v.shell_error ~= 0 then
-        vim.api.nvim_echo({
-            { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-            { out,                            "WarningMsg" },
-            { "\nPress any key to exit..." },
-        }, true, {})
-        vim.fn.getchar()
-        os.exit(1)
-    end
-end
-vim.opt.rtp:prepend(lazypath)
-
--- Make sure to setup `mapleader` and `maplocalleader` before
--- loading lazy.nvim so that mappings are correct.
--- This is also a good place to setup other settings (vim.opt)
-vim.g.mapleader = " "
-vim.g.maplocalleader = "\\"
-
--- Setup lazy.nvim
-require("lazy").setup({
-    spec = {
-        -- import your plugins
-        { import = "plugins" },
-    },
-    -- Configure any other settings here. See the documentation for more details.
-    -- colorscheme that will be used when installing plugins.
-    install = { colorscheme = { "habamax" } },
-    -- automatically check for plugin updates
-    checker = { enabled = true },
-})

modules/new_nvim/config/lua/config/plugins/theming.lua

@@ -1,8 +0,0 @@
-return {
-    {
-        "catppuccin/nvim",
-        name = "catppuccin",
-        priority = 1000,
-        init = function() vim.cmd.colorscheme("catppuccin-mocha") end
-    },
-}

modules/new_nvim/default.nix

@@ -1,38 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  home-manager.users.kalle = {
-    programs.neovim = {
-      enable = true;
-
-      viAlias = true;
-      vimAlias = true;
-      vimdiffAlias = true;
-
-      extraPackages = with pkgs; [
-        nodejs_22 # Required for copilot-vim
-        ripgrep # Required for telescope
-        wl-clipboard # Required for clipboard sync
-
-        # Language servers
-        clang-tools
-        lua-language-server
-        nodePackages.typescript-language-server
-        nodePackages."@astrojs/language-server"
-        typescript
-        tailwindcss-language-server
-        gopls
-        vhdl-ls
-        nixd
-        nixfmt-rfc-style
-      ];
-    };
-
-    xdg.configFile.nvim = {
-      source = ./config;
-      recursive = true;
-    };
-  };
-}

modules/nvim/default.nix

@@ -22,7 +22,6 @@
       vimdiffAlias = true;
 
       extraPackages = with pkgs; [
-        nodejs_22 # Required for copilot-vim
         ripgrep # Required for telescope
         wl-clipboard # Required for clipboard sync
 
@@ -98,7 +97,6 @@
         cmp-git
         cmp-calc
         cmp_luasnip
-        copilot-cmp
         luasnip
         friendly-snippets
         {
@@ -122,16 +120,6 @@
           plugin = (nvim-treesitter.withAllGrammars);
           config = toLuaFile ./plugin/treesitter.lua;
         }
-
-        {
-          plugin = copilot-lua;
-          config = toLua ''
-            require("copilot").setup({
-              suggestion = { enabled = false },
-              panel = { enabled = false },
-            })
-          '';
-        }
       ];
 
       extraLuaConfig = ''

modules/nvim/plugin/cmp.lua

@@ -1,8 +1,6 @@
 local cmp = require 'cmp'
 local luasnip = require 'luasnip'
 
-require("copilot_cmp").setup()
-
 local has_words_before = function()
     if vim.api.nvim_buf_get_option(0, "buftype") == "prompt" then return false end
     local line, col = unpack(vim.api.nvim_win_get_cursor(0))
@@ -47,7 +45,6 @@ cmp.setup({
         })
     }),
     sources = cmp.config.sources({
-        { name = "copilot",                group_index = 2 },
         { name = 'path' },                    -- file paths
         { name = 'nvim_lsp' },                -- from language server
         { name = 'nvim_lsp_signature_help' }, -- display function signatures with current parameter emphasized