comparing 7698c108499aafea212da58525d9ab03a853e7a8 and main on aylac.top/nixcfg-own-knot

+1 -3

homes/ayla/default.nix

···

       135
        
             };

     

       136
        
       

     

       137
        
             myHome = {

     

       138
       -
               desktop = {

     

       139
       -
                 gnome.enable = true;

     

       140
       -
               };

     

       141
        
       

     

       142
        
               programs = {

     

       143
        
                 lutris.enable = true;

···

       135
        
             };

     

       136
        
       

     

       137
        
             myHome = {

     

       138
       +
               desktop.gnome.enable = true;

     

       0
        
       
     

       0
        
       
     

       139
        
       

     

       140
        
               programs = {

     

       141
        
                 lutris.enable = true;

+51

modules/home/desktop/cosmic/default.nix

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         config,

     

       4
       +
         pkgs,

     

       5
       +
         ...

     

       6
       +
       }: {

     

       7
       +
         options.myHome.desktop.cosmic = {

     

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

     

       9
       +
         };

     

       10
       +
       

     

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

     

       12
       +
           dconf = {

     

       13
       +
             enable = true;

     

       14
       +
       

     

       15
       +
             settings = {

     

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

     

       17
       +
             };

     

       18
       +
           };

     

       19
       +
       

     

       20
       +
           myHome.profiles.defaultApps = {

     

       21
       +
             audioPlayer = {

     

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

     

       23
       +
               icon = lib.mkDefault "mpv";

     

       24
       +
             };

     

       25
       +
             editor = {

     

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

     

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

     

       28
       +
             };

     

       29
       +
             fileManager = {

     

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

     

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

     

       32
       +
             };

     

       33
       +
             imageViewer = {

     

       34
       +
               package = lib.mkDefault pkgs.loupe;

     

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

     

       36
       +
             };

     

       37
       +
             pdfViewer = {

     

       38
       +
               package = lib.mkDefault pkgs.papers;

     

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

     

       40
       +
             };

     

       41
       +
             terminal = {

     

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

     

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

     

       44
       +
             };

     

       45
       +
             videoPlayer = {

     

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

     

       47
       +
               icon = lib.mkDefault "mpv";

     

       48
       +
             };

     

       49
       +
           };

     

       50
       +
         };

     

       51
       +
       }

modules/home/desktop/default.nix

···

       7
        
         imports = [

     

       8
        
           ./gnome

     

       9
        
           ./plasma

     

       0
        
       
     

       10
        
         ];

     

       11
        
       

     

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

···

       7
        
         imports = [

     

       8
        
           ./gnome

     

       9
        
           ./plasma

     

       10
       +
           ./cosmic

     

       11
        
         ];

     

       12
        
       

     

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

modules/home/desktop/gnome/default.nix

···

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

     

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

     

       95
        
               };

     

       0
        
       
     

       0
        
       
     

       96
        
             };

     

       97
        
           };

     

       98

···

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

     

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

     

       95
        
               };

     

       96
       +
       

     

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

     

       98
        
             };

     

       99
        
           };

     

       100

+42 -1

modules/home/desktop/plasma/default.nix

···

       1
        
       {

     

       2
        
         lib,

     

       3
        
         config,

     

       0
        
       
     

       4
        
         ...

     

       5
        
       }: {

     

       6
        
         options.myHome.desktop.plasma = {

     

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

     

       8
        
         };

     

       9
        
       

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
       }

···

       1
        
       {

     

       2
        
         lib,

     

       3
        
         config,

     

       4
       +
         pkgs,

     

       5
        
         ...

     

       6
        
       }: {

     

       7
        
         options.myHome.desktop.plasma = {

     

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

     

       9
        
         };

     

       10
        
       

     

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

     

       12
       +
           dconf = {

     

       13
       +
             enable = true;

     

       14
       +
       

     

       15
       +
             settings = {

     

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

     

       17
       +
             };

     

       18
       +
           };

     

       19
       +
       

     

       20
       +
           myHome.profiles.defaultApps = {

     

       21
       +
             audioPlayer = {

     

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

     

       23
       +
               icon = lib.mkDefault "mpv";

     

       24
       +
             };

     

       25
       +
             editor = {

     

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

     

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

     

       28
       +
             };

     

       29
       +
             fileManager = {

     

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

     

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

     

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

     

       33
       +
             };

     

       34
       +
             imageViewer = {

     

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

     

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

     

       37
       +
             };

     

       38
       +
             pdfViewer = {

     

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

     

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

     

       41
       +
             };

     

       42
       +
             terminal = {

     

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

     

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

     

       45
       +
             };

     

       46
       +
             videoPlayer = {

     

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

     

       48
       +
               icon = lib.mkDefault "mpv";

     

       49
       +
             };

     

       50
       +
           };

     

       51
       +
         };

     

       52
        
       }

