comparing 7e1a05d7b2004f2b782d8f0fc390201493ad5466 and main on aylac.top/nixcfg-own-knot

+1 -3

homes/ayla/default.nix

···

       135
       135
        
             };

     

       136
       136
        
       

     

       137
       137
        
             myHome = {

     

       138
       138
       -
               desktop = {

     

       139
       139
       -
                 gnome.enable = true;

     

       140
       140
       -
               };

     

       138
       138
       +
               desktop.gnome.enable = true;

     

       141
       139
        
       

     

       142
       140
        
               programs = {

     

       143
       141
        
                 lutris.enable = true;

+51

modules/home/desktop/cosmic/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         config,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }: {

     

       7
       7
       +
         options.myHome.desktop.cosmic = {

     

       8
       8
       +
           enable = lib.mkEnableOption "COSMIC desktop environment";

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         config = lib.mkIf config.myHome.desktop.cosmic.enable {

     

       12
       12
       +
           dconf = {

     

       13
       13
       +
             enable = true;

     

       14
       14
       +
       

     

       15
       15
       +
             settings = {

     

       16
       16
       +
               "org/gnome/desktop/wm/preferences".button-layout = "appmenu:close";

     

       17
       17
       +
             };

     

       18
       18
       +
           };

     

       19
       19
       +
       

     

       20
       20
       +
           myHome.profiles.defaultApps = {

     

       21
       21
       +
             audioPlayer = {

     

       22
       22
       +
               package = lib.mkDefault config.programs.mpv.finalPackage;

     

       23
       23
       +
               icon = lib.mkDefault "mpv";

     

       24
       24
       +
             };

     

       25
       25
       +
             editor = {

     

       26
       26
       +
               package = lib.mkDefault pkgs.cosmic-edit;

     

       27
       27
       +
               icon = lib.mkDefault "com.system76.CosmicEdit";

     

       28
       28
       +
             };

     

       29
       29
       +
             fileManager = {

     

       30
       30
       +
               package = lib.mkDefault pkgs.cosmic-files;

     

       31
       31
       +
               icon = lib.mkDefault "com.system76.CosmicFiles";

     

       32
       32
       +
             };

     

       33
       33
       +
             imageViewer = {

     

       34
       34
       +
               package = lib.mkDefault pkgs.loupe;

     

       35
       35
       +
               icon = lib.mkDefault "org.gnome.Loupe";

     

       36
       36
       +
             };

     

       37
       37
       +
             pdfViewer = {

     

       38
       38
       +
               package = lib.mkDefault pkgs.papers;

     

       39
       39
       +
               icon = lib.mkDefault "org.gnome.Papers";

     

       40
       40
       +
             };

     

       41
       41
       +
             terminal = {

     

       42
       42
       +
               package = lib.mkDefault pkgs.cosmic-term;

     

       43
       43
       +
               icon = lib.mkDefault "com.system76.CosmicTerm";

     

       44
       44
       +
             };

     

       45
       45
       +
             videoPlayer = {

     

       46
       46
       +
               package = lib.mkDefault config.programs.mpv.finalPackage;

     

       47
       47
       +
               icon = lib.mkDefault "mpv";

     

       48
       48
       +
             };

     

       49
       49
       +
           };

     

       50
       50
       +
         };

     

       51
       51
       +
       }

modules/home/desktop/default.nix

···

       7
       7
        
         imports = [

     

       8
       8
        
           ./gnome

     

       9
       9
        
           ./plasma

     

       10
       10
       +
           ./cosmic

     

       10
       11
        
         ];

     

       11
       12
        
       

     

       12
       13
        
         options.myHome.desktop.enable = lib.mkOption {

modules/home/desktop/gnome/default.nix

···

       93
       93
        
                 switch-to-workspace-up = [];

     

       94
       94
        
                 toggle-fullscreen = ["<Super>w"];

     

       95
       95
        
               };

     

       96
       96
       +
       

     

       97
       97
       +
               "org/gnome/desktop/wm/preferences".button-layout = "appmenu:close";

     

       96
       98
        
             };

     

       97
       99
        
           };

     

       98
       100

+42 -1

