commit bc85bfa6cede76c6bfc099b1eae915b6a24bf971 · pci.express/dotfiles

+12 -2

flake.nix

···

       19
       19
        
                   }

     

       20
       20
        
                 )

     

       21
       21
        
               );

     

       22
       22
       +
             dumb-manager = import ./lib/dumb-manager.nix;

     

       22
       23
        
           in

     

       23
       24
        
           {

     

       24
       25
        
             nixosConfigurations = {

     
···

       31
       32
        
               };

     

       32
       33
        
             };

     

       33
       34
        
             packages = forAllSystems (pkgs: {

     

       34
       34
       -
               # Too lazy to do callPackage...

     

       35
       35
       -
               mac-home = (import ./home/mac) pkgs;

     

       35
       35
       +
               # mac-home = (import ./home/mac) {inherit pkgs;};

     

       36
       36
       +
               mac-home = dumb-manager.configuration {

     

       37
       37
       +
                 inherit pkgs nixpkgs;

     

       38
       38
       +
                 module = ./home/mac;

     

       39
       39
       +
               };

     

       36
       40
        
             });

     

       41
       41
       +
             # apps = forAllSystems (pkgs: {

     

       42
       42
       +
             #   update-links = {

     

       43
       43
       +
             #     type = "app";

     

       44
       44
       +
             #     program = "${self.packages.${pkgs.system}.update-links}";

     

       45
       45
       +
             #   };

     

       46
       46
       +
             # });

     

       37
       47
        
             formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);

     

       38
       48
        
           };

     

       39
       49
        
       }

+5 -5

home/mac/default.nix

···

       1
       1
       -
       pkgs:

     

       2
       2
       -
       

     

       3
       3
       -
       pkgs.buildEnv {

     

       4
       4
       -
         name = "mac-home";

     

       5
       5
       -
         paths = with pkgs; [

     

       1
       1
       +
       { pkgs }:

     

       2
       2
       +
       {

     

       3
       3
       +
         username = "user";

     

       4
       4
       +
         homeDirectory = "/Users/user";

     

       5
       5
       +
         packages = with pkgs; [

     

       6
       6
        
           zig

     

       7
       7
        
           flashrom

     

       8
       8
        
           tree

+20

lib/dumb-manager.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         configuration =

     

       3
       3
       +
           {

     

       4
       4
       +
             pkgs,

     

       5
       5
       +
             nixpkgs,

     

       6
       6
       +
             module,

     

       7
       7
       +
           }:

     

       8
       8
       +
           let

     

       9
       9
       +
             cfg = (import module) { inherit pkgs; };

     

       10
       10
       +
             inherit (cfg) homeDirectory;

     

       11
       11
       +
             update-links = import ./update-links.nix;

     

       12
       12
       +
             packages = (cfg.packages or [ ]) ++ [

     

       13
       13
       +
               (update-links { inherit pkgs nixpkgs homeDirectory; })

     

       14
       14
       +
             ];

     

       15
       15
       +
           in

     

       16
       16
       +
           pkgs.buildEnv {

     

       17
       17
       +
             name = "dumb-manager";

     

       18
       18
       +
             paths = packages;

     

       19
       19
       +
           };

     

       20
       20
       +
       }

+33

lib/update-links.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         nixpkgs,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         homeDirectory,

     

       5
       5
       +
       }:

     

       6
       6
       +
       let

     

       7
       7
       +
         registry = {

     

       8
       8
       +
           flakes = [

     

       9
       9
       +
             {

     

       10
       10
       +
               exact = true;

     

       11
       11
       +
               from = {

     

       12
       12
       +
                 id = "n";

     

       13
       13
       +
                 type = "indirect";

     

       14
       14
       +
               };

     

       15
       15
       +
               to = {

     

       16
       16
       +
                 path = "${nixpkgs}";

     

       17
       17
       +
                 type = "path";

     

       18
       18
       +
               };

     

       19
       19
       +
             }

     

       20
       20
       +
           ];

     

       21
       21
       +
           version = 2;

     

       22
       22
       +
         };

     

       23
       23
       +
         registryFile = pkgs.writeTextFile {

     

       24
       24
       +
           name = "registry.json";

     

       25
       25
       +
           destination = "/.config/nix/registry.json";

     

       26
       26
       +
           text = builtins.toJSON registry;

     

       27
       27
       +
         };

     

       28
       28
       +
       in

     

       29
       29
       +
       pkgs.writeShellScriptBin "update-links" ''

     

       30
       30
       +
         #!/usr/bin/env bash

     

       31
       31
       +
         mkdir -p ${homeDirectory}/.config/nix

     

       32
       32
       +
         ln -sf ${registryFile}/.config/nix/registry.json ${homeDirectory}/.config/nix/registry.json

     

       33
       33
       +
       ''