+42 -57

modules/home/programs/helix/default.nix

···

       6
        
         editorCfg = config.mySnippets.editor;

     

       7
        
       

     

       8
        
         mkHelixServer = name: srv:

     

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

     

       10
       -
             {

     

       11
       -
               name = name;

     

       12
       -
               command = srv.command;

     

       13
       -
             }

     

       14
       -
             // (

     

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

     

       16
       -
               then {args = srv.args;}

     

       17
       -
               else {}

     

       18
       -
             )

     

       19
       -
             // (

     

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

     

       21
       -
               then {config = srv.config;}

     

       22
       -
               else {}

     

       23
       -
             )

     

       24
       -
           );

     

       25
        
       

     

       26
        
         mkHelixLanguage = name: lang: let

     

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
           fmt =

     

       29
       -
             if fmtName == null

     

       30
       -
             then null

     

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

     

       32
        
       

     

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

     

       34
        
       

     

       35
        
           formatter =

     

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

     

       37
       -
             then {

     

       38
       -
               command = fmt.command;

     

       39
       -
               args = fmt.args or [];

     

       40
       -
             }

     

       0
        
       
     

       41
        
             else null;

     

       42
        
       

     

       43
       -
           languageServers =

     

       44
       -
             if usesLspFormatter

     

       45
       -
             then

     

       46
       -
               map (

     

       47
       -
                 srvName:

     

       48
       -
                   if srvName == fmt.lspName

     

       49
       -
                   then {

     

       50
       -
                     name = srvName;

     

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

     

       52
       -
                   }

     

       53
       -
                   else {name = srvName;}

     

       54
       -
               )

     

       55
       -
               (lang.language-servers

     

       56
       -
                 ++ lang.helix-only-language-servers)

     

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

     

       58
        
         in

     

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

     

       60
       -
             {

     

       61
       -
               name = lang.name;

     

       62
       -
               auto-format = lang.auto-format;

     

       63
       -
               language-servers = languageServers;

     

       64
       -
             }

     

       65
       -
             // (

     

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

     

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

     

       68
       -
               else {}

     

       69
       -
             )

     

       70
       -
             // (

     

       71
       -
               if formatter != null

     

       72
       -
               then {inherit formatter;}

     

       73
       -
               else {}

     

       74
       -
             )

     

       75
       -
           );

     

       76
        
       in {

     

       77
        
         options.myHome.programs.helix.enable = lib.mkEnableOption "helix";

     

       78

···

       6
        
         editorCfg = config.mySnippets.editor;

     

       7
        
       

     

       8
        
         mkHelixServer = name: srv:

     

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

     

       10
       +
             inherit name;

     

       11
       +
             command =

     

       12
       +
               if srv.helix-command != null

     

       13
       +
               then srv.helix-command

     

       14
       +
               else srv.command;

     

       15
       +
             args = srv.args or null;

     

       16
       +
             config = srv.config or null;

     

       17
       +
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       18
        
       

     

       19
        
         mkHelixLanguage = name: lang: let

     

       20
       +
           # this shit is so ugly

     

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

     

       22
       +
             (lang.helix-formatter or null)

     

       23
       +
             (lang.formatter or null)

     

       24
       +
           ];

     

       25
       +
       

     

       26
        
           fmt =

     

       27
       +
             if fmtName != null

     

       28
       +
             then editorCfg.formatters.${fmtName}

     

       29
       +
             else null;

     

       30
        
       

     

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

     

       32
        
       

     

       33
        
           formatter =

     

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

     

       35
       +
             then

     

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

     

       37
       +
                 command = fmt.command;

     

       38
       +
                 args = fmt.args;

     

       39
       +
               }

     

       40
        
             else null;

     

       41
        
       

     

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

     

       43
       +
       

     

       44
       +
           languageServers = map (srvName:

     

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

     

       46
       +
               name = srvName;

     

       47
       +
               except-features =

     

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

     

       49
       +
                 then ["format"]

     

       50
       +
                 else null;

     

       51
       +
             })

     

       52
       +
           fullLspList;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       53
        
         in

     

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

     

       55
       +
             name = lang.name;

     

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

     

       57
       +
             language-servers = languageServers;

     

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

     

       59
       +
             inherit formatter;

     

       60
       +
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       61
        
       in {

     

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

     

       63

+33 -28

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

···

       7
        
       

     

       8
        
         mkZedFormatter = fmtName:

     

       9
        
           if fmtName == null

     

       10
       -
           then null

     

       11
        
           else let

     

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

     

       13
        
           in

     
···

       19
        
               };

     

       20
        
             }

     

       21
        
             else if f.type == "lsp"

     

       22
       -
             then {

     

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

     

       24
       -
             }

     

       25
        
             else null;

     

       26
        
       

     

       27
        
         mkZedLanguage = name: lang:

     
