commit 64dea74b5d74ac3ac574fce2c6060627eff1dda7 · sapphic.moe/flake

+2 -2

modules/base/nix.nix

···

       10
        
       

     

       11
        
           # Optimize symlinks.

     

       12
        
           optimise.automatic = true;

     

       13
       -
           

     

       14
        
           settings = {

     

       15
        
             # Literally a CVE waiting to happen.

     

       16
        
             accept-flake-config = false;

     
···

       47
        
           };

     

       48
        
         };

     

       49
        
       

     

       50
       -
         # Allow unfree packages. 

     

       51
        
         # This is sadly not enough as I still have to pass the --impure flag. Yawn.

     

       52
        
         nixpkgs.config.allowUnfree = true;

     

       53
        
       }

···

       10
        
       

     

       11
        
           # Optimize symlinks.

     

       12
        
           optimise.automatic = true;

     

       13
       +
       

     

       14
        
           settings = {

     

       15
        
             # Literally a CVE waiting to happen.

     

       16
        
             accept-flake-config = false;

     
···

       47
        
           };

     

       48
        
         };

     

       49
        
       

     

       50
       +
         # Allow unfree packages.

     

       51
        
         # This is sadly not enough as I still have to pass the --impure flag. Yawn.

     

       52
        
         nixpkgs.config.allowUnfree = true;

     

       53
        
       }

+1 -1

modules/darwin/environment/default.nix

···

       2
        
         imports = [

     

       3
        
           ./locale.nix

     

       4
        
         ];

     

       5
       -
       }

···

       2
        
         imports = [

     

       3
        
           ./locale.nix

     

       4
        
         ];

     

       5
       +
       }

+1 -1

modules/darwin/environment/locale.nix

···

       4
        
           AppleMetricUnits = 1;

     

       5
        
           AppleTemperatureUnit = "Celsius";

     

       6
        
         };

     

       7
       -
       }

···

       4
        
           AppleMetricUnits = 1;

     

       5
        
           AppleTemperatureUnit = "Celsius";

     

       6
        
         };

     

       7
       +
       }

+1 -1

modules/darwin/extras.nix

···

       4
        
         imports = [

     

       5
        
           inputs.home-manager.darwinModules.home-manager

     

       6
        
         ];

     

       7
       -
       }

···

       4
        
         imports = [

     

       5
        
           inputs.home-manager.darwinModules.home-manager

     

       6
        
         ];

     

       7
       +
       }

+2 -2

modules/darwin/homebrew.nix

···

       2
        
         # Enable Homebrew

     

       3
        
         homebrew = {

     

       4
        
           enable = true;

     

       5
       -
           

     

       6
        
           # Update Homebrew and upgrade all packages on activation

     

       7
        
           onActivation = {

     

       8
        
             autoUpdate = true;

     
···

       11
        
           };

     

       12
        
       

     

       13
        
           # Taps (third-party repositories)

     

       14
       -
           taps = [];

     

       15
        
       

     

       16
        
           # Formulae (CLI tools)

     

       17
        
           brews = [

···

       2
        
         # Enable Homebrew

     

       3
        
         homebrew = {

     

       4
        
           enable = true;

     

       5
       +
       

     

       6
        
           # Update Homebrew and upgrade all packages on activation

     

       7
        
           onActivation = {

     

       8
        
             autoUpdate = true;

     
···

       11
        
           };

     

       12
        
       

     

       13
        
           # Taps (third-party repositories)

     

       14
       +
           taps = [ ];

     

       15
        
       

     

       16
        
           # Formulae (CLI tools)

     

       17
        
           brews = [

+1 -1

modules/darwin/legacy.nix

···

       4
        
         # See https://nix-darwin.github.io/nix-darwin/manual/#opt-system.primaryUser.

     

       5
        
       

     

       6
        
         system.primaryUser = "chloe";

     

       7
       -
       }

···

       4
        
         # See https://nix-darwin.github.io/nix-darwin/manual/#opt-system.primaryUser.

     

       5
        
       

     

       6
        
         system.primaryUser = "chloe";

     

       7
       +
       }

+1 -1

modules/darwin/nix.nix

···

       16
        
             "x86-64-darwin"

     

       17
        
           ];

     

       18
        
         };

     

       19
       -
       }

