Compare commits
	
		
			7 Commits
		
	
	
		
			2915e42a1d
			...
			installer
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 820bb2de5b | |||
| 7d3ad52a44 | |||
| 2cdb98e898 | |||
| b717b1ceb4 | |||
| f31ce61c2b | |||
| aec22942f7 | |||
| fc8676c3bb | 
@@ -77,7 +77,12 @@ in
 | 
			
		||||
      name = "build-n-switch";
 | 
			
		||||
      category = "tasks";
 | 
			
		||||
      help = "Shortcut to nixos-rebuild for this flake";
 | 
			
		||||
      command = ''doas nixos-rebuild --flake . "$@"'';
 | 
			
		||||
      command = ''
 | 
			
		||||
        # HACK: Upstream changes in Git + Nix makes this necessary
 | 
			
		||||
        # https://github.com/NixOS/nix/issues/10202
 | 
			
		||||
        doas git config --global --add safe.directory "$PWD"
 | 
			
		||||
        doas nixos-rebuild --flake . "$@"
 | 
			
		||||
      '';
 | 
			
		||||
    }
 | 
			
		||||
    {
 | 
			
		||||
      name = "run-vm";
 | 
			
		||||
@@ -115,29 +120,17 @@ in
 | 
			
		||||
      help = "Build home-manager configuration";
 | 
			
		||||
      command = ''nix build "''${@:2}" ".#homeConfigurations.\"$1\".activationPackage"'';
 | 
			
		||||
    }
 | 
			
		||||
    {
 | 
			
		||||
      name = "update-inputs";
 | 
			
		||||
      category = "tasks";
 | 
			
		||||
      help = "Update flake inputs";
 | 
			
		||||
      command = ''
 | 
			
		||||
        args=()
 | 
			
		||||
        for f in "$@"; do
 | 
			
		||||
          args+=(--update-input "$f")
 | 
			
		||||
        done
 | 
			
		||||
        nix flake lock "''${args[@]}"
 | 
			
		||||
      '';
 | 
			
		||||
    }
 | 
			
		||||
    {
 | 
			
		||||
      name = "update-nixpkgs";
 | 
			
		||||
      category = "tasks";
 | 
			
		||||
      help = "Update nixpkgs flake inputs";
 | 
			
		||||
      command = ''update-inputs nixpkgs-{unstable,stable,mine,mine-stable}'';
 | 
			
		||||
      command = ''nix flake update nixpkgs-{unstable,stable,mine,mine-stable}'';
 | 
			
		||||
    }
 | 
			
		||||
    {
 | 
			
		||||
      name = "update-home-manager";
 | 
			
		||||
      category = "tasks";
 | 
			
		||||
      help = "Update home-manager flake inputs";
 | 
			
		||||
      command = ''update-inputs home-manager-{unstable,stable}'';
 | 
			
		||||
      command = ''nix flake update home-manager-{unstable,stable}'';
 | 
			
		||||
    }
 | 
			
		||||
    {
 | 
			
		||||
      name = "update-installer";
 | 
			
		||||
 
 | 
			
		||||
@@ -11,7 +11,7 @@ in
 | 
			
		||||
 | 
			
		||||
    NIX_USER_CONF_FILES = toString (pkgs.writeText "nix.conf"
 | 
			
		||||
      ''
 | 
			
		||||
        experimental-features = nix-command flakes ca-derivations repl-flake
 | 
			
		||||
        experimental-features = nix-command flakes ca-derivations
 | 
			
		||||
        connect-timeout = 5
 | 
			
		||||
        fallback = true
 | 
			
		||||
        ${lib.my.c.nix.cache.conf}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										6
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										6
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							@@ -56,11 +56,11 @@
 | 
			
		||||
        ]
 | 
			
		||||
      },
 | 
			
		||||
      "locked": {
 | 
			
		||||
        "lastModified": 1692446555,
 | 
			
		||||
        "narHash": "sha256-Uzl8TiGKVBCjwYhkprSwbcu8xlcQwnDNIqsk9rM+P9w=",
 | 
			
		||||
        "lastModified": 1732994213,
 | 
			
		||||
        "narHash": "sha256-3v8cTsPB+TIdWmc1gmRNd0Mi0elpfi39CXRsA/2x/Oo=",
 | 
			
		||||
        "owner": "devplayer0",
 | 
			
		||||
        "repo": "borg",
 | 
			
		||||
        "rev": "44a3dc19b014ebc8d33db0b3e145ed7bfc9a0cb7",
 | 
			
		||||
        "rev": "795f5009445987d42f32de1b49fdeb2d88326a64",
 | 
			
		||||
        "type": "github"
 | 
			
		||||
      },
 | 
			
		||||
      "original": {
 | 
			
		||||
 
 | 
			
		||||
@@ -27,7 +27,7 @@ rec {
 | 
			
		||||
 | 
			
		||||
  kernel = {
 | 
			
		||||
    lts = pkgs: pkgs.linuxKernel.packages.linux_6_6;
 | 
			
		||||
    latest = pkgs: pkgs.linuxKernel.packages.linux_6_11;
 | 
			
		||||
    latest = pkgs: pkgs.linuxKernel.packages.linux_6_12;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  nginx = rec {
 | 
			
		||||
@@ -267,7 +267,7 @@ rec {
 | 
			
		||||
      "stream"
 | 
			
		||||
    ];
 | 
			
		||||
    routersPubV4 = [
 | 
			
		||||
      "80.111.122.16"
 | 
			
		||||
      "109.255.31.155"
 | 
			
		||||
      "109.255.252.63"
 | 
			
		||||
    ];
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -40,6 +40,7 @@ in
 | 
			
		||||
 | 
			
		||||
      nix = {
 | 
			
		||||
        package = pkgs'.mine.nix;
 | 
			
		||||
        channel.enable = false;
 | 
			
		||||
        settings = with lib.my.c.nix; {
 | 
			
		||||
          trusted-users = [ "@wheel" ];
 | 
			
		||||
          experimental-features = [ "nix-command" "flakes" "ca-derivations" ];
 | 
			
		||||
 
 | 
			
		||||
@@ -53,6 +53,8 @@ in
 | 
			
		||||
          SUBSYSTEM=="usb", ATTR{idVendor}=="057e", MODE="0664", GROUP="wheel"
 | 
			
		||||
          # FT
 | 
			
		||||
          SUBSYSTEM=="usb", ATTR{idVendor}=="0403", MODE="0664", GROUP="wheel"
 | 
			
		||||
          # /dev/player0
 | 
			
		||||
          SUBSYSTEM=="usb", ATTR{idVendor}=="6969", MODE="0664", GROUP="wheel"
 | 
			
		||||
        '';
 | 
			
		||||
      };
 | 
			
		||||
    };
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user