···

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

     

       32
        
           };

     

       33
        
       

     

       34
       -
         mkZedLsp = name: srv: let

     

       35
       -
           args = srv.args or [];

     

       36
       -
           cfg = srv.config or {};

     

       37
       -
           hasArgs = args != [];

     

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

     

       39
       -
         in

     

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

     

       41
       -
             {

     

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

     

       43
       -
                 {path = srv.command;}

     

       44
       -
                 // (

     

       45
       -
                   if hasArgs

     

       46
       -
                   then {arguments = args;}

     

       47
       -
                   else {}

     

       48
       -
                 )

     

       49
       -
               );

     

       50
       -
             }

     

       51
       -
             // (

     

       52
       -
               if hasSettings

     

       53
       -
               then {settings = cfg;}

     

       54
       -
               else {}

     

       55
       -
             )

     

       56
       -
           );

     

       57
        
       in {

     

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

     

       59
        
       

     
···

       71
        
               "scss"

     

       72
        
               "toml"

     

       73
        
               "biome"

     

       74
       -
               "superhtml"

     

       75
        
               "marksman"

     

       76
        
               "makefile"

     

       77
        
               "zig"

     
···

       144
        
               }

     

       145
        
             ];

     

       146
        
             userKeymaps = [

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       147
        
               {

     

       148
        
                 context = "Workspace";

     

       149
        
                 bindings = {

···

       7
        
       

     

       8
        
         mkZedFormatter = fmtName:

     

       9
        
           if fmtName == null

     

       10
       +
           then "language_server"

     

       11
        
           else let

     

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

     

       13
        
           in

     
···

       19
        
               };

     

       20
        
             }

     

       21
        
             else if f.type == "lsp"

     

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

     

       0
        
       
     

       0
        
       
     

       23
        
             else null;

     

       24
        
       

     

       25
        
         mkZedLanguage = name: lang:

     
···

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

     

       30
        
           };

     

       31
        
       

     

       32
       +
         mkZedLsp = name: srv:

     

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

     

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

     

       35
       +
               path = srv.command;

     

       36
       +
               arguments = srv.args or null;

     

       37
       +
             };

     

       38
       +
             settings = srv.config or null;

     

       39
       +
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       40
        
       in {

     

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

     

       42
        
       

     
···

       54
        
               "scss"

     

       55
        
               "toml"

     

       56
        
               "biome"

     

       57
       +
               #"superhtml"

     

       58
        
               "marksman"

     

       59
        
               "makefile"

     

       60
        
               "zig"

     
···

       127
        
               }

     

       128
        
             ];

     

       129
        
             userKeymaps = [

     

       130
       +
               {

     

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

     

       132
       +
                 bindings = {

     

       133
       +
                   n = "vim::WrappingLeft";

     

       134
       +
                   e = "vim::Down";

     

       135
       +
                   i = "vim::Up";

     

       136
       +
                   o = "vim::WrappingRight";

     

       137
       +
                 };

     

       138
       +
               }

     

       139
       +
               {

     

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

     

       141
       +
                 bindings = {

     

       142
       +
                   j = "vim::NextWordEnd";

     

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

     

       144
       +
                   k = "vim::MoveToNextMatch";

     

       145
       +
                   K = "vim::MoveToPreviousMatch";

     

       146
       +
                   l = "vim::HelixInsert";

     

       147
       +
                   L = "vim::InsertFirstNonWhitespace";

     

       148
       +
                   h = "vim::InsertLineBelow";

     

       149
       +
                   H = "vim::InsertLineAbove";

     

       150
       +
                 };

     

       151
       +
               }

     

       152
        
               {

     

       153
        
                 context = "Workspace";

     

       154
        
                 bindings = {

+19 -23

modules/home/snippets/editor/default.nix

···

       6
        
         # Helper function to create language server definitions

     

       7
        
         mkLspServer = name: {

     

       8
        
           command,

     

       9
       -
           args ? [],

     

       10
       -
           config ? {},

     

       0
        
       
     

       11
        
         }: {

     

       12
       -
           inherit name command args config;

     

       13
        
         };

     

       14
        
       

     

       15
        
         # Helper function to create formatter definitions

     

       16
        
         mkFormatter = name: {

     

       17
        
           type,

     

       18
        
           command ? null,

     

       19
       -
           args ? [],

     

       20
        
           lspName ? null,

     

       21
       -
           config ? {},

     

       22
        
         }: {

     

       23
        
           inherit name type command args lspName config;

     

       24
        
         };

     
···

       27
        
         mkLanguage = name: {

     

       28
        
           full-name ? name,

     

       29
        
           auto-format ? true,

     

       30
       -
           file-types ? [],

     

       31
        
           language-servers ? [],

     

       32
        
           zed-only-language-servers ? [],

     

       33
        
           helix-only-language-servers ? [],

     

       34
        
           formatter ? null,

     

       35
        
           helix-formatter ? null,

     

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

     

       37
        
         }: {

     

       38
        
           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;

     

       39
        
         };

     
···

       53
        
             };

     

       54
        
       

     

       55
        
             tailwindcss-language-server = mkLspServer "tailwindcss-language-server" {

     

       56
       -
               command = let

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       57
        
                 fd = lib.getExe pkgs.fd;

     

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

     

       59
        
                 grep = lib.getExe pkgs.gnugrep;

     

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

     

       61
        
                 bun = lib.getExe pkgs.bun;

     

       62
        
                 twls = lib.getExe pkgs.tailwindcss-language-server;

     

       63
       -
                 printf = "${pkgs.uutils-coreutils-noprefix}/bin/printf";

     

       64
        
               in

     

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

     

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

     

       67
        
       

     

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

     

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

     

       70
       -
                     ${echo} "No tailwindcss found in project; faking clean LSP exit." >&2

     

       71
        
       

     

       72
       -
                     # Send a fake LSP shutdown + exit sequence to stdout.

     

       73
       -
                     ${printf} 'Content-Length: 47\r\n\r\n{"jsonrpc":"2.0","id":1,"method":"shutdown"}'

     

       74
       -
                     ${printf} 'Content-Length: 41\r\n\r\n{"jsonrpc":"2.0","method":"exit"}'

     

       75
       -
       

     

       76
       -
                     # Exit with success so the client treats this as a normal termination.

     

       77
        
                     exit 0

     

       78
        
                   fi

     

       79
        
       

     
···

       189
        
           formatters = {

     

       190
        
             biome = mkFormatter "biome" {

     

       191
        
               type = "lsp";

     

       192
       -
               lspName = "biome";

     

       193
        
             };

     

       194
        
       

     

       195
        
             biomeHtml = mkFormatter "biomeHtml" {

     
···

       410
        
               formatter = "gdscript-formatter";

     

       411
        
             };

     

       412
        
       

     

       413
       -
             ruby = mkLanguage "ruby" {

     

       414
       -
               full-name = "Ruby";

     

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

     

       416
       -
             };

     

       417
        
           };

     

       418
        
         };

     

       419
        
       }

···

       6
        
         # Helper function to create language server definitions

     

       7
        
         mkLspServer = name: {

     

       8
        
           command,

     

       9
       +
           helix-command ? null,

     

       10
       +
           args ? null,

     

       11
       +
           config ? null,

     

       12
        
         }: {

     

       13
       +
           inherit name command helix-command args config;

     

       14
        
         };

     

       15
        
       

     

       16
        
         # Helper function to create formatter definitions

     

       17
        
         mkFormatter = name: {

     

       18
        
           type,

     

       19
        
           command ? null,

     

       20
       +
           args ? null,

     

       21
        
           lspName ? null,

     

       22
       +
           config ? null,

     

       23
        
         }: {

     

       24
        
           inherit name type command args lspName config;

     

       25
        
         };

     
···

       28
        
         mkLanguage = name: {

     

       29
        
           full-name ? name,

     

       30
        
           auto-format ? true,

     

       31
       +
           file-types ? null,

     

       32
        
           language-servers ? [],

     

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

     

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

     

       35
        
           formatter ? null,

     

       36
        
           helix-formatter ? null,

     

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

     

       38
        
         }: {

     

       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;

     

       40
        
         };

     
···

       54
        
             };

     

       55
        
       

     

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

     

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

     

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

     

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

     

       60
       +
               '';

     

       61
       +
               helix-command = let

     

       62
        
                 fd = lib.getExe pkgs.fd;

     

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

     

       64
        
                 grep = lib.getExe pkgs.gnugrep;

     

       0
        
       
     

       65
        
                 bun = lib.getExe pkgs.bun;

     

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

     

       0
        
       
     

       67
        
               in

     

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

     

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

     

       70
        
       

     

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

     

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

     

       0
        
       
     

       73
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       74
        
                     exit 0

     

       75
        
                   fi

     

       76
        
       

     