modules/home/desktop/plasma/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         config,

     

       4
       4
       +
         pkgs,

     

       4
       5
        
         ...

     

       5
       6
        
       }: {

     

       6
       7
        
         options.myHome.desktop.plasma = {

     

       7
       8
        
           enable = lib.mkEnableOption "KDE Plasma desktop environment";

     

       8
       9
        
         };

     

       9
       10
        
       

     

       10
       10
       -
         config = lib.mkIf config.myHome.desktop.plasma.enable {};

     

       11
       11
       +
         config = lib.mkIf config.myHome.desktop.plasma.enable {

     

       12
       12
       +
           dconf = {

     

       13
       13
       +
             enable = true;

     

       14
       14
       +
       

     

       15
       15
       +
             settings = {

     

       16
       16
       +
               "org/gnome/desktop/wm/preferences".button-layout = "appmenu:minimize,maximize,close";

     

       17
       17
       +
             };

     

       18
       18
       +
           };

     

       19
       19
       +
       

     

       20
       20
       +
           myHome.profiles.defaultApps = {

     

       21
       21
       +
             audioPlayer = {

     

       22
       22
       +
               package = lib.mkDefault config.programs.mpv.finalPackage;

     

       23
       23
       +
               icon = lib.mkDefault "mpv";

     

       24
       24
       +
             };

     

       25
       25
       +
             editor = {

     

       26
       26
       +
               package = lib.mkDefault pkgs.kdePackages.kate;

     

       27
       27
       +
               icon = lib.mkDefault "org.kde.kate";

     

       28
       28
       +
             };

     

       29
       29
       +
             fileManager = {

     

       30
       30
       +
               package = lib.mkDefault pkgs.kdePackages.dolphin;

     

       31
       31
       +
               exec = lib.mkDefault (lib.getExe config.myHome.profiles.defaultApps.fileManager.package);

     

       32
       32
       +
               icon = lib.mkDefault "org.kde.dolphin";

     

       33
       33
       +
             };

     

       34
       34
       +
             imageViewer = {

     

       35
       35
       +
               package = lib.mkDefault pkgs.kdePackages.gwenview;

     

       36
       36
       +
               icon = lib.mkDefault "org.kde.gwenview";

     

       37
       37
       +
             };

     

       38
       38
       +
             pdfViewer = {

     

       39
       39
       +
               package = lib.mkDefault pkgs.kdePackages.okular;

     

       40
       40
       +
               icon = lib.mkDefault "org.kde.okular";

     

       41
       41
       +
             };

     

       42
       42
       +
             terminal = {

     

       43
       43
       +
               package = lib.mkDefault pkgs.kdePackages.konsole;

     

       44
       44
       +
               icon = lib.mkDefault "org.kde.konsole";

     

       45
       45
       +
             };

     

       46
       46
       +
             videoPlayer = {

     

       47
       47
       +
               package = lib.mkDefault config.programs.mpv.finalPackage;

     

       48
       48
       +
               icon = lib.mkDefault "mpv";

     

       49
       49
       +
             };

     

       50
       50
       +
           };

     

       51
       51
       +
         };

     

       11
       52
        
       }

+42 -56

modules/home/programs/helix/default.nix

