commit 35311a132c57e110fdc17a7925131e48b47cfdf0 · kitten.sh/system

+8 -2

home/apps/ollama.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       let

     

       5
       5
        
         cfg = config.modules.apps;

     

       6
       6
       +
         ollama = cfg.ollama.package;

     

       6
       7
        
         ollamaArgs = [

     

       7
       7
       -
           "${pkgs.ollama}/bin/ollama"

     

       8
       8
       +
           "${ollama}/bin/ollama"

     

       8
       9
        
           "serve"

     

       9
       10
        
         ];

     

       10
       11
        
       

     
···

       22
       23
        
             default = false;

     

       23
       24
        
             description = "Whether to enable Ollama.";

     

       24
       25
        
             type = types.bool;

     

       26
       26
       +
           };

     

       27
       27
       +
       

     

       28
       28
       +
           package = mkOption {

     

       29
       29
       +
             default = pkgs.ollama;

     

       30
       30
       +
             type = types.package;

     

       25
       31
        
           };

     

       26
       32
        
       

     

       27
       33
        
           host = mkOption {

     
···

       63
       69
        
       

     

       64
       70
        
         config = mkIf (cfg.enable && cfg.ollama.enable) (mkMerge [

     

       65
       71
        
           {

     

       66
       66
       -
             home.packages = [ pkgs.ollama ];

     

       72
       72
       +
             home.packages = [ ollama ];

     

       67
       73
        
           }

     

       68
       74
        
       

     

       69
       75
        
           (helpers.mkIfLinux {

+12 -2

machines/pepper/home.nix

···

       1
       1
       -
       { ... }:

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         modules = {

     

       5
       5
        
           desktop.enable = true;

     

       6
       6
       -
           development.enable = false;

     

       6
       6
       +
           development = {

     

       7
       7
       +
             enable = true;

     

       8
       8
       +
             zig.enable = false;

     

       9
       9
       +
             react-native.enable = false;

     

       10
       10
       +
             terraform.enable = false;

     

       11
       11
       +
           };

     

       7
       12
        
           apps = {

     

       8
       13
        
             enable = true;

     

       9
       14
        
             discord.enable = true;

     

       10
       15
        
             ghostty.enable = true;

     

       11
       16
        
             zen-browser.enable = true;

     

       17
       17
       +
             ollama = {

     

       18
       18
       +
               enable = true;

     

       19
       19
       +
               package = pkgs.ollama-rocm;

     

       20
       20
       +
               flashAttention = true;

     

       21
       21
       +
             };

     

       12
       22
        
           };

     

       13
       23
        
         };

     

       14
       24
        
       }