···

       16
        
             "x86-64-darwin"

     

       17
        
           ];

     

       18
        
         };

     

       19
       +
       }

+1 -1

modules/darwin/packages.nix

···

       4
        
         environment.systemPackages = with pkgs; [

     

       5
        
           nh

     

       6
        
         ];

     

       7
       -
       }

···

       4
        
         environment.systemPackages = with pkgs; [

     

       5
        
           nh

     

       6
        
         ];

     

       7
       +
       }

+1 -1

modules/darwin/preferences/default.nix

···

       5
        
           ./keyboard.nix

     

       6
        
           ./trackpad.nix

     

       7
        
         ];

     

       8
       -
       }

···

       5
        
           ./keyboard.nix

     

       6
        
           ./trackpad.nix

     

       7
        
         ];

     

       8
       +
       }

+1 -1

modules/darwin/preferences/dock.nix

···

       5
        
           tilesize = 52;

     

       6
        
           minimize-to-application = true;

     

       7
        
         };

     

       8
       -
       }

···

       5
        
           tilesize = 52;

     

       6
        
           minimize-to-application = true;

     

       7
        
         };

     

       8
       +
       }

+1 -1

modules/darwin/preferences/finder.nix

···

       4
        
           ShowPathbar = true;

     

       5
        
           FXEnableExtensionChangeWarning = false;

     

       6
        
         };

     

       7
       -
       }

···

       4
        
           ShowPathbar = true;

     

       5
        
           FXEnableExtensionChangeWarning = false;

     

       6
        
         };

     

       7
       +
       }

+1 -1

modules/darwin/preferences/keyboard.nix

···

       1
        
       {

     

       2
        
         system.keyboard.enableKeyMapping = true;

     

       3
       -
       }

···

       1
        
       {

     

       2
        
         system.keyboard.enableKeyMapping = true;

     

       3
       +
       }

+1 -1

modules/darwin/preferences/trackpad.nix

···

       3
        
           Clicking = true;

     

       4
        
           Dragging = true;

     

       5
        
         };

     

       6
       -
       }

···

       3
        
           Clicking = true;

     

       4
        
           Dragging = true;

     

       5
        
         };

     

       6
       +
       }

+1 -1

modules/darwin/security/default.nix

···

       2
        
         imports = [

     

       3
        
           ./pam.nix

     

       4
        
         ];

     

       5
       -
       }

···

       2
        
         imports = [

     

       3
        
           ./pam.nix

     

       4
        
         ];

     

       5
       +
       }

+1 -1

modules/darwin/security/pam.nix

···

       1
        
       {

     

       2
        
         # Enable Touch ID authentication for sudo

     

       3
        
         security.pam.services.sudo_local.touchIdAuth = true;

     

       4
       -
       }

···

       1
        
       {

     

       2
        
         # Enable Touch ID authentication for sudo

     

       3
        
         security.pam.services.sudo_local.touchIdAuth = true;

     

       4
       +
       }

+1 -1

modules/nixos/boot/default.nix

···

       5
        
           ./grub.nix

     

       6
        
           ./systemd-boot.nix

     

       7
        
         ];

     

       8
       -
       }

···

       5
        
           ./grub.nix

     

       6
        
           ./systemd-boot.nix

     

       7
        
         ];

     

       8
       +
       }

+9 -7

modules/nixos/boot/systemd-boot.nix

···

       9
        
           };

     

       10
        
         };

     

       11
        
       

     

       12
       -
         config = lib.mkIf (config.settings.bootloader.enable && config.settings.bootloader.systemd-boot.enable) {

     

       13
       -
           boot.loader = {

     

       14
       -
             timeout = 2;

     

       15
       -
             systemd-boot.enable = true;

     

       16
       -
             efi.canTouchEfiVariables = true;

     

       17
       -
           };

     

       18
       -
         };

     

       0
        
       
     

       0
        
       
     

       19
        
       }