···

       6
       6
        
         editorCfg = config.mySnippets.editor;

     

       7
       7
        
       

     

       8
       8
        
         mkHelixServer = name: srv:

     

       9
       9
       -
           lib.filterAttrs (_: v: v != null) (

     

       10
       10
       -
             {

     

       11
       11
       -
               name = name;

     

       12
       12
       -
               command = srv.command;

     

       13
       13
       -
             }

     

       14
       14
       -
             // (

     

       15
       15
       -
               if (srv.args or []) != []

     

       16
       16
       -
               then {args = srv.args;}

     

       17
       17
       -
               else {}

     

       18
       18
       -
             )

     

       19
       19
       -
             // (

     

       20
       20
       -
               if (lib.isAttrs (srv.config or {}) && (builtins.length (builtins.attrNames srv.config)) > 0)

     

       21
       21
       -
               then {config = srv.config;}

     

       22
       22
       -
               else {}

     

       23
       23
       -
             )

     

       24
       24
       -
           );

     

       9
       9
       +
           lib.filterAttrs (_: v: v != null) {

     

       10
       10
       +
             inherit name;

     

       11
       11
       +
             command =

     

       12
       12
       +
               if srv.helix-command != null

     

       13
       13
       +
               then srv.helix-command

     

       14
       14
       +
               else srv.command;

     

       15
       15
       +
             args = srv.args or null;

     

       16
       16
       +
             config = srv.config or null;

     

       17
       17
       +
           };

     

       25
       18
        
       

     

       26
       19
        
         mkHelixLanguage = name: lang: let

     

       27
       27
       -
           fmtName = lang.helix-formatter or lang.formatter or null;

     

       20
       20
       +
           # this shit is so ugly

     

       21
       21
       +
           fmtName = lib.findFirst (x: x != null) null [

     

       22
       22
       +
             (lang.helix-formatter or null)

     

       23
       23
       +
             (lang.formatter or null)

     

       24
       24
       +
           ];

     

       25
       25
       +
       

     

       28
       26
        
           fmt =

     

       29
       29
       -
             if fmtName == null

     

       30
       30
       -
             then null

     

       31
       31
       -
             else editorCfg.formatters.${fmtName};

     

       27
       27
       +
             if fmtName != null

     

       28
       28
       +
             then editorCfg.formatters.${fmtName}

     

       29
       29
       +
             else null;

     

       32
       30
        
       

     

       33
       33
       -
           usesLspFormatter = fmt != null && fmt.type == "lsp";

     

       31
       31
       +
           usesLspFormatter = fmt == null || fmt.type == "lsp";

     

       34
       32
        
       

     

       35
       33
        
           formatter =

     

       36
       34
        
             if fmt != null && fmt.type == "external"

     

       37
       37
       -
             then {

     

       38
       38
       -
               command = fmt.command;

     

       39
       39
       -
               args = fmt.args or [];

     

       40
       40
       -
             }

     

       35
       35
       +
             then

     

       36
       36
       +
               lib.filterAttrs (_: v: v != null) {

     

       37
       37
       +
                 command = fmt.command;

     

       38
       38
       +
                 args = fmt.args;

     

       39
       39
       +
               }

     

       41
       40
        
             else null;

     

       42
       41
        
       

     

       43
       43
       -
           languageServers =

     

       44
       44
       -
             if usesLspFormatter

     

       45
       45
       -
             then

     

       46
       46
       -
               map (

     

       47
       47
       -
                 srvName:

     

       48
       48
       -
                   if srvName == fmt.lspName

     

       49
       49
       -
                   then {

     

       50
       50
       -
                     name = srvName;

     

       51
       51
       -
                     except-features = ["format"];

     

       52
       52
       -
                   }

     

       53
       53
       -
                   else {name = srvName;}

     

       54
       54
       -
               )

     

       55
       55
       -
               lang.language-servers

     

       56
       56
       -
             else map (srvName: {name = srvName;}) lang.language-servers;

     

       42
       42
       +
           fullLspList = lang.language-servers ++ lang.helix-only-language-servers;

     

       43
       43
       +
       

     

       44
       44
       +
           languageServers = map (srvName:

     

       45
       45
       +
             lib.filterAttrs (_: v: v != null) {

     

       46
       46
       +
               name = srvName;

     

       47
       47
       +
               except-features =

     

       48
       48
       +
                 if (usesLspFormatter && fmtName != null && srvName != fmtName)

     

       49
       49
       +
                 then ["format"]

     

       50
       50
       +
                 else null;

     

       51
       51
       +
             })

     

       52
       52
       +
           fullLspList;

     

       57
       53
        
         in

     

       58
       58
       -
           lib.filterAttrs (_: v: v != null) (

     

       59
       59
       -
             {

     

       60
       60
       -
               name = lang.name;

     

       61
       61
       -
               auto-format = lang.auto-format;

     

       62
       62
       -
               language-servers = languageServers;

     

       63
       63
       -
             }

     

       64
       64
       -
             // (

     

       65
       65
       -
               if lang.file-types != []

     

       66
       66
       -
               then {file-types = lang.file-types;}

     

       67
       67
       -
               else {}

     

       68
       68
       -
             )

     

       69
       69
       -
             // (

     

       70
       70
       -
               if formatter != null

     

       71
       71
       -
               then {inherit formatter;}

     

       72
       72
       -
               else {}

     

       73
       73
       -
             )

     

       74
       74
       -
           );

     

       54
       54
       +
           lib.filterAttrs (_: v: v != null) {

     

       55
       55
       +
             name = lang.name;

     

       56
       56
       +
             auto-format = lang.auto-format;

     

       57
       57
       +
             language-servers = languageServers;

     

       58
       58
       +
             file-types = lang.file-types;

     

       59
       59
       +
             inherit formatter;

     

       60
       60
       +
           };

     

       75
       61
        
       in {

     

       76
       62
        
         options.myHome.programs.helix.enable = lib.mkEnableOption "helix";

     

       77
       63

+49 -34

modules/home/programs/zed-editor/default.nix

···

       7
       7
        
       

     

       8
       8
        
         mkZedFormatter = fmtName:

     

       9
       9
        
           if fmtName == null

     

       10
       10
       -
           then null

     

       10
       10
       +
           then "language_server"

     

       11
       11
        
           else let

     

       12
       12
        
             f = editorCfg.formatters.${fmtName};

     

       13
       13
        
           in

     
···

       19
       19
        
               };

     

       20
       20
        
             }

     

       21
       21
        
             else if f.type == "lsp"

     

       22
       22
       -
             then {

     

       23
       23
       -
               language_server = {name = f.lspName;};

     

       24
       24
       -
             }

     

       22
       22
       +
             then {language_server = {name = fmtName;};}

     

       25
       23
        
             else null;

     

       26
       24
        
       

     

       27
       25
        
         mkZedLanguage = name: lang:

     

       28
       26
        
           lib.filterAttrs (_: v: v != null) {

     

       29
       27
        
             formatter = mkZedFormatter lang.formatter;

     

       30
       30
       -
             language_servers = lang.language-servers;

     

       28
       28
       +
             language_servers = lang.language-servers ++ lang.zed-only-language-servers;

     

       31
       29
        
             code_actions_on_format = lang.code-actions-on-format;

     

       32
       30
        
           };

     

       33
       31
        
       

     

       34
       34
       -
         mkZedLsp = name: srv: let

     

       35
       35
       -
           args = srv.args or [];

     

       36
       36
       -
           cfg = srv.config or {};

     

       37
       37
       -
           hasArgs = args != [];

     

       38
       38
       -
           hasSettings = lib.isAttrs cfg && (builtins.length (builtins.attrNames cfg) > 0);

     

       39
       39
       -
           isHelixOnly = srv.helix-only or false;

     

       40
       40
       -
         in

     

       41
       41
       -
           if isHelixOnly

     

       42
       42
       -
           then null

     

       43
       43
       -
           else

     

       44
       44
       -
             lib.filterAttrs (_: v: v != null) (

     

       45
       45
       -
               {

     

       46
       46
       -
                 binary = lib.filterAttrs (_: v: v != null) (

     

       47
       47
       -
                   {path = srv.command;}

     

       48
       48
       -
                   // (

     

       49
       49
       -
                     if hasArgs

     

       50
       50
       -
                     then {arguments = args;}

     

       51
       51
       -
                     else {}

     

       52
       52
       -
                   )

     

       53
       53
       -
                 );

     

       54
       54
       -
               }

     

       55
       55
       -
               // (

     

       56
       56
       -
                 if hasSettings

     

       57
       57
       -
                 then {settings = cfg;}

     

       58
       58
       -
                 else {}

     

       59
       59
       -
               )

     

       60
       60
       -
             );

     

       32
       32
       +
         mkZedLsp = name: srv:

     

       33
       33
       +
           lib.filterAttrs (_: v: v != null) {

     

       34
       34
       +
             binary = lib.filterAttrs (_: v: v != null) {

     

       35
       35
       +
               path = srv.command;

     

       36
       36
       +
               arguments = srv.args or null;

     

       37
       37
       +
             };

     

       38
       38
       +
             settings = srv.config or null;

     

       39
       39
       +
           };

     

       61
       40
        
       in {

     

       62
       41
        
         options.myHome.programs.zed-editor.enable = lib.mkEnableOption "zed editor";

     

       63
       42
        
       

     
···

       75
       54
        
               "scss"

     

       76
       55
        
               "toml"

     

       77
       56
        
               "biome"

     

       78
       78
       -
               "superhtml"

     

       57
       57
       +
               #"superhtml"

     

       79
       58
        
               "marksman"

     

       80
       59
        
               "makefile"

     

       81
       60
        
               "zig"

     
···

       133
       112
        
                   editorCfg.languages

     

       134
       113
        
                 )

     

       135
       114
        
               );

     

       136
       136
       -
               lsp = lib.filterAttrs (_: v: v != null) (lib.mapAttrs mkZedLsp editorCfg.languageServers);

     

       115
       115
       +
               lsp = lib.mapAttrs mkZedLsp editorCfg.languageServers;

     

       137
       116
        
             };

     

       138
       117
        
             userTasks = [

     

       139
       118
        
               {

     
···

       144
       123
        
                 allow_concurrent_runs = false;

     

       145
       124
        
                 shell = {

     

       146
       125
        
                   program = "fish";

     

       126
       126
       +
                 };

     

       127
       127
       +
               }

     

       128
       128
       +
             ];

     

       129
       129
       +
             userKeymaps = [

     

       130
       130
       +
               {

     

       131
       131
       +
                 context = "(vim_mode == helix_normal || vim_mode == helix_select) && !menu";

     

       132
       132
       +
                 bindings = {

     

       133
       133
       +
                   n = "vim::WrappingLeft";

     

       134
       134
       +
                   e = "vim::Down";

     

       135
       135
       +
                   i = "vim::Up";

     

       136
       136
       +
                   o = "vim::WrappingRight";

     

       137
       137
       +
                 };

     

       138
       138
       +
               }

     

       139
       139
       +
               {

     

       140
       140
       +
                 context = "vim_mode == helix_normal && !menu";

     

       141
       141
       +
                 bindings = {

     

       142
       142
       +
                   j = "vim::NextWordEnd";

     

       143
       143
       +
                   J = ["vim::NextWordEnd" {ignore_punctuation = true;}];

     

       144
       144
       +
                   k = "vim::MoveToNextMatch";

     

       145
       145
       +
                   K = "vim::MoveToPreviousMatch";

     

       146
       146
       +
                   l = "vim::HelixInsert";

     

       147
       147
       +
                   L = "vim::InsertFirstNonWhitespace";

     

       148
       148
       +
                   h = "vim::InsertLineBelow";

     

       149
       149
       +
                   H = "vim::InsertLineAbove";

     

       150
       150
       +
                 };

     

       151
       151
       +
               }

     

       152
       152
       +
               {

     

       153
       153
       +
                 context = "Workspace";

     

       154
       154
       +
                 bindings = {

     

       155
       155
       +
                   ctrl-g = [

     

       156
       156
       +
                     "task::Spawn"

     

       157
       157
       +
                     {

     

       158
       158
       +
                       task_name = "jjui";

     

       159
       159
       +
                       reveal_target = "center";

     

       160
       160
       +
                     }

     

       161
       161
       +
                   ];

     

       147
       162
        
                 };

     

       148
       163
        
               }

     

       149
       164
        
             ];

