commit 612f4f40939499c97e3f2e338adde47821f153ad · ryan.freumh.org/nixos

+1 -3

home/calendar.nix

···

       26
       26
        
             };

     

       27
       27
        
           };

     

       28
       28
        
       

     

       29
       29
       -
           services = {

     

       30
       30
       -
             gpg-agent.enable = true;

     

       31
       31
       -
           };

     

       29
       29
       +
           services = { gpg-agent.enable = true; };

     

       32
       30
        
       

     

       33
       31
        
           accounts.calendar = {

     

       34
       32
        
             basePath = "calendar";

+3 -4

home/i3.nix

···

       1
       1
        
       { pkgs, config, lib, ... }@inputs:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         i3-workspace-history = inputs.i3-workspace-history.packages.${pkgs.stdenv.hostPlatform.system}.default;

     

       4
       4
       +
         i3-workspace-history =

     

       5
       5
       +
           inputs.i3-workspace-history.packages.${pkgs.stdenv.hostPlatform.system}.default;

     

       5
       6
        
         replacements = {

     

       6
       7
        
           wm = "i3";

     

       7
       8
        
           wmmsg = "i3-msg";

     
···

       30
       31
        
           # TODO

     

       31
       32
        
           # idling

     

       32
       33
        
       

     

       33
       33
       -
           home.packages = with pkgs; [

     

       34
       34
       -
             i3-workspace-history

     

       35
       35
       -
           ];

     

       34
       34
       +
           home.packages = with pkgs; [ i3-workspace-history ];

     

       36
       35
        
       

     

       37
       36
        
           home.pointerCursor.x11.enable = true;

     

       38
       37

+3 -4

home/sway.nix

···

       1
       1
        
       { pkgs, config, lib, ... }@inputs:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         i3-workspace-history = inputs.i3-workspace-history.packages.${pkgs.stdenv.hostPlatform.system}.default;

     

       4
       4
       +
         i3-workspace-history =

     

       5
       5
       +
           inputs.i3-workspace-history.packages.${pkgs.stdenv.hostPlatform.system}.default;

     

       5
       6
        
         replacements = {

     

       6
       7
        
           wm = "sway";

     

       7
       8
        
           wmmsg = "swaymsg";

     
···

       29
       30
        
         options.custom.gui.sway.enable = lib.mkEnableOption "sway";

     

       30
       31
        
       

     

       31
       32
        
         config = lib.mkIf cfg.enable {

     

       32
       32
       -
           home.packages = with pkgs; [

     

       33
       33
       -
             i3-workspace-history

     

       34
       34
       -
           ];

     

       33
       33
       +
           home.packages = with pkgs; [ i3-workspace-history ];

     

       35
       34
        
       

     

       36
       35
        
           home.file.".zprofile".text = ''

     

       37
       36
        
             # Autostart sway at login on TTY 1

+2 -3

hosts/elephant/default.nix

···

       57
       57
        
           ];

     

       58
       58
        
         };

     

       59
       59
        
         nixpkgs.config.packageOverrides = prev: {

     

       60
       60
       -
           jellyfin-ffmpeg = prev.jellyfin-ffmpeg.overrideAttrs (_: {

     

       61
       61
       -
             withVpl = true;

     

       62
       62
       -
           });

     

       60
       60
       +
           jellyfin-ffmpeg =

     

       61
       61
       +
             prev.jellyfin-ffmpeg.overrideAttrs (_: { withVpl = true; });

     

       63
       62
        
         };

     

       64
       63
        
       }

+1 -4

hosts/gecko/default.nix

···

       1
       1
        
       { pkgs, lib, config, ... }:

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
       -
         imports = [

     

       5
       5
       -
           ./hardware-configuration.nix

     

       6
       6
       -
           ./backups.nix

     

       7
       7
       -
         ];

     

       4
       4
       +
         imports = [ ./hardware-configuration.nix ./backups.nix ];

     

       8
       5
        
       

     

       9
       6
        
         custom = {

     

       10
       7
        
           enable = true;

+3 -3

hosts/owl/default.nix

···

       1
       1
        
       { pkgs, config, lib, eon, ... }@inputs:

     

       2
       2
        
       

     

       3
       3
       -
       let vpnRecords = [

     

       3
       3
       +
       let

     

       4
       4
       +
         vpnRecords = [

     

       4
       5
        
           {

     

       5
       6
        
             name = "nix-cache.vpn.${config.networking.domain}";

     

       6
       7
        
             type = "A";

     
···

       22
       23
        
             value = "100.64.0.9";

     

       23
       24
        
           }

     

       24
       25
        
         ];

     

       25
       25
       -
       in

     

       26
       26
       -
       {

     

       26
       26
       +
       in {

     

       27
       27
        
         imports = [

     

       28
       28
        
           ./hardware-configuration.nix

     

       29
       29
        
           ./minimal.nix

+3 -1

modules/home-manager.nix

···

       7
       7
        
         config = lib.mkIf cfg.enable {

     

       8
       8
        
           home-manager = {

     

       9
       9
        
             useGlobalPkgs = true;

     

       10
       10
       -
             extraSpecialArgs = { i3-workspace-history = inputs.i3-workspace-history; };

     

       10
       10
       +
             extraSpecialArgs = {

     

       11
       11
       +
               i3-workspace-history = inputs.i3-workspace-history;

     

       12
       12
       +
             };

     

       11
       13
        
             users.${config.custom.username} = import ../home/default.nix;

     

       12
       14
        
           };

     

       13
       15
        
           # zsh completion