···

       9
        
           };

     

       10
        
         };

     

       11
        
       

     

       12
       +
         config =

     

       13
       +
           lib.mkIf (config.settings.bootloader.enable && config.settings.bootloader.systemd-boot.enable)

     

       14
       +
             {

     

       15
       +
               boot.loader = {

     

       16
       +
                 timeout = 2;

     

       17
       +
                 systemd-boot.enable = true;

     

       18
       +
                 efi.canTouchEfiVariables = true;

     

       19
       +
               };

     

       20
       +
             };

     

       21
        
       }

+1 -1

modules/nixos/environment/default.nix

···

       2
        
         imports = [

     

       3
        
           ./locale.nix

     

       4
        
         ];

     

       5
       -
       }

···

       2
        
         imports = [

     

       3
        
           ./locale.nix

     

       4
        
         ];

     

       5
       +
       }

+1 -1

modules/nixos/extras.nix

···

       4
        
         imports = [

     

       5
        
           inputs.home-manager.nixosModules.home-manager

     

       6
        
         ];

     

       7
       -
       }

···

       4
        
         imports = [

     

       5
        
           inputs.home-manager.nixosModules.home-manager

     

       6
        
         ];

     

       7
       +
       }

+7 -2

modules/nixos/hardware/bluetooth.nix

···

       1
       -
       { lib, config, types, ... }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
        
       {

     

       4
        
         options.hardware.bluetooth.enable = {

     
···

       10
        
         config = {

     

       11
        
           hardware.bluetooth.enable = lib.mkIf config.hardware.bluetooth.enable true;

     

       12
        
         };

     

       13
       -
       }

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         config,

     

       4
       +
         types,

     

       5
       +
         ...

     

       6
       +
       }:

     

       7
        
       

     

       8
        
       {

     

       9
        
         options.hardware.bluetooth.enable = {

     
···

       15
        
         config = {

     

       16
        
           hardware.bluetooth.enable = lib.mkIf config.hardware.bluetooth.enable true;

     

       17
        
         };

     

       18
       +
       }

+1 -1

modules/nixos/hardware/video.nix

···

       7
        
             enable32Bit = true;

     

       8
        
           };

     

       9
        
         };

     

       10
       -
       }

···

       7
        
             enable32Bit = true;

     

       8
        
           };

     

       9
        
         };

     

       10
       +
       }

+1 -1

modules/nixos/headless.nix

···

       26
        
             AllowHibernation=no

     

       27
        
           '';

     

       28
        
         };

     

       29
       -
       }

···

       26
        
             AllowHibernation=no

     

       27
        
           '';

     

       28
        
         };

     

       29
       +
       }

+1 -1

modules/nixos/networking/default.nix

···

       4
        
           ./networkmanager.nix

     

       5
        
           ./tailscale.nix

     

       6
        
         ];

     

       7
       -
       }

···

       4
        
           ./networkmanager.nix

     

       5
        
           ./tailscale.nix

     

       6
        
         ];

     

       7
       +
       }

+6 -1

modules/nixos/networking/firewall.nix