+49 -30

modules/home/snippets/editor/default.nix

···

       6
       6
        
         # Helper function to create language server definitions

     

       7
       7
        
         mkLspServer = name: {

     

       8
       8
        
           command,

     

       9
       9
       -
           args ? [],

     

       10
       10
       -
           config ? {},

     

       11
       11
       -
           helix-only ? false,

     

       9
       9
       +
           helix-command ? null,

     

       10
       10
       +
           args ? null,

     

       11
       11
       +
           config ? null,

     

       12
       12
        
         }: {

     

       13
       13
       -
           inherit name command args config helix-only;

     

       13
       13
       +
           inherit name command helix-command args config;

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         # Helper function to create formatter definitions

     

       17
       17
        
         mkFormatter = name: {

     

       18
       18
        
           type,

     

       19
       19
        
           command ? null,

     

       20
       20
       -
           args ? [],

     

       20
       20
       +
           args ? null,

     

       21
       21
        
           lspName ? null,

     

       22
       22
       -
           config ? {},

     

       22
       22
       +
           config ? null,

     

       23
       23
        
         }: {

     

       24
       24
        
           inherit name type command args lspName config;

     

       25
       25
        
         };

     
···

       28
       28
        
         mkLanguage = name: {

     

       29
       29
        
           full-name ? name,

     

       30
       30
        
           auto-format ? true,

     

       31
       31
       -
           file-types ? [],

     

       31
       31
       +
           file-types ? null,

     

       32
       32
        
           language-servers ? [],

     

       33
       33
       +
           zed-only-language-servers ? [],

     

       34
       34
       +
           helix-only-language-servers ? [],

     

       33
       35
        
           formatter ? null,

     

       34
       36
        
           helix-formatter ? null,

     

       35
       35
       -
           code-actions-on-format ? {},

     

       37
       37
       +
           code-actions-on-format ? null,

     

       36
       38
        
         }: {

     

       37
       37
       -
           inherit name full-name auto-format file-types language-servers formatter helix-formatter code-actions-on-format;

     

       39
       39
       +
           inherit name full-name auto-format file-types language-servers zed-only-language-servers helix-only-language-servers formatter helix-formatter code-actions-on-format;

     

       38
       40
        
         };

     

       39
       41
        
       in {

     

       40
       42
        
         options.mySnippets.editor = lib.mkOption {

     
···

       52
       54
        
             };

     

       53
       55
        
       

     

       54
       56
        
             tailwindcss-language-server = mkLspServer "tailwindcss-language-server" {

     

       55
       55
       -
               command = let

     

       57
       57
       +
               command = pkgs.writeScript "tailwindcss-language-server-bun" ''

     

       58
       58
       +
                 #!${lib.getExe pkgs.bash} -e

     

       59
       59
       +
                 exec ${lib.getExe pkgs.bun} ${lib.getExe pkgs.tailwindcss-language-server}

     

       60
       60
       +
               '';

     

       61
       61
       +
               helix-command = let

     

       56
       62
        
                 fd = lib.getExe pkgs.fd;

     

       57
       63
        
                 xargs = "${pkgs.uutils-findutils}/bin/xargs";

     

       58
       64
        
                 grep = lib.getExe pkgs.gnugrep;

     

       59
       59
       -
                 echo = "${pkgs.uutils-coreutils-noprefix}/bin/echo";

     

       60
       65
        
                 bun = lib.getExe pkgs.bun;

     

       61
       66
        
                 twls = lib.getExe pkgs.tailwindcss-language-server;

     

       62
       67
        
               in

     

       63
       63
       -
                 pkgs.writeScript "tailwindcss-language-server-bun" ''

     

       64
       64
       -
                   #!${lib.getExe pkgs.bash} -e

     

       68
       68
       +
                 pkgs.writeScript "tailwindcss-language-server-bun-helix" ''

     

       69
       69
       +
                   #!${lib.getExe pkgs.bash} -euo

     

       65
       70
        
       

     

       66
       71
        
                   if ! ${fd} -H -I -E "node_modules" "package\\.json$" . | \

     

       67
       72
        
                     ${xargs} ${grep} -q '"tailwindcss"'; then

     

       68
       68
       -
                     ${echo} "No tailwindcss found in project; skipping tailwindcss-language-server." >&2

     

       69
       69
       -
                     exec tail -f /dev/null

     

       73
       73
       +
       

     

       74
       74
       +
                     exit 0

     

       70
       75
        
                   fi

     

       71
       76
        
       

     

       72
       77
        
                   exec ${bun} ${twls}

     

       73
       78
        
                 '';

     

       74
       79
        
               args = [];

     

       75
       80
        
               config = {provideFormatter = false;};

     

       76
       76
       -
               helix-only = true;

     

       77
       81
        
             };

     

       78
       82
        
       

     

       79
       83
        
             vscode-html-language-server = mkLspServer "vscode-html-language-server" {

     
···

       96
       100
        
               args = ["${pkgs.vscode-json-languageserver}/lib/node_modules/vscode-json-languageserver/bin/vscode-json-languageserver" "--stdio"];

     

       97
       101
        
             };

     

       98
       102
        
       

     

       99
       99
       -
             typescript-language-server = mkLspServer "typescript-language-server" {

     

       103
       103
       +
             vtsls = mkLspServer "vtsls" {

     

       100
       104
        
               command = lib.getExe pkgs.bun;

     

       101
       101
       -
               args = ["${pkgs.nodePackages.typescript-language-server}/lib/node_modules/typescript-language-server/lib/cli.mjs" "--stdio"];

     

       105
       105
       +
               args = ["${pkgs.vtsls}/bin/vtsls" "--stdio"];

     

       102
       106
        
             };

     

       103
       107
        
       

     

       104
       108
        
             svelte-language-server = mkLspServer "svelte-language-server" {

     
···

       182
       186
        
           formatters = {

     

       183
       187
        
             biome = mkFormatter "biome" {

     

       184
       188
        
               type = "lsp";

     

       185
       185
       -
               lspName = "biome";

     

       186
       189
        
             };

     

       187
       190
        
       

     

       188
       191
        
             biomeHtml = mkFormatter "biomeHtml" {

     
···

       228
       231
        
           languages = {

     

       229
       232
        
             html = mkLanguage "html" {

     

       230
       233
        
               full-name = "HTML";

     

       231
       231
       -
               language-servers = ["vscode-html-language-server" "superhtml" "biome"];

     

       234
       234
       +
               language-servers = ["vscode-html-language-server" "biome"];

     

       235
       235
       +
               zed-only-language-servers = ["!eslint" "..."];

     

       236
       236
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       232
       237
        
               formatter = "biome";

     

       233
       238
        
               helix-formatter = "biomeHtml";

     

       234
       239
        
               code-actions-on-format = {

     
···

       240
       245
        
             css = mkLanguage "css" {

     

       241
       246
        
               full-name = "CSS";

     

       242
       247
        
               language-servers = ["css-language-server" "biome"];

     

       248
       248
       +
               zed-only-language-servers = ["..."];

     

       249
       249
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       243
       250
        
               formatter = "biome";

     

       244
       251
        
               code-actions-on-format = {

     

       245
       252
        
                 "source.fixAll.biome" = true;

     
···

       249
       256
        
       

     

       250
       257
        
             javascript = mkLanguage "javascript" {

     

       251
       258
        
               full-name = "JavaScript";

     

       252
       252
       -
               language-servers = ["typescript-language-server" "biome"];

     

       259
       259
       +
               language-servers = ["vtsls" "biome"];

     

       260
       260
       +
               zed-only-language-servers = ["!eslint" "!typescript-language-server" "..."];

     

       261
       261
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       253
       262
        
               formatter = "biome";

     

       254
       263
        
               code-actions-on-format = {

     

       255
       264
        
                 "source.fixAll.biome" = true;

     
···

       259
       268
        
       

     

       260
       269
        
             typescript = mkLanguage "typescript" {

     

       261
       270
        
               full-name = "TypeScript";

     

       262
       262
       -
               language-servers = ["typescript-language-server" "biome"];

     

       271
       271
       +
               language-servers = ["vtsls" "biome"];

     

       272
       272
       +
               zed-only-language-servers = ["!eslint" "!typescript-language-server" "..."];

     

       273
       273
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       263
       274
        
               formatter = "biome";

     

       264
       275
        
               code-actions-on-format = {

     

       265
       276
        
                 "source.fixAll.biome" = true;

     
···

       269
       280
        
       

     

       270
       281
        
             jsx = mkLanguage "jsx" {

     

       271
       282
        
               full-name = "JSX";

     

       272
       272
       -
               language-servers = ["typescript-language-server" "biome"];

     

       283
       283
       +
               language-servers = ["vtsls" "biome"];

     

       284
       284
       +
               zed-only-language-servers = ["!eslint" "!typescript-language-server" "..."];

     

       285
       285
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       273
       286
        
               formatter = "biome";

     

       274
       287
        
               code-actions-on-format = {

     

       275
       288
        
                 "source.fixAll.biome" = true;

     
···

       279
       292
        
       

     

       280
       293
        
             tsx = mkLanguage "tsx" {

     

       281
       294
        
               full-name = "TSX";

     

       282
       282
       -
               language-servers = ["typescript-language-server" "biome"];

     

       295
       295
       +
               language-servers = ["vtsls" "biome"];

     

       296
       296
       +
               zed-only-language-servers = ["!eslint" "!typescript-language-server" "..."];

     

       297
       297
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       283
       298
        
               formatter = "biome";

     

       284
       299
        
               code-actions-on-format = {

     

       285
       300
        
                 "source.fixAll.biome" = true;

     
···

       289
       304
        
       

     

       290
       305
        
             svelte = mkLanguage "svelte" {

     

       291
       306
        
               full-name = "Svelte";

     

       292
       292
       -
               language-servers = ["svelte-language-server" "typescript-language-server" "biome"];

     

       307
       307
       +
               language-servers = ["svelte-language-server" "vtsls" "biome"];

     

       308
       308
       +
               zed-only-language-servers = ["!eslint" "!typescript-language-server" "..."];

     

       309
       309
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       293
       310
        
               formatter = "biome";

     

       294
       311
        
               code-actions-on-format = {

     

       295
       312
        
                 "source.fixAll.biome" = true;

     
···

       300
       317
        
             vue = mkLanguage "vue" {

     

       301
       318
        
               full-name = "Vue.js";

     

       302
       319
        
               language-servers = ["vue-language-server" "biome"];

     

       320
       320
       +
               zed-only-language-servers = ["!eslint" "!typescript-language-server" "..."];

     

       321
       321
       +
               helix-only-language-servers = ["tailwindcss-language-server"];

     

       303
       322
        
               formatter = "biome";

     

       304
       323
        
               code-actions-on-format = {

     

       305
       324
        
                 "source.fixAll.biome" = true;

     
···

       327
       346
        
             };

     

       328
       347
        
       

     

       329
       348
        
             bash = mkLanguage "bash" {

     

       330
       330
       -
               full-name = "Bash";

     

       349
       349
       +
               full-name = "Shell Script";

     

       331
       350
        
               file-types = ["sh" "bash" "dash" "ksh" "mksh"];

     

       332
       351
        
               language-servers = ["bash-language-server"];

     

       333
       352
        
               formatter = "shfmt";

     
···

       387
       406
        
               formatter = "gdscript-formatter";

     

       388
       407
        
             };

     

       389
       408
        
       

     

       390
       390
       -
             ruby = mkLanguage "ruby" {

     

       391
       391
       -
               full-name = "Ruby";

     

       392
       392
       -
               language-servers = ["solargraph" "rubocop" "!ruby-lsp"];

     

       393
       393
       -
             };

     

       409
       409
       +
             #ruby = mkLanguage "ruby" {

     

       410
       410
       +
             #  full-name = "Ruby";

     

       411
       411
       +
             #  language-servers = ["solargraph" "rubocop"];

     

       412
       412
       +
             #};

     

       394
       413
        
           };

     

       395
       414
        
         };

     

       396
       415
        
       }

+24

modules/nixos/desktop/cosmic/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }: {

     

       7
       7
       +
         options.myNixOS.desktop.cosmic.enable = lib.mkEnableOption "COSMIC desktop environment";

     

       8
       8
       +
       

     

       9
       9
       +
         config = lib.mkIf config.myNixOS.desktop.cosmic.enable {

     

       10
       10
       +
           home-manager.sharedModules = [

     

       11
       11
       +
             {

     

       12
       12
       +
               config.myHome.desktop.cosmic.enable = true;

     

       13
       13
       +
             }

     

       14
       14
       +
           ];

     

       15
       15
       +
       

     

       16
       16
       +
           environment.cosmic.excludePackages = with pkgs; [

     

       17
       17
       +
             cosmic-store

     

       18
       18
       +
           ];

     

       19
       19
       +
       

     

       20
       20
       +
           services.desktopManager.cosmic.enable = true;

     

       21
       21
       +
           system.nixos.tags = ["cosmic"];

     

       22
       22
       +
           myNixOS.desktop.enable = true;

     

       23
       23
       +
         };

     

       24
       24
       +
       }

modules/nixos/desktop/default.nix

···

       7
       7
        
         imports = [

     

       8
       8
        
           ./gnome

     

       9
       9
        
           ./plasma

     

       10
       10
       +
           ./cosmic

     

       10
       11
        
         ];

     

       11
       12
        
       

     

       12
       13
        
         options.myNixOS.desktop.enable = lib.mkOption {

+2 -3

modules/nixos/desktop/gnome/default.nix

···

       51
       51
        
             ];

     

       52
       52
        
           };

     

       53
       53
        
       

     

       54
       54
       -
           myNixOS = {

     

       55
       55
       -
             desktop.enable = true;

     

       56
       56
       -
           };

     

       54
       54
       +
           myNixOS.desktop.enable = true;

     

       55
       55
       +
           system.nixos.tags = ["gnome"];

     

       57
       56
        
       

     

       58
       57
        
           #qt = {

     

       59
       58
        
           #  enable = true;

modules/nixos/desktop/plasma/default.nix

···

       21
       21
        
           ];

     

       22
       22
        
       

     

       23
       23
        
           services.desktopManager.plasma6.enable = true;

     

       24
       24
       +
           system.nixos.tags = ["plasma"];

     

       25
       25
       +
           myNixOS.desktop.enable = true;

     

       24
       26
        
         };

     

       25
       27
        
       }

-2

modules/nixos/profiles/workstation/default.nix

···

       111
       111
        
               enableSystemSlice = true;

     

       112
       112
        
               enableUserSlices = true;

     

       113
       113
        
             };

     

       114
       114
       -
             # i hate these guys

     

       115
       115
       -
             coredump.enable = false;

     

       116
       114
        
           };

     

       117
       115
        
       

     

       118
       116
        
           zramSwap = {

Compare changes