commit a453e5c0e5bcfb6e6e47bd0e161413d37e11b8ab · ptr.pet/ark

+5 -1

hosts/default.nix

···

       17
       17
        
             modules =

     

       18
       18
        
               baseModules

     

       19
       19
        
               ++ [

     

       20
       20
       -
                 {nixpkgs.pkgs = pkgs;}

     

       20
       20
       +
                 {

     

       21
       21
       +
                   nixpkgs = {

     

       22
       22
       +
                     inherit pkgs;

     

       23
       23
       +
                   };

     

       24
       24
       +
                 }

     

       21
       25
        
                 (import (./. + "/${name}/default.nix"))

     

       22
       26
        
               ];

     

       23
       27
        
             specialArgs = {

+2 -1

modules/base/default.nix

···

       7
       7
        
         ...

     

       8
       8
        
       }: let

     

       9
       9
        
         inherit (lib) fileContents mkIf;

     

       10
       10
       -
         inherit (tlib) pkgBin;

     

       11
       10
        
       

     

       12
       11
        
         coreBin = v: "${pkgs.coreutils}/bin/${v}";

     

       13
       12
        
         nixBin = "${config.nix.package}/bin/nix";

     

       13
       13
       +
         pkgBin = tlib.pkgBin pkgs;

     

       14
       14
        
       in {

     

       15
       15
        
         imports = [

     

       16
       16
        
           ./nix.nix

     
···

       144
       144
        
         '';

     

       145
       145
        
         users.mutableUsers = false;

     

       146
       146
        
         programs.command-not-found.enable = false;

     

       147
       147
       +
         nixpkgs.config.allowUnfree = true;

     

       147
       148
        
       }

+2

pkgs-set/default.nix

···

       10
       10
        
           (lib.readDir ./overlays);

     

       11
       11
        
         unstablePkgs = import unstable {

     

       12
       12
        
           inherit system;

     

       13
       13
       +
           config.allowUnfree = true;

     

       13
       14
        
         };

     

       14
       15
        
         pkgs = import stable {

     

       15
       16
        
           inherit system;

     

       17
       17
       +
           config.allowUnfree = true;

     

       16
       18
        
           overlays = [(_: _: import ./from-unstable.nix unstablePkgs)] ++ overlays;

     

       17
       19
        
         };

     

       18
       20
        
       in

+2

pkgs-set/from-unstable.nix

···

       5
       5
        
           alejandra

     

       6
       6
        
           rnix-lsp

     

       7
       7
        
           chromium

     

       8
       8
       +
           rofi-wayland

     

       9
       9
       +
           vscode

     

       8
       10
        
           ;

     

       9
       11
        
       }

+1 -1

users/patriot/default.nix

···

       308
       308
        
           };

     

       309
       309
        
           wayland.windowManager = {

     

       310
       310
        
             sway = let

     

       311
       311
       -
               mkRofiCmd = args: "${config.programs.rofi.finalPackage}/bin/rofi ${lib.concatStringsSep " " args} | ${pkgs.sway}/bin/swaymsg --";

     

       311
       311
       +
               mkRofiCmd = args: "${config.programs.rofi.package}/bin/rofi ${lib.concatStringsSep " " args} | ${pkgs.sway}/bin/swaymsg --";

     

       312
       312
        
             in {

     

       313
       313
        
               enable = true;

     

       314
       314
        
               extraSessionCommands = extraEnv;