···

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

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
        
       {

     

       4
        
         options.settings.firewall = {

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         config,

     

       4
       +
         pkgs,

     

       5
       +
         ...

     

       6
       +
       }:

     

       7
        
       

     

       8
        
       {

     

       9
        
         options.settings.firewall = {

+1 -1

modules/nixos/networking/networkmanager.nix

···

       12
        
       

     

       13
        
         # On rebuilds, NetworkManager's wait online process often fails, so we disable it.

     

       14
        
         systemd.services.NetworkManager-wait-online.enable = false;

     

       15
       -
       }

···

       12
        
       

     

       13
        
         # On rebuilds, NetworkManager's wait online process often fails, so we disable it.

     

       14
        
         systemd.services.NetworkManager-wait-online.enable = false;

     

       15
       +
       }

+5 -3

modules/nixos/networking/tailscale.nix

···

       30
        
             };

     

       31
        
           };

     

       32
        
         };

     

       33
       -
         

     

       34
        
         config = lib.mkIf config.settings.tailscale.enable {

     

       35
        
           settings.firewall.allowedUDPPorts = [ config.services.tailscale.port ];

     

       36
        
       

     
···

       43
        
             enable = true;

     

       44
        
             permitCertUid = "root";

     

       45
        
             useRoutingFeatures = lib.mkDefault "server";

     

       46
       -
             extraUpFlags = config.settings.tailscale.defaultFlags ++ lib.optionals config.settings.tailscale.isServer [ "--advertise-exit-node" ];

     

       0
        
       
     

       0
        
       
     

       47
        
           };

     

       48
        
       

     

       49
        
           # A server cannot be a client and vice versa

     
···

       54
        
             }

     

       55
        
           ];

     

       56
        
         };

     

       57
       -
       }

···

       30
        
             };

     

       31
        
           };

     

       32
        
         };

     

       33
       +
       

     

       34
        
         config = lib.mkIf config.settings.tailscale.enable {

     

       35
        
           settings.firewall.allowedUDPPorts = [ config.services.tailscale.port ];

     

       36
        
       

     
···

       43
        
             enable = true;

     

       44
        
             permitCertUid = "root";

     

       45
        
             useRoutingFeatures = lib.mkDefault "server";

     

       46
       +
             extraUpFlags =

     

       47
       +
               config.settings.tailscale.defaultFlags

     

       48
       +
               ++ lib.optionals config.settings.tailscale.isServer [ "--advertise-exit-node" ];

     

       49
        
           };

     

       50
        
       

     

       51
        
           # A server cannot be a client and vice versa

     
···

       56
        
             }

     

       57
        
           ];

     

       58
        
         };

     

       59
       +
       }

+1 -1

modules/nixos/polkit.nix

···

       1
        
       {

     

       2
        
         security.polkit.enable = true; # Enable PolKit for system authentication in 1Password

     

       3
       -
       }

···

       1
        
       {

     

       2
        
         security.polkit.enable = true; # Enable PolKit for system authentication in 1Password

     

       3
       +
       }

+1 -1

modules/nixos/programs/kdeconnect.nix

···

       4
        
         config = lib.mkIf config.settings.desktop.kde.enable {

     

       5
        
           programs.kdeconnect.enable = true;

     

       6
        
         };

     

       7
       -
       }

···

       4
        
         config = lib.mkIf config.settings.desktop.kde.enable {

     

       5
        
           programs.kdeconnect.enable = true;

     

       6
        
         };

     

       7
       +
       }

+1 -1

modules/nixos/programs/nh.nix

···

       1
        
       {

     

       2
        
         programs.nh.enable = true;

     

       3
       -
       }

···

       1
        
       {

     

       2
        
         programs.nh.enable = true;

     

       3
       +
       }

+1 -1

modules/nixos/programs/nix-ld.nix

···

       1
        
       {

     

       2
        
         programs.nix-ld.enable = true;

     

       3
       -
       }

···

       1
        
       {

     

       2
        
         programs.nix-ld.enable = true;

     

       3
       +
       }

+7 -2

modules/nixos/programs/solaar.nix

···

       1
       -
       { lib, config, inputs, ... }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
        
       {

     

       4
        
         imports = [

     
···

       13
        
             batteryIcons = "symbolic";

     

       14
        
           };

     

       15
        
         };

     

       16
       -
       }

···

       1
       +
       {

     

       2
       +
         lib,

     

       3
       +
         config,

     

       4
       +
         inputs,

     

       5
       +
         ...

     

       6
       +
       }:

     

       7
        
       

     

       8
        
       {

     

       9
        
         imports = [

     
···

       18
        
             batteryIcons = "symbolic";

     

       19
        
           };

     

       20
        
         };

     

       21
       +
       }

+1 -1