···

       186
        
           formatters = {

     

       187
        
             biome = mkFormatter "biome" {

     

       188
        
               type = "lsp";

     

       0
        
       
     

       189
        
             };

     

       190
        
       

     

       191
        
             biomeHtml = mkFormatter "biomeHtml" {

     
···

       406
        
               formatter = "gdscript-formatter";

     

       407
        
             };

     

       408
        
       

     

       409
       +
             #ruby = mkLanguage "ruby" {

     

       410
       +
             #  full-name = "Ruby";

     

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

     

       412
       +
             #};

     

       413
        
           };

     

       414
        
         };

     

       415
        
       }

+24

modules/nixos/desktop/cosmic/default.nix

···

       1
       +
       {

     

       2
       +
         config,

     

       3
       +
         lib,

     

       4
       +
         pkgs,

     

       5
       +
         ...

     

       6
       +
       }: {

     

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

     

       8
       +
       

     

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

     

       10
       +
           home-manager.sharedModules = [

     

       11
       +
             {

     

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

     

       13
       +
             }

     

       14
       +
           ];

     

       15
       +
       

     

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

     

       17
       +
             cosmic-store

     

       18
       +
           ];

     

       19
       +
       

     

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

     

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

     

       22
       +
           myNixOS.desktop.enable = true;

     

       23
       +
         };

     

       24
       +
       }