modules/nixos/services/default.nix

···

       3
        
           ./flatpak.nix

     

       4
        
           ./ssh.nix

     

       5
        
         ];

     

       6
       -
       }

···

       3
        
           ./flatpak.nix

     

       4
        
           ./ssh.nix

     

       5
        
         ];

     

       6
       +
       }

+1 -1

modules/nixos/services/flatpak.nix

···

       4
        
         config = {

     

       5
        
           services.flatpak.enable = config.settings.profiles.graphical.enable;

     

       6
        
         };

     

       7
       -
       }

···

       4
        
         config = {

     

       5
        
           services.flatpak.enable = config.settings.profiles.graphical.enable;

     

       6
        
         };

     

       7
       +
       }

+2 -2

modules/nixos/services/ssh.nix

···

       7
        
             default = true;

     

       8
        
             description = "Enable SSH service";

     

       9
        
           };

     

       10
       -
           

     

       11
        
           passwordAuthentication = lib.mkOption {

     

       12
        
             type = lib.types.bool;

     

       13
        
             default = false;

     

       14
        
             description = "Allow password authentication";

     

       15
        
           };

     

       16
       -
           

     

       17
        
           permitRootLogin = lib.mkOption {

     

       18
        
             type = lib.types.str;

     

       19
        
             default = "no";

···

       7
        
             default = true;

     

       8
        
             description = "Enable SSH service";

     

       9
        
           };

     

       10
       +
       

     

       11
        
           passwordAuthentication = lib.mkOption {

     

       12
        
             type = lib.types.bool;

     

       13
        
             default = false;

     

       14
        
             description = "Allow password authentication";

     

       15
        
           };

     

       16
       +
       

     

       17
        
           permitRootLogin = lib.mkOption {

     

       18
        
             type = lib.types.str;

     

       19
        
             default = "no";

+1 -1

modules/nixos/users.nix

···

       12
        
             ];

     

       13
        
       

     

       14
        
             shell = pkgs.zsh;

     

       15
       -
             

     

       16
        
             openssh.authorizedKeys.keys = [

     

       17
        
               "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEJOAijXc0QNfeoCsQkaB7ybm9G+4EpFthOGy+fy+YbT"

     

       18
        
             ];

···

       12
        
             ];

     

       13
        
       

     

       14
        
             shell = pkgs.zsh;

     

       15
       +
       

     

       16
        
             openssh.authorizedKeys.keys = [

     

       17
        
               "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEJOAijXc0QNfeoCsQkaB7ybm9G+4EpFthOGy+fy+YbT"

     

       18
        
             ];

+1 -1

modules/shared/default.nix

···

       2
        
         imports = [

     

       3
        
           ./profiles.nix

     

       4
        
         ];

     

       5
       -
       }

···

       2
        
         imports = [

     

       3
        
           ./profiles.nix

     

       4
        
         ];

     

       5
       +
       }

+1 -1

modules/wsl/default.nix

···

       13
        
       

     

       14
        
           # Windows manages the firewall for us, so disable NixOS specific firewall settings.

     

       15
        
           settings.firewall.enable = false;

     

       16
       -
           

     

       17
        
           # Allow opening files and links in Windows from WSL

     

       18
        
           environment.variables.BROWSER = "wsl-open";

     

       19
        
         };

···

       13
        
       

     

       14
        
           # Windows manages the firewall for us, so disable NixOS specific firewall settings.

     

       15
        
           settings.firewall.enable = false;

     

       16
       +
       

     

       17
        
           # Allow opening files and links in Windows from WSL

     

       18
        
           environment.variables.BROWSER = "wsl-open";

     

       19
        
         };

+1 -1

modules/wsl/extras.nix

···

       4
        
         imports = [

     

       5
        
           inputs.nixos-wsl.nixosModules.default

     

       6
        
         ];

     

       7
       -
       }

···

       4
        
         imports = [

     

       5
        
           inputs.nixos-wsl.nixosModules.default

     

       6
        
         ];

     

       7
       +
       }