modules/nixos/desktop/default.nix

···

       7
        
         imports = [

     

       8
        
           ./gnome

     

       9
        
           ./plasma

     

       0
        
       
     

       10
        
         ];

     

       11
        
       

     

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

···

       7
        
         imports = [

     

       8
        
           ./gnome

     

       9
        
           ./plasma

     

       10
       +
           ./cosmic

     

       11
        
         ];

     

       12
        
       

     

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

+2 -3

modules/nixos/desktop/gnome/default.nix

···

       51
        
             ];

     

       52
        
           };

     

       53
        
       

     

       54
       -
           myNixOS = {

     

       55
       -
             desktop.enable = true;

     

       56
       -
           };

     

       57
        
       

     

       58
        
           #qt = {

     

       59
        
           #  enable = true;

···

       51
        
             ];

     

       52
        
           };

     

       53
        
       

     

       54
       +
           myNixOS.desktop.enable = true;

     

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

     

       0
        
       
     

       56
        
       

     

       57
        
           #qt = {

     

       58
        
           #  enable = true;

modules/nixos/desktop/plasma/default.nix

···

       21
        
           ];

     

       22
        
       

     

       23
        
           services.desktopManager.plasma6.enable = true;

     

       0
        
       
     

       0
        
       
     

       24
        
         };

     

       25
        
       }

···

       21
        
           ];

     

       22
        
       

     

       23
        
           services.desktopManager.plasma6.enable = true;

     

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

     

       25
       +
           myNixOS.desktop.enable = true;

     

       26
        
         };

     

       27
        
       }

-2

modules/nixos/profiles/workstation/default.nix

···

       111
        
               enableSystemSlice = true;

     

       112
        
               enableUserSlices = true;

     

       113
        
             };

     

       114
       -
             # i hate these guys

     

       115
       -
             coredump.enable = false;

     

       116
        
           };

     

       117
        
       

     

       118
        
           zramSwap = {

···

       111
        
               enableSystemSlice = true;

     

       112
        
               enableUserSlices = true;

     

       113
        
             };

     

       0
        
       
     

       0
        
       
     

       114
        
           };

     

       115
        
       

     

       116
        
           zramSwap = {

Compare changes